[Nice-commit] Nice/distrib Nice.spec,1.2,1.3 Makefile,1.12,1.13

[<bo...@pr...>]

Update of /cvsroot/nice/Nice/distrib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13058/distrib

Modified Files:
	Nice.spec Makefile 
Log Message:
Automatic registration of the Emacs mode for the SuSE Linux distribution.


Index: Nice.spec
===================================================================
RCS file: /cvsroot/nice/Nice/distrib/Nice.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Nice.spec	18 Jun 2003 22:45:08 -0000	1.2
--- Nice.spec	25 Jan 2004 03:23:39 -0000	1.3
***************
*** 45,48 ****
--- 45,58 ----
  echo install...
  
+ %post
+ if [ -f /etc/SuSE-release ]; then
+   ln -sf nice-startup.el /usr/share/emacs/site-lisp/suse-start-nice.el
+ fi
+ 
+ %preun
+ if [ "$1" = "0" ] ; then # last uninstall
+   rm -f /usr/share/emacs/site-lisp/suse-start-nice.el
+ fi
+ 
  %clean
  echo clean...

Index: Makefile
===================================================================
RCS file: /cvsroot/nice/Nice/distrib/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Makefile	25 Jan 2004 01:24:48 -0000	1.12
--- Makefile	25 Jan 2004 03:23:39 -0000	1.13
***************
*** 18,22 ****
  ZIP_ROOT = tmp/Nice
  
! RPMTMP = tmp/Nice-${VERSION}
  RPMDIR  = ${CURDIR}/tmp/noarch
  RPMFILE = Nice-${VERSION}-1.noarch.rpm
--- 18,22 ----
  ZIP_ROOT = tmp/Nice
  
! RPMTMP  = ${CURDIR}/tmp/Nice-${VERSION}
  RPMDIR  = ${CURDIR}/tmp/noarch
  RPMFILE = Nice-${VERSION}-1.noarch.rpm
***************
*** 47,62 ****
  	${clean-tmp} && mkdir tmp/$(BUILDROOT)
  	cd $(BUILDROOT) && $(MAKE) install PREFIX=${CURDIR}/tmp/$(BUILDROOT)
  	cd tmp && tar -czf ../${TARFILE} $(BUILDROOT) --owner=0 --group=0
  
  .PHONY: rpm
! rpm ${RPMDIR}/${RPMFILE}: ${TARFILE}
  	${clean-tmp}
  	cp rpmmacros ~/.rpmmacros
  	mkdir -p ${RPMTMP}
  	mkdir -p tmp/BUILD
! 	cd ${RPMTMP} && tar xzf ${CURDIR}/${TARFILE} && mv nice-$(VERSION) usr
  	cd tmp && tar zcf ${CURDIR}/tmp/Nice-${VERSION}.tar.gz Nice-${VERSION}
  	sed "s/VERSION/${VERSION}/" Nice.spec > tmp/Nice-${VERSION}.spec
! 	rpmbuild --target=noarch --buildroot=${CURDIR}/${RPMTMP} -bb tmp/Nice-${VERSION}.spec
  
  
--- 47,72 ----
  	${clean-tmp} && mkdir tmp/$(BUILDROOT)
  	cd $(BUILDROOT) && $(MAKE) install PREFIX=${CURDIR}/tmp/$(BUILDROOT)
+ 	# Preprend a specific message for manual installations
+ 	echo -e 
+ 	 ';; Load this file from your .emacs file with:\n' \
+ 	 ';;   (load "/usr/local/share/emacs/site-lisp/nice/nice-startup.el")'\
+          '\n\n(setq load-path (cons "/usr/local/share/emacs/site-lisp/nice" load-path))\n\n' \
+ 	> ${CURDIR}/tmp/$(BUILDROOT)/share/emacs/site-lisp/nice/nice-startup.el
+ 	cat $(BUILDROOT)/lib/share/emacs/site-lisp/nice/nice-startup.el \
+ 	>>${CURDIR}/tmp/$(BUILDROOT)/share/emacs/site-lisp/nice/nice-startup.el
  	cd tmp && tar -czf ../${TARFILE} $(BUILDROOT) --owner=0 --group=0
  
  .PHONY: rpm
! rpm ${RPMDIR}/${RPMFILE}: $(DEB)
  	${clean-tmp}
  	cp rpmmacros ~/.rpmmacros
  	mkdir -p ${RPMTMP}
  	mkdir -p tmp/BUILD
! 	cd $(BUILDROOT) && $(MAKE) install\
! 		PREFIX=${RPMTMP}/usr \
! 		LISPDIR=${RPMTMP}/usr/share/emacs/site-lisp
  	cd tmp && tar zcf ${CURDIR}/tmp/Nice-${VERSION}.tar.gz Nice-${VERSION}
  	sed "s/VERSION/${VERSION}/" Nice.spec > tmp/Nice-${VERSION}.spec
! 	rpmbuild --target=noarch --buildroot=${RPMTMP} -bb tmp/Nice-${VERSION}.spec