Hello community, here is the log from the commit of package slib for openSUSE:Factory checked in at 2017-07-17 09:10:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/slib (Old) and /work/SRC/openSUSE:Factory/.slib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "slib" Mon Jul 17 09:10:32 2017 rev:29 rq:510095 version:3b5 Changes: -------- --- /work/SRC/openSUSE:Factory/slib/slib.changes 2015-03-27 09:40:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.slib.new/slib.changes 2017-07-17 09:10:45.527312743 +0200 @@ -1,0 +2,6 @@ +Thu Jul 13 11:46:15 UTC 2017 - tchva...@suse.com + +- Reduce bit a guile code for older distros, we have 1.8.5 on + sle11 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ slib.spec ++++++ --- /var/tmp/diff_new_pack.Ig1M1m/_old 2017-07-17 09:10:46.059237822 +0200 +++ /var/tmp/diff_new_pack.Ig1M1m/_new 2017-07-17 09:10:46.063237259 +0200 @@ -1,7 +1,7 @@ # # spec file for package slib # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,9 +17,6 @@ Name: slib -Provides: scheme:/usr/lib/scheme/slib/umbscheme.init -PreReq: %install_info_prereq -PreReq: guile1 coreutils Version: 3b5 Release: 0 Summary: Portable Scheme Library @@ -29,7 +26,9 @@ Source: http://groups.csail.mit.edu/mac/ftpdir/scm/slib-%{version}.tar.gz # this is not upstreamable (bnc#754532): Patch0: remove-resene-colors.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires(post): %{install_info_prereq} +Requires(post): coreutils +Requires(post): guile1 BuildArch: noarch %description @@ -43,74 +42,64 @@ %build %install -install -m 755 -d $RPM_BUILD_ROOT/usr/share/slib/ -install -m 755 -d $RPM_BUILD_ROOT/%{_infodir}/ -install -m 644 *.scm *.init $RPM_BUILD_ROOT/usr/share/slib/ -install -m 644 slib.info* $RPM_BUILD_ROOT%{_infodir}/ +install -m 755 -d %{buildroot}%{_datadir}/slib/ +install -m 755 -d %{buildroot}/%{_infodir}/ +install -m 644 *.scm *.init %{buildroot}%{_datadir}/slib/ +install -m 644 slib.info* %{buildroot}%{_infodir}/ %triggerin -- guile1 # install guile library # We need new guile for registration, see "Incompatible change in guile 1.8.2". # During update must be slib-3a5 installed first (See Conflits: slib < 3a5 in guile.spec) # because of %triggerin in slib, 3a1 for example, though. -if [ -d usr/share/guile/site ] ; then - GUILE_VERSION=`guile1 -c "(display (version))" | sed "s:\.::g"` - # guile is instaled - if [ $GUILE_VERSION -ge 182 ]; then +if [ -d %{_datadir}/guile/site ] ; then # we have guile >= 1.8.2 - if [ ! -e usr/share/guile/site/slib ] ; then + if [ ! -e %{_datadir}/guile/site/slib ] ; then # link slib library into guile - ln -sf ../../slib usr/share/guile/site/slib - fi - usr/bin/guile1 -c "(use-modules (ice-9 slib)) (require 'new-catalog)" + ln -sf ../../slib %{_datadir}/guile/site/slib fi + %{_bindir}/guile1 -c "(use-modules (ice-9 slib)) (require 'new-catalog)" fi exit 0 %triggerpostun -- guile1 # Delete slib library files, only if guile1 was uninstalled. -if ! test -e usr/bin/guile1 ; then - rm -f usr/share/guile/site/slib - rm -f usr/share/guile/site/slibcat - rmdir --ignore-fail-on-non-empty usr/share/guile/site - rmdir --ignore-fail-on-non-empty usr/share/guile +if ! test -e %{_bindir}/guile1 ; then + rm -f %{_datadir}/guile/site/slib + rm -f %{_datadir}/guile/site/slibcat + rmdir --ignore-fail-on-non-empty %{_datadir}/guile/site + rmdir --ignore-fail-on-non-empty %{_datadir}/guile fi exit 0 %post -%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info} # install guile library # We need new guile for registration, see "Incompatible change in guile 1.8.2". # During update must be slib-3a5 installed first (See Conflits: slib < 3a5 in guile.spec) # because of %triggerin in slib, 3a1 for example, though. -if [ -d usr/share/guile/site -o -e usr/bin/guile1 ] ; then - GUILE_VERSION=`guile1 -c "(display (version))" | sed "s:\.::g"` - # guile is instaled - if [ $GUILE_VERSION -ge 182 ]; then - # we have guile >= 1.8.2 - if [ ! -d usr/share/guile/site ] ; then +if [ -d %{_datadir}/guile/site -o -e %{_bindir}/guile1 ] ; then + if [ ! -d %{_datadir}/guile/site ] ; then # This is in orderd to fixup eventually removed guile/site folders # which could have happened due to bnc#780827. - mkdir usr/share/guile/site + mkdir %{_datadir}/guile/site fi - if [ ! -e usr/share/guile/site/slib ] ; then + if [ ! -e %{_datadir}/guile/site/slib ] ; then # link slib library into guile - ln -sf ../../slib usr/share/guile/site/slib - fi - usr/bin/guile1 -c "(use-modules (ice-9 slib)) (require 'new-catalog)" + ln -sf ../../slib %{_datadir}/guile/site/slib fi + %{_bindir}/guile1 -c "(use-modules (ice-9 slib)) (require 'new-catalog)" fi %postun -%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz +%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info} # Delete guile library, only if slib or guile was uninstalled. -if ! test -d usr/share/slib -a -d usr/share/guile/site ; then - rm -f usr/share/guile/site/slib - rm -f usr/share/guile/site/slibcat +if ! test -d %{_datadir}/slib -a -d %{_datadir}/guile/site ; then + rm -f %{_datadir}/guile/site/slib + rm -f %{_datadir}/guile/site/slibcat fi %files -%defattr(-,root,root) %doc ANNOUNCE COPYING ChangeLog FAQ README %{_infodir}/* %{_datadir}/slib
