SPECS (Titanium): rpm.spec - merged from rpm-4_4_9 branch: - C: ...
hawk
hawk at pld-linux.org
Fri Jan 25 17:17:15 CET 2008
Author: hawk Date: Fri Jan 25 16:17:15 2008 GMT
Module: SPECS Tag: Titanium
---- Log message:
- merged from rpm-4_4_9 branch:
- C: for non-tukaani lzma
- chown syntax in --setugids
- find_lang 1.25 (cleanup, consistency, symlinked catalogs support)
- really find_lang 1.25
- don't hardcode python version
- check that find_lang rev is not outdated
- -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed.
- check-files cleanup
- remove rpmenv files on rpm upgrade
- remove rpmenv files on version upgrade and on -lib package trigger
- prepare /etc/rpm/sysinfo being a dir
- use the new format, don't care about old contents
- mv -f just in case
- 4.4.9 is LGPL
- get rid of rpm-getdeps package
- reset also LC_ALL,LINGUAS,LANGUAGE,LC_MESSAGES (moved from rpm-build-macros)
- require up to date rpm macros
---- Files affected:
SPECS:
rpm.spec (1.837.4.6 -> 1.837.4.7)
---- Diffs:
================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.4.6 SPECS/rpm.spec:1.837.4.7
--- SPECS/rpm.spec:1.837.4.6 Mon Dec 10 15:10:00 2007
+++ SPECS/rpm.spec Fri Jan 25 17:17:10 2008
@@ -26,6 +26,7 @@
%define reqdb_ver 4.5.20
%define reqpopt_ver 1.10.8
%define beecrypt_ver 2:4.1.2-4
+%define find_lang_rev 1.25
%define sover 4.4
Summary: RPM Package Manager
Summary(de.UTF-8): RPM Packet-Manager
@@ -36,8 +37,8 @@
Summary(uk.UTF-8): ĐœĐľĐ˝ĐľĐ´ĐśĐľŃ€ пакотів від RPM
Name: rpm
Version: 4.4.9
-Release: 13
-License: GPL
+Release: 14
+License: LGPL
Group: Base
Source0: http://rpm5.org/files/rpm/rpm-4.4/%{name}-%{version}.tar.gz
# Source0-md5: 210b768006e7d88dd8a3bcd498ea27f6
@@ -98,6 +99,7 @@
Patch36: %{name}-debuginfo.patch
Patch37: %{name}-doxygen_hack.patch
Patch38: %{name}-rpm5-patchset-8021.patch
+Patch39: %{name}-popt-coreutils.patch
Patch41: %{name}-reduce-stack-usage.patch
Patch42: %{name}-old-fileconflicts-behaviour.patch
Patch43: %{name}-rpm5-patchset-8637.patch
@@ -173,6 +175,7 @@
Requires: %{name}-lib = %{version}-%{release}
Requires: beecrypt >= %{beecrypt_ver}
Requires: popt >= %{reqpopt_ver}
+Obsoletes: rpm-getdeps
%{!?with_static:Obsoletes: rpm-utils-static}
Conflicts: glibc < 2.2.92
# db4.6 poldek needed
@@ -275,10 +278,12 @@
%{?with_selinux:Requires: libselinux >= 1.18}
%{?with_system_libmagic:Requires: libmagic >= 1.15-2}
Requires: popt >= %{reqpopt_ver}
+%{?with_suggest_tags:Suggests: lzma >= 1:4.42.0}
Obsoletes: rpm-libs
+# avoid installing with incompatible (non-tukaani) lzma
+Conflicts: lzma < 1:4.42.0
# avoid SEGV caused by mixed db versions
Conflicts: poldek < 0.18.1-16
-%{?with_suggest_tags:Suggests: lzma >= 1:4.42.0}
%description lib
RPMs library.
@@ -451,12 +456,10 @@
Summary(uk.UTF-8): Хкрипти Ń‚Đ° ŃƒŃ‚Đ¸ĐťŃ–Ń‚Đ¸, ноОйŃ
ідні Đ´ĐťŃ ĐżĐžĐąŃƒĐ´ĐžĐ˛Đ¸ пакотів
Group: Applications/File
Requires(pre): findutils
-Requires: %{name}-build-macros >= 1.314
+Requires: %{name}-build-macros >= 1.417
Requires: %{name}-utils = %{version}-%{release}
Requires: /bin/id
Requires: awk
-# we need fixed binutils for -feliminate-dwarf2-dups
-Requires: binutils >= 3:2.17.50.0.3-2
Requires: bzip2
Requires: chrpath >= 0.10-4
Requires: cpio
@@ -476,7 +479,7 @@
Requires: sh-utils
Requires: tar
Requires: textutils
-Provides: rpmbuild(find_lang) = 1.23
+Provides: rpmbuild(find_lang) = %{find_lang_rev}
Provides: rpmbuild(monoautodeps)
Provides: rpmbuild(noauto) = 3
%ifarch %{x8664}
@@ -673,6 +676,7 @@
%patch36 -p1
%patch37 -p1
%patch38 -p1
+%patch39 -p1
%patch41 -p1
%patch42 -p1
%patch43 -p1
@@ -721,6 +725,12 @@
done
%build
+rev=$(awk '/^#.*Id:.*/{print $4}' scripts/find-lang.sh)
+if [ "$rev" != "%find_lang_rev" ]; then
+ : Update find_lang_rev define to $rev, and retry
+ exit 1
+fi
+
%if %{with system_libmagic}
rm -rf file
%else
@@ -755,7 +765,7 @@
--enable-shared \
--enable-static \
%{!?with_apidocs:--without-apidocs} \
- %{?with_python:--with-python=2.5} \
+ %{?with_python:--with-python=%{py_ver}} \
%{!?with_python:--without-python} \
%{!?with_selinux:--without-selinux} \
--without-db
@@ -862,7 +872,14 @@
install %{SOURCE17} $RPM_BUILD_ROOT%{_bindir}/banner.sh
-install %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo
+
+touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Conflictname
+touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Dirnames
+install %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Filelinktos
+touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Obsoletename
+touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Providename
+touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Requirename
# obsolete but still installed
rm $RPM_BUILD_ROOT%{_rpmlibdir}/rpmrc
@@ -987,6 +1004,18 @@
# manuals for utils dropped in 4.4.8 (?)
#rm -f $RPM_BUILD_ROOT%{_mandir}/{,*/}/man8/{rpmcache,rpmgraph}.8
+# unpackaged in 4.4.9, reasons unknown
+rm $RPM_BUILD_ROOT%{_bindir}/rpm{db,e,i,query,sign,u,verify}
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/rpm{d,e,i,k,q,u,v}
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/symclash.{sh,py}
+rm $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
+rm $RPM_BUILD_ROOT%{perl_sitearch}/RPM.pm
+rm $RPM_BUILD_ROOT%{perl_sitearch}/auto/RPM/.packlist
+rm $RPM_BUILD_ROOT%{perl_sitearch}/auto/RPM/RPM.bs
+rm $RPM_BUILD_ROOT%{perl_sitearch}/auto/RPM/RPM.so
+rm $RPM_BUILD_ROOT%{_prefix}/local/man/man3/RPM.3pm
+rm $RPM_BUILD_ROOT%{_mandir}/{,ja,pl}/man8/rpm{cache,graph}.8
+
%find_lang %{name}
rm -rf manual
@@ -996,6 +1025,16 @@
%clean
rm -rf $RPM_BUILD_ROOT
+%triggerpostun lib -- %{name}-lib < %{version}
+rm -f /var/lib/rpm/__db*
+
+%pretrans
+# this needs to be a dir
+if [ -f %{_sysconfdir}/rpm/sysinfo ]; then
+ mv -f %{_sysconfdir}/rpm/sysinfo{,.rpmsave}
+ mkdir %{_sysconfdir}/rpm/sysinfo
+fi
+
%post lib -p /sbin/ldconfig
%postun lib -p /sbin/ldconfig
@@ -1014,8 +1053,9 @@
%dir %{_sysconfdir}/rpm
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rpm/macros
+%dir %{_sysconfdir}/rpm/sysinfo
# these are ok to be replaced
-%config %verify(not md5 mtime size) %{_sysconfdir}/rpm/sysinfo
+%config %verify(not md5 mtime size) %{_sysconfdir}/rpm/sysinfo/*
%config %verify(not md5 mtime size) %{_sysconfdir}/rpm/platform
@@ -1218,6 +1258,26 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.837.4.7 2008-01-25 16:17:10 hawk
+- merged from rpm-4_4_9 branch:
+ - C: for non-tukaani lzma
+ - chown syntax in --setugids
+ - find_lang 1.25 (cleanup, consistency, symlinked catalogs support)
+ - really find_lang 1.25
+ - don't hardcode python version
+ - check that find_lang rev is not outdated
+ - -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed.
+ - check-files cleanup
+ - remove rpmenv files on rpm upgrade
+ - remove rpmenv files on version upgrade and on -lib package trigger
+ - prepare /etc/rpm/sysinfo being a dir
+ - use the new format, don't care about old contents
+ - mv -f just in case
+ - 4.4.9 is LGPL
+ - get rid of rpm-getdeps package
+ - reset also LC_ALL,LINGUAS,LANGUAGE,LC_MESSAGES (moved from rpm-build-macros)
+ - require up to date rpm macros
+
Revision 1.837.4.6 2007-12-10 14:10:00 hawk
- fixed rpm2cpio for new lzma, release 13
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.837.4.6&r2=1.837.4.7&f=u
More information about the pld-cvs-commit
mailing list