Author: hawk Date: Sat Feb 16 22:57:16 2008 GMT Module: SPECS Tag: Titanium ---- Log message: - merged from rpm-4_4_9 branch: - fix removal of files from %_netsharedpath on uninstall - add 'alpha-[^-]*-linux(-gnu)?' to platform on alpha - ppc macro doesn't exist - platform entries to support ia64/ppc64/s390/s390x/sparc[v9]/sparc64 - reverted gcc version relax (won't work with rpmrc patch applied) - alter system files in pretrans - find-lang moved to rpm-build-maros package - removed sparc64 patch, already applied as nopie patch - obsolete some old rpm-scripts package (rpm-base currently)
---- Files affected: SPECS: rpm.spec (1.837.4.9 -> 1.837.4.10) ---- Diffs: ================================================================ Index: SPECS/rpm.spec diff -u SPECS/rpm.spec:1.837.4.9 SPECS/rpm.spec:1.837.4.10 --- SPECS/rpm.spec:1.837.4.9 Sat Feb 2 17:56:13 2008 +++ SPECS/rpm.spec Sat Feb 16 23:57:11 2008 @@ -26,7 +26,6 @@ %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.27 %define sover 4.4 Summary: RPM Package Manager Summary(de.UTF-8): RPM Packet-Manager @@ -37,7 +36,7 @@ Summary(uk.UTF-8): ĐĐľĐ˝ĐľĐ´ĐśĐľŃ ĐżĐ°ĐşĐľŃŃв вŃĐ´ RPM Name: rpm Version: 4.4.9 -Release: 15 +Release: 16 License: LGPL Group: Base Source0: http://rpm5.org/files/rpm/rpm-4.4/%{name}-%{version}.tar.gz @@ -46,10 +45,8 @@ Source2: %{name}.platform Source3: %{name}-install-tree Source4: %{name}-find-spec-bcond -Source5: %{name}-find-lang Source6: %{name}-groups-po.awk Source7: %{name}-compress-doc - Source9: %{name}-php-provides Source10: %{name}-php-requires Source11: %{name}.sysinfo @@ -119,14 +116,14 @@ Patch58: %{name}-repackage-wo-lzma.patch Patch59: %{name}-libtool-deps.patch Patch60: %{name}-obsolete-rpmrc.patch -Patch61: %{name}-sparc64.patch -Patch62: %{name}-rpmdb.patch -Patch63: %{name}-lzma-size_t.patch -Patch64: %{name}-tar_as_secondary_source.patch -Patch65: %{name}-man_pl.patch -Patch66: %{name}-lzma-tukaani.patch -Patch67: %{name}-v3-support.patch -Patch68: %{name}-cleanbody.patch +Patch61: %{name}-rpmdb.patch +Patch62: %{name}-lzma-size_t.patch +Patch63: %{name}-tar_as_secondary_source.patch +Patch64: %{name}-man_pl.patch +Patch65: %{name}-lzma-tukaani.patch +Patch66: %{name}-v3-support.patch +Patch67: %{name}-cleanbody.patch +Patch68: %{name}-rpm5-patchset-9486.patch URL: http://rpm5.org/ BuildRequires: autoconf >= 2.57 BuildRequires: automake >= 1.4 @@ -134,10 +131,6 @@ BuildRequires: bzip2-devel >= 1.0.2-17 BuildRequires: db-devel >= %{reqdb_ver} BuildRequires: elfutils-devel >= 0.108 -%ifnarch sparc64 -# -fPIE/-pie -BuildRequires: gcc >= 5:3.4 -%endif BuildRequires: gettext-devel >= 0.11.4-2 %{?with_system_libmagic:BuildRequires: libmagic-devel} %{?with_selinux:BuildRequires: libselinux-devel >= 1.18} @@ -189,6 +182,7 @@ # don't require very fresh rpm.macros to build %define __gettextize gettextize --copy --force --intl ; cp -f po/Makevars{.template,} +%define find_lang sh ./scripts/find-lang.sh $RPM_BUILD_ROOT %define ix86 i386 i486 i586 i686 athlon pentium3 pentium4 %define ppc ppc ppc7400 ppc7450 %define x8664 amd64 ia32e x86_64 @@ -256,6 +250,7 @@ Summary(pl.UTF-8): Podstawowy pakiet RPM - skrypty uĹźywane przez same pakiety rpm Group: Base Requires: filesystem +Obsoletes: rpm-scripts Obsoletes: vserver-rpm %description base @@ -458,7 +453,7 @@ Summary(uk.UTF-8): ĐĄĐşŃипŃи ŃĐ° ŃŃиНŃŃи, Đ˝ĐľĐžĐąŃ ŃĐ´Đ˝Ń Đ´ĐťŃ ĐżĐžĐąŃдОви пакоŃŃв Group: Applications/File Requires(pre): findutils -Requires: %{name}-build-macros >= 1.417 +Requires: %{name}-build-macros >= 1.433-2 Requires: %{name}-utils = %{version}-%{release} Requires: /bin/id Requires: awk @@ -470,6 +465,7 @@ Requires: file >= 4.17 Requires: fileutils Requires: findutils +# rpmrc patch adds flags specific to gcc >= 3.4 Requires: gcc >= 5:3.4 Requires: glibc-devel Requires: grep @@ -481,7 +477,6 @@ Requires: sh-utils Requires: tar Requires: textutils -Provides: rpmbuild(find_lang) = %{find_lang_rev} Provides: rpmbuild(monoautodeps) Provides: rpmbuild(noauto) = 3 %ifarch %{x8664} @@ -654,7 +649,6 @@ echo '%%define __php_requires /usr/lib/rpm/php.req' >> macros.php echo '%%define __mono_provides /usr/lib/rpm/mono-find-provides' > macros.mono echo '%%define __mono_requires /usr/lib/rpm/mono-find-requires' >> macros.mono -install %{SOURCE5} scripts/find-lang.sh install %{SOURCE9} scripts/php.prov.in install %{SOURCE10} scripts/php.req.in install %{SOURCE12} scripts/perl.prov @@ -698,9 +692,7 @@ %patch58 -p1 %patch59 -p1 %patch60 -p1 -%ifarch sparc64 %patch61 -p1 -%endif %patch62 -p1 %patch63 -p1 %patch64 -p1 @@ -725,12 +717,6 @@ 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 @@ -799,12 +785,10 @@ echo "amd64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform echo "x86_64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform %endif - %ifarch amd64 echo "amd64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform echo "x86_64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform %endif - %ifarch ia32e echo "ia32e-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform echo "x86_64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform @@ -833,23 +817,50 @@ echo "i386-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform %endif -# ppc -%ifarch ppc -echo "ppc-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +%ifarch alpha +echo "alpha-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +%endif + +%ifarch ia64 +echo "ia64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +%endif + +%ifarch ppc64 +echo "powerpc64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +echo "ppc64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +%endif +%ifarch ppc ppc64 echo "powerpc-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +echo "ppc-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform %endif -# noarch -echo "noarch-[^-]*-.*" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +%ifarch s390x +echo "s390x-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +%endif +%ifarch s390 s390x +echo "s390-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +%endif -%ifarch %{ppc} -#sed -e '/_target_platform/s/[%]{_target_cpu}/ppc/' \ -# -i $RPM_BUILD_ROOT%{_rpmlibdir}/ppc74[05]0-linux/macros +%ifarch sparc64 +echo "sparc64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +echo "sparcv8-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +echo "sparcv9-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +%endif +%ifarch sparcv9 +echo "sparcv8-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +echo "sparcv9-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +%endif +%ifarch sparc sparcv9 sparc64 +echo "sparc-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform %endif +# noarch +echo "noarch-[^-]*-.*" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform + rm $RPM_BUILD_ROOT%{_rpmlibdir}/vpkg-provides* rm $RPM_BUILD_ROOT%{_rpmlibdir}/find-{prov,req}.pl rm $RPM_BUILD_ROOT%{_rpmlibdir}/find-{provides,requires}.perl +rm $RPM_BUILD_ROOT%{_rpmlibdir}/find-lang.sh # not installed since 4.4.8 (-tools-perl subpackage) install scripts/rpmdiff scripts/rpmdiff.cgi $RPM_BUILD_ROOT%{_rpmlibdir} @@ -871,7 +882,7 @@ install %{SOURCE17} $RPM_BUILD_ROOT%{_bindir}/banner.sh -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo +install -d $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Conflictname touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Dirnames @@ -1040,7 +1051,7 @@ %post lib -p /sbin/ldconfig %postun lib -p /sbin/ldconfig -%pre build +%pretrans build find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %files -f %{name}.lang @@ -1155,7 +1166,6 @@ %attr(755,root,root) %{_rpmlibdir}/config.* %attr(755,root,root) %{_rpmlibdir}/cross-build %attr(755,root,root) %{_rpmlibdir}/find-spec-bcond -%attr(755,root,root) %{_rpmlibdir}/find-lang.sh %attr(755,root,root) %{_rpmlibdir}/getpo.sh %attr(755,root,root) %{_rpmlibdir}/install-build-tree %attr(755,root,root) %{_rpmlibdir}/mkinstalldirs @@ -1259,6 +1269,18 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.837.4.10 2008-02-16 22:57:11 hawk +- merged from rpm-4_4_9 branch: + - fix removal of files from %_netsharedpath on uninstall + - add 'alpha-[^-]*-linux(-gnu)?' to platform on alpha + - ppc macro doesn't exist + - platform entries to support ia64/ppc64/s390/s390x/sparc[v9]/sparc64 + - reverted gcc version relax (won't work with rpmrc patch applied) + - alter system files in pretrans + - find-lang moved to rpm-build-maros package + - removed sparc64 patch, already applied as nopie patch + - obsolete some old rpm-scripts package (rpm-base currently) + Revision 1.837.4.9 2008-02-02 16:56:13 hawk - disable repackage and debuginfo by default - changed default distribution name ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.837.4.9&r2=1.837.4.10&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
