Author: glen Date: Thu Oct 20 14:27:45 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use ld.so.conf.d, rel 2
---- Files affected: SPECS: gnustep-base.spec (1.57 -> 1.58) ---- Diffs: ================================================================ Index: SPECS/gnustep-base.spec diff -u SPECS/gnustep-base.spec:1.57 SPECS/gnustep-base.spec:1.58 --- SPECS/gnustep-base.spec:1.57 Wed Jul 27 00:07:23 2005 +++ SPECS/gnustep-base.spec Thu Oct 20 16:27:39 2005 @@ -7,7 +7,7 @@ Summary(pl): Podstawowa biblioteka GNUstep Name: gnustep-base Version: 1.11.0 -Release: 1 +Release: 2 License: LGPL/GPL Group: Libraries Source0: ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz @@ -24,9 +24,10 @@ BuildRequires: libxml2-devel >= 2.3.0 BuildRequires: openssl-devel >= 0.9.7d BuildRequires: zlib-devel -Requires(post,preun): grep Requires(post,preun): /sbin/chkconfig -Requires(post,postun): /sbin/ldconfig +Requires(post): /sbin/ldconfig +Requires(triggerpostun): sed >= 4.0 +Requires: glibc >= 6:2.3.5-7.6 Requires: gnustep-make >= 1.11.0 # with gdomap in /etc/services Requires: setup >= 2.4.3 @@ -126,15 +127,13 @@ echo 'GMT' > $RPM_BUILD_ROOT%{_prefix}/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/localtime +install -d $RPM_BUILD_ROOT/etc/ld.so.conf.d +echo '%{_prefix}/System/Library/Libraries/%{gscpu}/%{gsos}/%{libcombo}' > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}.conf + %clean rm -rf $RPM_BUILD_ROOT %post -umask 022 -if ! grep -q '%{_prefix}/System/Library/Libraries/%{gscpu}/%{gsos}/%{libcombo}' \ - /etc/ld.so.conf ; then - echo "%{_prefix}/System/Library/Libraries/%{gscpu}/%{gsos}/%{libcombo}" >> /etc/ld.so.conf -fi /sbin/ldconfig /sbin/chkconfig --add gnustep if [ -f /var/lock/subsys/gnustep ]; then @@ -151,21 +150,10 @@ /sbin/chkconfig --del gnustep fi -%postun -if [ "$1" = "0" ]; then - umask 022 - grep -v "^%{_prefix}/System/Library/Libraries/%{gscpu}/%{gsos}/%{libcombo}$" /etc/ld.so.conf \ - > /etc/ld.so.conf.tmp - mv -f /etc/ld.so.conf.tmp /etc/ld.so.conf - /sbin/ldconfig -fi +%postun -p /sbin/ldconfig -%triggerpostun -- gnustep-base < 1.7.0 -umask 022 -grep -v "^%{_prefix}/Libraries/%{gscpu}/%{gsos}/%{libcombo}$" /etc/ld.so.conf \ - > /etc/ld.so.conf.tmp -mv -f /etc/ld.so.conf.tmp /etc/ld.so.conf -/sbin/ldconfig +%triggerpostun -- %{name} < 1.11.0-1.1 +sed -i -e "/^%(echo %{_prefix}/Libraries/%{gscpu}/%{gsos}/%{libcombo} | sed -e 's,/,\\/,g')$/d" /etc/ld.so.conf %files %defattr(644,root,root,755) @@ -262,6 +250,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.58 2005/10/20 14:27:39 glen +- use ld.so.conf.d, rel 2 + Revision 1.57 2005/07/26 22:07:23 qboosh - updated to 1.11.0 (note: new soname) - removed obsolete link patch ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnustep-base.spec?r1=1.57&r2=1.58&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
