X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=a2268d12a2ace697b1d86adad7528590e3c2eb29;hb=8ee1c72cb2f313d54a40b8dffed50496cff6ceb9;hp=63291b08fa44ea5e114e903e3199a651228ddbf4;hpb=eb77a70b55b86c7abca86ff41468b6029d7079bf;p=packages%2Frpm.git diff --git a/rpm.spec b/rpm.spec index 63291b0..a2268d1 100644 --- a/rpm.spec +++ b/rpm.spec @@ -22,7 +22,7 @@ # force_cpp - force using __cpp other than "%{_target_cpu}-pld-linux-gcc -E" # versions of required libraries -%define reqdb_ver 4.5.20 +%define reqdb_ver 4.6.18 %define reqpopt_ver 1.10.8 %define beecrypt_ver 2:4.1.2-4 %define sover 4.4 @@ -35,10 +35,10 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 4.4.9 -Release: 0.1 +Release: 7 License: GPL Group: Base -Source0: ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz +Source0: http://rpm5.org/files/rpm/rpm-4.4/%{name}-%{version}.tar.gz # Source0-md5: 210b768006e7d88dd8a3bcd498ea27f6 Source1: %{name}.groups Source2: %{name}.platform @@ -72,7 +72,7 @@ Patch7: %{name}-scripts-closefds.patch Patch8: %{name}-python-macros.patch Patch9: %{name}-gettext-in-header.patch Patch10: %{name}-compress-doc.patch - +Patch11: %{name}-Nmalloc.patch Patch12: %{name}-system_libs.patch Patch13: %{name}-bb-and-short-circuit.patch Patch14: %{name}-etc_dir.patch @@ -86,11 +86,11 @@ Patch21: %{name}-dontneedutils.patch Patch22: %{name}-provides-dont-obsolete.patch Patch23: %{name}-pkgconfigdeps.patch Patch24: %{name}-po.patch - +Patch25: %{name}-rpm2cpio-payload.patch Patch26: %{name}-notsc.patch Patch27: %{name}-hack-norpmlibdep.patch Patch28: %{name}-makefile-no_myLDADD_deps.patch - +Patch29: %{name}-macros-dbhash.patch Patch31: %{name}-missing-prototypes.patch Patch32: %{name}-pld-autodep.patch Patch33: %{name}-arch-x86_64.patch @@ -98,7 +98,7 @@ Patch34: %{name}-epoch0.patch Patch35: %{name}-perl_req-INC_dirs.patch Patch36: %{name}-debuginfo.patch Patch37: %{name}-doxygen_hack.patch - +Patch38: %{name}-rpm5-patchset-8021.patch Patch41: %{name}-reduce-stack-usage.patch Patch42: %{name}-old-fileconflicts-behaviour.patch @@ -117,13 +117,20 @@ Patch55: %{name}-truncate-cvslog.patch Patch57: %{name}-as_needed-fix.patch Patch58: %{name}-repackage-wo-lzma.patch Patch59: %{name}-libtool-deps.patch -URL: http://wraptastic.org/ +Patch60: %{name}-obsolete-rpmrc.patch +Patch61: %{name}-sparc64.patch +Patch62: %{name}-rpmdb.patch +URL: http://rpm5.org/ BuildRequires: autoconf >= 2.57 BuildRequires: automake >= 1.4 BuildRequires: beecrypt-devel >= %{beecrypt_ver} 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} @@ -165,8 +172,8 @@ Requires: beecrypt >= %{beecrypt_ver} Requires: popt >= %{reqpopt_ver} %{!?with_static:Obsoletes: rpm-utils-static} Conflicts: glibc < 2.2.92 -# ABI changes in rpm, new poldek needed -Conflicts: poldek < 0.20.1-0.20070105.0 +# db4.6 poldek needed +Conflicts: poldek < 0.21-0.20070703.00.3 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _binary_payload w9.gzdio @@ -655,6 +662,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 %patch12 -p1 %patch13 -p1 %patch14 -p1 @@ -681,17 +689,19 @@ install %{SOURCE12} scripts/perl.prov %patch22 -p1 %patch23 -p1 %patch24 -p1 +%patch25 -p1 %patch26 -p1 %patch27 -p1 %patch28 -p1 +%patch29 -p1 %patch31 -p1 %patch32 -p1 -# needed? I doubt -# %patch33 -p1 +%patch33 -p1 %patch34 -p1 %patch35 -p0 %patch36 -p1 %patch37 -p1 +%patch38 -p1 %patch41 -p1 %patch42 -p1 %{!?with_neon:%patch44 -p1} @@ -706,6 +716,11 @@ install %{SOURCE12} scripts/perl.prov %patch57 -p1 %patch58 -p1 %patch59 -p1 +%patch60 -p1 +%ifarch sparc64 +%patch61 -p1 +%endif +%patch62 -p1 cd scripts mv -f perl.req perl.req.in @@ -787,7 +802,56 @@ install -d $RPM_BUILD_ROOT{/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm,/var/lib/b pylibdir=%{py_libdir} \ pkgbindir="%{_bindir}" -echo "%{_target_cpu}-%{_target_vendor}-linux-gnu" > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +# first platform file entry can't contain regexps +echo "%{_target_cpu}-%{_target_vendor}-linux" > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform + +# x86_64 things +%ifarch x86_64 +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 +%endif + +# x86 things +%ifarch athlon %{x8664} +echo "athlon-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +%endif +%ifarch pentium4 athlon %{x8664} +echo "pentium4-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +%endif +%ifarch pentium3 pentium4 athlon %{x8664} +echo "pentium3-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +%endif +%ifarch i686 pentium3 pentium4 athlon %{x8664} +echo "i686-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +%endif +%ifarch i586 i686 pentium3 pentium4 athlon %{x8664} +echo "i586-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +%endif +%ifarch i486 i586 i686 pentium3 pentium4 athlon %{x8664} +echo "i486-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +%endif +%ifarch %{ix86} %{x8664} +echo "i386-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +%endif + +# ppc +%ifarch ppc +echo "ppc-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +echo "powerpc-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +%endif + +# noarch +echo "noarch-[^-]*-.*" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform %ifarch %{ppc} #sed -e '/_target_platform/s/[%]{_target_cpu}/ppc/' \ @@ -813,7 +877,7 @@ install %{SOURCE4} $RPM_BUILD_ROOT%{_rpmlibdir}/find-spec-bcond install %{SOURCE7} $RPM_BUILD_ROOT%{_rpmlibdir}/compress-doc install %{SOURCE8} $RPM_BUILD_ROOT%{_rpmlibdir}/check-files install %{SOURCE13} $RPM_BUILD_ROOT%{_rpmlibdir}/user_group.sh -install %{SOURCE16} $RPM_BUILD_ROOT%{_rpmlibdir}/find-java-requires +install %{SOURCE16} $RPM_BUILD_ROOT%{_rpmlibdir}/java-find-requires install scripts/find-php* $RPM_BUILD_ROOT%{_rpmlibdir} install scripts/php.{prov,req} $RPM_BUILD_ROOT%{_rpmlibdir} install %{SOURCE14} $RPM_BUILD_ROOT/etc/sysconfig/rpm @@ -1080,8 +1144,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %attr(755,root,root) %{_rpmlibdir}/mkinstalldirs %attr(755,root,root) %{_rpmlibdir}/u_pkg.sh %attr(755,root,root) %{_rpmlibdir}/executabledeps.sh -# needs jar (any jdk), jcf-dump (gcc-java) to work -%attr(755,root,root) %{_rpmlibdir}/javadeps.sh %attr(755,root,root) %{_rpmlibdir}/libtooldeps.sh # needs hacked pkg-config to return anything %attr(755,root,root) %{_rpmlibdir}/pkgconfigdeps.sh @@ -1109,9 +1171,12 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %{_rpmlibdir}/sparc* %endif %ifarch %{x8664} +%{_rpmlibdir}/amd64* +%{_rpmlibdir}/ia32e* %{_rpmlibdir}/x86_64* %endif # must be here for "Requires: rpm-*prov" to work +%{_rpmlibdir}/macros.java %{_rpmlibdir}/macros.mono %{_rpmlibdir}/macros.perl %{_rpmlibdir}/macros.php @@ -1138,6 +1203,12 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %attr(755,root,root) %{_bindir}/adapter.awk %attr(755,root,root) %{_bindir}/pldnotify.awk +%files javaprov +%defattr(644,root,root,755) +%attr(755,root,root) %{_rpmlibdir}/java-find-requires +# needs jar (any jdk), jcf-dump (gcc-java) to work +%attr(755,root,root) %{_rpmlibdir}/javadeps.sh + %files perlprov %defattr(644,root,root,755) %attr(755,root,root) %{_rpmlibdir}/perl.*