- splitted out guile-modules-2_0 package

OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/guile?expand=0&rev=33

guile.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov 28 15:51:34 UTC 2011 - pgajdos@suse.com
+
+- splitted out guile-modules-2_0 package
+
 -------------------------------------------------------------------
 Mon Nov 28 08:34:06 UTC 2011 - pgajdos@suse.com
 

guile.spec

@@ -17,13 +17,19 @@
 
 
 # define the name used for versioning libs and directories.
-%define guilevers 2.0
+%define guilemaj    2
+%define guilemin    0
+%define guilevers   %{guilemaj}.%{guilemin}
+%define libgver     22
+%define gsuff       %{guilemaj}_%{guilemin}-%{libgver}
+%define libgreadver 18
+%define greadsuff   v-%{libgreadver}-%{libgreadver}
 
 Name:           guile
 BuildRequires:  gc-devel gmp-devel libffi46-devel libunistring-devel pkg-config readline-devel
 License:        LGPL-3.0+ and GPL-3.0+ and FDL-1.3+
 Group:          Development/Languages/Scheme
-Version:        2.0.3
+Version:        %{guilevers}.3
 Release:        1
 Summary:        GNU's Ubiquitous Intelligent Language for Extension
 Url:            http://www.gnu.org/software/guile/
@@ -32,7 +38,6 @@ Patch1:         %{name}-64bit.patch
 Patch2:         %{name}-1.6.10-mktemp.patch
 # Fix the wrong FSF address in a few headers.
 Patch3:         %{name}-fix_fsf_add.patch
-# Check if following is needed in next guile version.
 Patch4:         %{name}-turn-off-gc-test.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         fileutils sh-utils
@@ -45,21 +50,32 @@ This is Guile, a portable, embeddable Scheme implementation written in
 C. Guile provides a machine independent execution platform that can be
 linked in as a library when building extensible programs.
 
-%package -n libguile-2_0-22
+%package -n libguile-%{gsuff}
 Group:          Development/Languages/Scheme
 Summary:        GNU's Ubiquitous Intelligent Language for Extension
+Requires:       modules-%{guilemaj}_%{guilemin} >= %{version}
 
-%description -n libguile-2_0-22
+%description -n libguile-%{gsuff}
 This is Guile, a portable, embeddable Scheme implementation written in
 C. Guile provides a machine independent execution platform that can be
 linked in as a library when building extensible programs. This package
 contains the shared libraries.
 
-%package -n libguilereadline-v-18-18
+%package modules-%{guilemaj}_%{guilemin}
 Group:          Development/Languages/Scheme
 Summary:        GNU's Ubiquitous Intelligent Language for Extension
 
-%description -n libguilereadline-v-18-18
+%description modules-%{guilemaj}_%{guilemin}
+This is Guile, a portable, embeddable Scheme implementation written in
+C. Guile provides a machine independent execution platform that can be
+linked in as a library when building extensible programs. This package
+contains guile modules.
+
+%package -n libguilereadline-%{greadsuff}
+Group:          Development/Languages/Scheme
+Summary:        GNU's Ubiquitous Intelligent Language for Extension
+
+%description -n libguilereadline-%{greadsuff}
 This is Guile, a portable, embeddable Scheme implementation written in
 C. Guile provides a machine independent execution platform that can be
 linked in as a library when building extensible programs. This package
@@ -70,9 +86,10 @@ License:        LGPL v2.1 or later
 Group:          Development/Languages/Scheme
 Summary:        GNU's Ubiquitous Intelligent Language for Extension
 Requires:       gmp-devel readline-devel ncurses-devel gc-devel libunistring-devel libffi-devel
-Requires:       libguilereadline-v-18-18 = %{version}-%{release}
-Requires:       libguile-2_0-22 = %{version}-%{release}
-Requires:       guile
+# following Requires needed because /usr/bin/guile-config needs /usr/bin/guile
+Requires:       guile = %{version}-%{release}
+Requires:       libguilereadline-%{greadsuff} = %{version}-%{release}
+Requires:       libguile-%{gsuff} = %{version}-%{release}
 Conflicts:      libguile1-devel
 
 %description devel
@@ -117,38 +134,42 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/guile/site
 rm -f var/adm/SuSEconfig/md5/usr/share/guile/*/slibcat
 rm -f usr/share/guile/site/slibcat.SuSEconfig
 
-%post -n libguile-2_0-22 -p /sbin/ldconfig
+%post -n libguile-%{gsuff} -p /sbin/ldconfig
 
-%postun -n libguile-2_0-22 -p /sbin/ldconfig
+%postun -n libguile-%{gsuff} -p /sbin/ldconfig
 
-%files -n libguile-2_0-22
-%defattr(-,root,root)
-%{_libdir}/libguile-%{guilevers}.so.22*
+%post -n libguilereadline-%{greadsuff} -p /sbin/ldconfig
 
-%post -n libguilereadline-v-18-18 -p /sbin/ldconfig
-
-%postun -n libguilereadline-v-18-18 -p /sbin/ldconfig
-
-%files  -n libguilereadline-v-18-18
-%defattr(-,root,root)
-%{_libdir}/libguilereadline-v-18.so.18*
+%postun -n libguilereadline-%{greadsuff} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
 %doc ABOUT-NLS AUTHORS COPYING* ChangeLog GUILE-VERSION HACKING
 %doc LICENSE NEWS README THANKS
-%{_bindir}/*
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/%{guilevers}
-%{_datadir}/%{name}/%{guilevers}/*
-# NOTE: At least some .so files must be here, required for dynamic-link.
-# Own usr/share/guile/site; side effect of not doing so is slib failing to install correctly.
-%dir %{_datadir}/%{name}/site
+%defattr(-,root,root)
+%{_bindir}/guile-tools
+%{_bindir}/guild
+%{_bindir}/guile
 %{_mandir}/man1/guile.1.gz
+
+%files -n libguile-%{gsuff}
+%defattr(-,root,root)
+%{_libdir}/libguile-%{guilevers}.so.%{libgver}*
+
+%files modules-%{guilemaj}_%{guilemin}
+%defattr(-,root,root)
 %{_libdir}/%{name}
+# Own usr/share/guile/site; side effect of not doing so is slib failing to install correctly.
+%{_datadir}/%{name}
+
+%files  -n libguilereadline-%{greadsuff}
+%defattr(-,root,root)
+%{_libdir}/libguilereadline-v-%{libgreadver}.so.%{libgreadver}*
 
 %files devel
 %defattr(-,root,root)
+%{_bindir}/guile-snarf
+%{_bindir}/guile-config
 %dir %{_includedir}/%{name}
 %dir %{_includedir}/%{name}/%{guilevers}
 %{_includedir}/%{name}/%{guilevers}/*