diff --git a/guile1.changes b/guile1.changes index 55c82a9..4438a89 100644 --- a/guile1.changes +++ b/guile1.changes @@ -1,7 +1,12 @@ ------------------------------------------------------------------- Tue Jan 10 08:40:00 UTC 2012 - pgajdos@suse.com -- added automake into buildrequires +- added automake and libtool into buildrequires +- make guile1 and guile1-devel instalable along with guile and + guile-devel: + * removed info pages + * removed /usr/share/aclocal/guile.m4 + * /usr/bin/guile* renamed to /usr/bin/guile1* ------------------------------------------------------------------- Wed Sep 28 14:40:32 UTC 2011 - davejplater@gmail.com diff --git a/guile1.spec b/guile1.spec index 7b80ed0..064b992 100644 --- a/guile1.spec +++ b/guile1.spec @@ -16,9 +16,9 @@ # - +%define binpref guile1 Name: guile1 -BuildRequires: gc-devel gmp-devel readline-devel pkg-config automake +BuildRequires: gc-devel gmp-devel readline-devel pkg-config automake libtool License: LGPL-2.1+ Group: Development/Languages/Scheme Version: 1.8.8 @@ -112,7 +112,7 @@ Requires: libguile-srfi-srfi-13-14-v-3-3 = %{version}-%{release} Requires: libguilereadline-v-17-17 = %{version}-%{release} Requires: libguile17 = %{version}-%{release} Requires: gmp-devel readline-devel ncurses-devel -Provides: guile-devel +Requires: guile1 %description -n libguile1-devel This is Guile, a portable, embeddable Scheme implementation written in @@ -144,15 +144,13 @@ Authors: %patch5 # guile-1.8.1: The code is not so good for -Werror (unused results of write()). sed -i s/-Werror// configure.in configure -# force rebuild with non-broken makeinfo -rm -f doc/*/*.info %build autoreconf -fi # FIXME: Following files are apparently compiled without RPM_OPT_FLAGS: # gen-scmconfig.c,c-tokenize.c %configure --disable-static --with-pic\ - --with-threads + --with-threads --program-transform-name="s:guile:%{binpref}:" make %{?jobs:-j%jobs} %check @@ -161,6 +159,12 @@ make check %install make install DESTDIR=%{buildroot} mkdir -p %{buildroot}%{_datadir}/guile/site +rm -r %{buildroot}%{_infodir} +# conflict with guile2 +rm %{buildroot}%{_datadir}/aclocal/guile.m4 +# use /usr/bin/guile1 instead of /usr/bin/guile +sed -i "s:${GUILE-guile}:${GUILE-guile1}:" %{buildroot}%{_datadir}/guile/1.8/scripts/* +sed -i "s:/usr/bin/guile:/usr/bin/guile1:" %{buildroot}%{_bindir}/guile1-config %post -n libguile-srfi-srfi-1-v-3-3 /sbin/ldconfig @@ -222,18 +226,6 @@ mkdir -p %{buildroot}%{_datadir}/guile/site %defattr(-,root,root) %{_libdir}/libguilereadline-v-17.so.17* -%post -n libguile1-devel -%install_info --info-dir=%{_infodir} %{_infodir}/guile.info.gz -%install_info --info-dir=%{_infodir} %{_infodir}/goops.info.gz -%install_info --info-dir=%{_infodir} %{_infodir}/guile-tut.info.gz -%install_info --info-dir=%{_infodir} %{_infodir}/r5rs.info.gz - -%postun -n libguile1-devel -%install_info_delete --info-dir=%{_infodir} %{_infodir}/guile.info.gz -%install_info_delete --info-dir=%{_infodir} %{_infodir}/goops.info.gz -%install_info_delete --info-dir=%{_infodir} %{_infodir}/guile-tut.info.gz -%install_info_delete --info-dir=%{_infodir} %{_infodir}/r5rs.info.gz - %pre # Remove obsolete files (< SuSE Linux 10.2) rm -f var/adm/SuSEconfig/md5/usr/share/guile/*/slibcat @@ -244,18 +236,14 @@ rm -f usr/share/guile/site/slibcat.SuSEconfig %doc ABOUT-NLS AUTHORS COPYING* ChangeLog* GUILE-VERSION HACKING %doc LICENSE NEWS README THANKS %{_bindir}/* -%{_datadir}/guile -%{_mandir}/man1/guile.1.gz +%dir %{_datadir}/guile +%{_datadir}/guile/1.8 +%dir %{_datadir}/guile/site +%{_mandir}/man1/%{binpref}.1.gz %files -n libguile1-devel %defattr(-,root,root) %{_includedir}/* -%{_datadir}/aclocal/* -%doc %{_infodir}/guile.info.gz -%doc %{_infodir}/guile.info-[0-9].gz -%doc %{_infodir}/goops.info.gz -%doc %{_infodir}/guile-tut.info.gz -%doc %{_infodir}/r5rs.info.gz %{_libdir}/libguile*.so %{_libdir}/libguile*.la %{_libdir}/pkgconfig/*