rpms/gnu-smalltalk/devel gnu-smalltalk.spec,1.54,1.55

[Jochen Schmitt]

Author: s4504kr

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

Modified Files:
	gnu-smalltalk.spec 
Log Message:
Reorg of the emacs subpackages


Index: gnu-smalltalk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnu-smalltalk/devel/gnu-smalltalk.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- gnu-smalltalk.spec	24 Jun 2010 15:28:28 -0000	1.54
+++ gnu-smalltalk.spec	24 Jun 2010 17:53:55 -0000	1.55
@@ -1,48 +1,48 @@
-Summary: 	GNU Smalltalk
-Name: 		gnu-smalltalk
-Version: 	3.2
-Release: 	4%{?dist}
-
-Source: 	ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz
-Source1:	gnu-smalltalk.desktop
-Source2:	gnu-smalltalk.svg
-
-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
+Summary:        GNU Smalltalk
+Name:           gnu-smalltalk
+Version:        3.2
+Release:        5%{?dist}
+
+Source:         ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz
+Source1:        gnu-smalltalk.desktop
+Source2:        gnu-smalltalk.svg
+
+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
 
-Buildroot: 	%{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
+Buildroot:      %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
-ExcludeArch: 	ppc64 ppc
+ExcludeArch:    ppc64 ppc
 
 Requires(post):  /sbin/install-info
 Requires(preun): /sbin/install-info
 
-BuildRequires: 	prelink
+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:	desktop-file-utils
+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:  desktop-file-utils
 
 %description
 GNU Smalltalk is an implementation that closely follows the
@@ -60,13 +60,29 @@ browser, the goal of the GNU Smalltalk p
 complete system to be used to write your scripts in a clear, aesthetically
 pleasing, and philosophically appealing programming language.
 
-%package emacs
-Summary: Emacs mode for GNU Smalltalk
-Group: Applications/Editors
-Requires: %{name} = %{version}, emacs
-%description emacs
+%package -n emacs-gnu-smalltalk
+Summary:    Emacs mode for GNU Smalltalk
+Group:      Applications/Editors
+Requires:   %{name} = %{version}, emacs
+Provides:   gnu-smalltalk-emacs = %{version}-%{release}
+Obsoletes:  gnu-smalltalk-emacs < 3.2-5
+BuildArch:  noarch
+
+%description -n emacs-gnu-smalltalk
 This Package contains the Smalltalk mode for Emacs.
 
+%package -n emacs-gnu-smalltalk-el
+Summary:    ELisp source files for emacs-gnu-smaltalk
+Group:      Applications/Editors
+Requires:   emacs-gnu-smalltalk = %{version}-%{release}
+Provides:   gnu-smalltalk-emacs = %{version}-%{release}
+Obsoletes:  gnu-smalltalk-emacs < 3.2-5  
+BuildArch:  noarch
+
+%description -n emacs-gnu-smalltalk-el
+This Package contains the ELisp sources for the 
+Smalltalk mode.
+
 %package devel
 Summary: Development Stuff for the GNU Smalltalk package
 Group: Development/Libraries
@@ -99,7 +115,7 @@ CFLAGS="$RPM_OPT_FLAGS -Wa,--noexecstack
   --with-imagedir=%{_libdir}/%{name}
 
 # _smp_mflags seems not to work
-make #  LIBTOOL="%{_bindir}/libtool" 
+make  
 
 cd doc
 
@@ -201,12 +217,20 @@ fi
 %{_includedir}/gst.h   
 %{_includedir}/gstpub.h 
 
-%files emacs
+%files -n emacs-gnu-smalltalk
 %defattr(-,root,root,-)
-%{_emacs_sitelispdir}/gnu-smalltalk/*
-%{_emacs_sitestartdir}/*.el*
+%{_emacs_sitelispdir}/gnu-smalltalk/*.elc
+%{_emacs_sitestartdir}/*.elc
+
+%files -n emacs-gnu-smalltalk-el
+%defattr(-,root,root,-)
+%{_emacs_sitelispdir}/gnu-smalltalk/*.el
+%{_emacs_sitestartdir}/*.el
 
 %changelog
+* Thu Jun 24 2010 Jochen Schmitt <Jochen herr-schmitt de> 3.2-5
+- Reorganisation of the gnu-smalltalk emacs packages
+
 * Thu Jun 24 2010 Jochen Schmitt <Jochen herr-schmitt de> 3.2-4
 - Add desktop file for gst-browser