rpms/gnu-smalltalk/devel gst-3.2-emacs.patch, NONE, 1.1 gnu-smalltalk.spec, 1.52, 1.53

[Jochen Schmitt]

Author: s4504kr

Update of /cvs/pkgs/rpms/gnu-smalltalk/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11121

Modified Files:
	gnu-smalltalk.spec 
Added Files:
	gst-3.2-emacs.patch 
Log Message:
Rework emacs part, reformatting SPEC file

gst-3.2-emacs.patch:
 Makefile.am |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE gst-3.2-emacs.patch ---
diff -up smalltalk-3.2/Makefile.am.emx smalltalk-3.2/Makefile.am
--- smalltalk-3.2/Makefile.am.emx	2010-05-02 09:06:58.000000000 +0200
+++ smalltalk-3.2/Makefile.am	2010-06-23 19:15:28.336773575 +0200
@@ -69,7 +69,9 @@ bin_SCRIPTS = gst-config
 DISTCLEANFILES = termbold termnorm pkgrules.tmp
 CLEANFILES = gst.im $(nodist_lisp_LISP) $(nodist_lispstart_LISP)
 
-lispstartdir = $(lispdir)/site-start.d
+sitelispdir = ${datadir}/emacs/site-lisp
+lispdir = ${sitelispdir}/gnu-smalltalk
+lispstartdir = $(sitelispdir)/site-start.d
 
 if WITH_EMACS
 dist_lisp_LISP = smalltalk-mode.el


Index: gnu-smalltalk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnu-smalltalk/devel/gnu-smalltalk.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- gnu-smalltalk.spec	23 Jun 2010 16:01:11 -0000	1.52
+++ gnu-smalltalk.spec	23 Jun 2010 17:40:38 -0000	1.53
@@ -1,40 +1,44 @@
-Summary: GNU Smalltalk
-Name: gnu-smalltalk
-Version: 3.2
-Release: 2%{?dist}
-Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz
-Patch1: gst-3.2-am.patch
-Patch2: gst-3.2-tst.patch
-Patch3: gst-3.2-ltdl.patch
-License: GPLv2+ with exceptions
-Group: Development/Languages
-URL: http://www.gnu.org/software/smalltalk/smalltalk.html
-Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
+Summary: 	GNU Smalltalk
+Name: 		gnu-smalltalk
+Version: 	3.2
+Release: 	3%{?dist}
+
+Source: 	ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz
+Patch1: 	gst-3.2-am.patch
+Patch2: 	gst-3.2-tst.patch
+Patch3: 	gst-3.2-ltdl.patch
+Patch4:		gst-3.2-emacs.patch
+
+License: 	GPLv2+ with exceptions
+Group: 		Development/Languages
+URL: 		http://www.gnu.org/software/smalltalk/smalltalk.html
 
-ExcludeArch: ppc64 ppc
+Buildroot: 	%{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
-Requires(post): /sbin/install-info
+ExcludeArch: 	ppc64 ppc
+
+Requires(post):  /sbin/install-info
 Requires(preun): /sbin/install-info
 
-BuildRequires: prelink
-BuildRequires: tk-devel
-BuildRequires: gtk2-devel
-BuildRequires: gdbm-devel
-BuildRequires: gmp-devel
-BuildRequires: readline-devel
-BuildRequires: emacs
-BuildRequires: libtool
-BuildRequires: libtool-ltdl-devel
-BuildRequires: texinfo
-BuildRequires: zlib-devel
-BuildRequires: libsigsegv-devel
-BuildRequires: mysql-devel
-BuildRequires: sqlite-devel
-BuildRequires: libffi-devel
-BuildRequires: pkgconfig
-BuildRequires: zip
-BuildRequires: mesa-libGL-devel
-BuildREquires: mesa-libGLU-devel
+BuildRequires: 	prelink
+BuildRequires:  tk-devel
+BuildRequires: 	gtk2-devel
+BuildRequires: 	gdbm-devel
+BuildRequires: 	gmp-devel
+BuildRequires: 	readline-devel
+BuildRequires: 	emacs
+BuildRequires: 	libtool
+BuildRequires: 	libtool-ltdl-devel
+BuildRequires: 	texinfo
+BuildRequires: 	zlib-devel
+BuildRequires: 	libsigsegv-devel
+BuildRequires: 	mysql-devel
+BuildRequires: 	sqlite-devel
+BuildRequires: 	libffi-devel
+BuildRequires: 	pkgconfig
+BuildRequires: 	zip
+BuildRequires: 	mesa-libGL-devel
+BuildREquires: 	mesa-libGLU-devel
 
 %description
 GNU Smalltalk is an implementation that closely follows the
@@ -76,6 +80,7 @@ with functions written in C.
 %patch1 -p1 -b .auto
 %patch2 -p1 -b .tst
 %patch3 -p1 -b .ltdl
+%patch4 -p1 -b .emx
 
 rm -rf lib-src/lt*
 
@@ -183,9 +188,15 @@ fi
 
 %files emacs
 %defattr(-,root,root,-)
-%{_datadir}/emacs/site-lisp/*
+%{_emacs_sitelispdir}/gnu-smalltalk/*
+%{_emacs_sitestartdir}/*.el*
 
 %changelog
+* Wed Jun 23 2010 Jochen Schmitt <Jochen herr-schmitt de> 3.2-3
+- Put emacs files in a subdirectory
+- Using standard emacs rpm macros
+- Reformatting SPEC file
+
 * Wed Jun 23 2010 Jochen Schmitt <Jochen herr-schmitt de> 3.2-2
 - Rebuild