X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.spec;h=6dff86d029d063ffd3ef7f63b025c2b82a80cdb7;hp=777d0fb6968b4d8c1a26aee3769c1336b41efdf7;hb=edef21f244998f87bc26004ec8f9955c73f1611f;hpb=4617e0e8d80dff84bc0b3f211373a1b84c7757a0 diff --git a/rpm.spec b/rpm.spec index 777d0fb..6dff86d 100644 --- a/rpm.spec +++ b/rpm.spec @@ -35,10 +35,10 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 4.4.9 -Release: 0.1 +Release: 1 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 @@ -54,6 +54,8 @@ Source11: %{name}.sysinfo Source12: perl.prov Source13: %{name}-user_group.sh Source14: %{name}.sysconfig +Source15: %{name}-macros.java +Source16: %{name}-java-requires Source30: builder Source31: adapter.awk Source32: pldnotify.awk @@ -70,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}-rpmdeps-segv.patch +Patch11: %{name}-Nmalloc.patch Patch12: %{name}-system_libs.patch Patch13: %{name}-bb-and-short-circuit.patch Patch14: %{name}-etc_dir.patch @@ -84,12 +86,11 @@ Patch21: %{name}-dontneedutils.patch Patch22: %{name}-provides-dont-obsolete.patch Patch23: %{name}-pkgconfigdeps.patch Patch24: %{name}-po.patch -Patch25: %{name}-glob.patch +Patch25: %{name}-rpm2cpio-payload.patch Patch26: %{name}-notsc.patch Patch27: %{name}-hack-norpmlibdep.patch Patch28: %{name}-makefile-no_myLDADD_deps.patch -Patch29: %{name}-ds.patch -Patch30: %{name}-locale.patch + Patch31: %{name}-missing-prototypes.patch Patch32: %{name}-pld-autodep.patch Patch33: %{name}-arch-x86_64.patch @@ -97,14 +98,14 @@ Patch34: %{name}-epoch0.patch Patch35: %{name}-perl_req-INC_dirs.patch Patch36: %{name}-debuginfo.patch Patch37: %{name}-doxygen_hack.patch -Patch38: %{name}-empty-rpmlock-path.patch -Patch39: %{name}-version.patch + Patch41: %{name}-reduce-stack-usage.patch Patch42: %{name}-old-fileconflicts-behaviour.patch Patch44: %{name}-no-neon.patch Patch45: %{name}-no-sqlite.patch Patch46: %{name}-mono.patch +Patch47: %{name}-javadeps.patch Patch49: %{name}-p4.patch Patch50: %{name}-macros.patch @@ -116,15 +117,19 @@ Patch55: %{name}-truncate-cvslog.patch Patch57: %{name}-as_needed-fix.patch Patch58: %{name}-repackage-wo-lzma.patch Patch59: %{name}-libtool-deps.patch - -Patch64: %{name}-iconv-translit.patch -URL: http://wraptastic.org/ +Patch60: %{name}-obsolete-rpmrc.patch +Patch61: %{name}-sparc64.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} @@ -167,7 +172,7 @@ 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 +Conflicts: poldek < 0.20.1-0.20070108.1.4 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _binary_payload w9.gzdio @@ -381,7 +386,7 @@ Bibliotecas estáticas para desenvolvimento. бібліотека RPM. %package utils -Summary: Additional utilities for managing rpm packages and database +Summary: Additional utilities for managing RPM packages and database Summary(de.UTF-8): Zusatzwerkzeuge für Verwaltung RPM-Pakete und Datenbanken Summary(pl.UTF-8): Dodatkowe narzędzia do zarządzania bazą RPM-a i pakietami Group: Applications/File @@ -389,7 +394,7 @@ Requires: %{name} = %{version}-%{release} Requires: popt >= %{reqpopt_ver} %description utils -Additional utilities for managing rpm packages and database. +Additional utilities for managing RPM packages and database. %description utils -l de.UTF-8 Zusatzwerkzeuge für Verwaltung RPM-Pakete und Datenbanken. @@ -398,7 +403,7 @@ Zusatzwerkzeuge für Verwaltung RPM-Pakete und Datenbanken. Dodatkowe narzędzia do zarządzania bazą RPM-a i pakietami. %package utils-perl -Summary: Additional utilities for managing rpm packages and database +Summary: Additional utilities for managing RPM packages and database Summary(de.UTF-8): Zusatzwerkzeuge für Verwaltung RPM-Pakete und Datenbanken Summary(pl.UTF-8): Dodatkowe narzędzia do zarządzania bazą RPM-a i pakietami Group: Applications/File @@ -406,7 +411,7 @@ Requires: %{name}-utils = %{version}-%{release} Requires: popt >= %{reqpopt_ver} %description utils-perl -Additional utilities for managing rpm packages and database. +Additional utilities for managing RPM packages and database. %description utils-perl -l de.UTF-8 Zusatzwerkzeuge für Verwaltung RPM-Pakete und Datenbanken. @@ -529,56 +534,74 @@ construir pacotes usando o RPM. Різноманітні допоміжні скрипти та утиліти, які використовуються для побудови RPM'ів. +%package javaprov +Summary: Additional utilities for checking Java provides/requires in RPM packages +Summary(pl.UTF-8): Dodatkowe narzędzia do sprawdzania zależności kodu w Javie w pakietach RPM +Group: Applications/File +Requires: %{name} = %{version}-%{release} +Requires: file +Requires: findutils >= 1:4.2.26 +Requires: mktemp +Requires: unzip + +%description javaprov +Additional utilities for checking Java provides/requires in RPM +packages. + +%description javaprov -l pl.UTF-8 +Dodatkowe narzędzia do sprawdzania zależności kodu w Javie w pakietach +RPM. + %package perlprov -Summary: Additional utilities for checking perl provides/requires in rpm packages +Summary: Additional utilities for checking Perl provides/requires in RPM packages Summary(de.UTF-8): Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-Paketen -Summary(pl.UTF-8): Dodatkowe narzędzia do sprawdzenia zależności skryptów perla w pakietach rpm +Summary(pl.UTF-8): Dodatkowe narzędzia do sprawdzenia zależności skryptów Perla w pakietach RPM Group: Applications/File Requires: %{name} = %{version}-%{release} Requires: perl-devel Requires: perl-modules %description perlprov -Additional utilities for checking perl provides/requires in rpm +Additional utilities for checking Perl provides/requires in RPM packages. %description perlprov -l de.UTF-8 Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-Paketen. %description perlprov -l pl.UTF-8 -Dodatkowe narzędzia do sprawdzenia zależności skryptów perla w -pakietach rpm. +Dodatkowe narzędzia do sprawdzenia zależności skryptów Perla w +pakietach RPM. %package pythonprov -Summary: Python macros, which simplifies creation of rpm packages with Python software -Summary(pl.UTF-8): Makra ułatwiające tworzenie pakietów rpm z programami napisanymi w Pythonie +Summary: Python macros, which simplifies creation of RPM packages with Python software +Summary(pl.UTF-8): Makra ułatwiające tworzenie pakietów RPM z programami napisanymi w Pythonie Group: Applications/File Requires: %{name} = %{version}-%{release} Requires: python Requires: python-modules %description pythonprov -Python macros, which simplifies creation of rpm packages with Python +Python macros, which simplifies creation of RPM packages with Python software. %description pythonprov -l pl.UTF-8 -Makra ułatwiające tworzenie pakietów rpm z programami napisanymi w +Makra ułatwiające tworzenie pakietów RPM z programami napisanymi w Pythonie. %package php-pearprov -Summary: Additional utilities for managing rpm packages and database -Summary(pl.UTF-8): Dodatkowe narzędzia do sprawdzania zależności skryptów php w rpm +Summary: Additional utilities for checking PHP PEAR provides/requires in RPM packages +Summary(pl.UTF-8): Dodatkowe narzędzia do sprawdzania zależności skryptów php w RPM Group: Applications/File Requires: %{name} = %{version}-%{release} Requires: sed >= 4.0 %description php-pearprov -Additional utilities for checking php pear provides/requires in rpm +Additional utilities for checking PHP PEAR provides/requires in RPM packages. %description php-pearprov -l pl.UTF-8 -Dodatkowe narzędzia do sprawdzenia zależności skryptów php pear w -pakietach rpm. +Dodatkowe narzędzia do sprawdzenia zależności skryptów PHP PEAR w +pakietach RPM. %package -n python-rpm Summary: Python interface to RPM library @@ -627,8 +650,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze %prep %setup -q -# merged -#%patch0 -p1 +%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -639,8 +661,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze %patch8 -p1 %patch9 -p1 %patch10 -p1 -# obsolete -#%patch11 -p1 +%patch11 -p1 %patch12 -p1 %patch13 -p1 %patch14 -p1 @@ -661,43 +682,29 @@ install %{SOURCE5} scripts/find-lang.sh install %{SOURCE9} scripts/php.prov.in install %{SOURCE10} scripts/php.req.in install %{SOURCE12} scripts/perl.prov -# obsolete -#%patch19 -p1 +%patch19 -p1 %patch20 -p1 %patch21 -p1 %patch22 -p1 %patch23 -p1 -# merged -#%patch24 -p1 -# merged -#%patch25 -p1 +%patch24 -p1 +%patch25 -p1 %patch26 -p1 %patch27 -p1 %patch28 -p1 -# merged -#%patch29 -p1 -# merged -#%patch30 -p1 %patch31 -p1 -# FIXME! -# %patch32 -p1 -# merged -# %patch33 -p1 +%patch32 -p1 +%patch33 -p1 %patch34 -p1 %patch35 -p0 %patch36 -p1 -# FIXME -#%patch37 -p1 -# CHECK ME -#%patch38 -p1 -# obsolete -#%patch39 -p1 +%patch37 -p1 %patch41 -p1 %patch42 -p1 %{!?with_neon:%patch44 -p1} -# WTF? this is merged? -#%patch45 -p1 +%patch45 -p1 %patch46 -p1 +%patch47 -p1 %patch49 -p1 %patch50 -p1 %patch51 -p1 @@ -706,8 +713,10 @@ install %{SOURCE12} scripts/perl.prov %patch57 -p1 %patch58 -p1 %patch59 -p1 -# CHECK ME -#%patch64 -p1 +%patch60 -p1 +%ifarch sparc64 +%patch61 -p1 +%endif cd scripts mv -f perl.req perl.req.in @@ -779,8 +788,6 @@ sed -i -e 's|@host@|%{_target_cpu}-%{_target_vendor}-linux-gnu|' -e 's|@host_cpu debugedit_LDADD="\$(WITH_LIBELF_LIB) -lpopt" \ staticLDFLAGS=%{?with_static:-all-static} -%{?with_apidocs:%{__make} doxygen} - %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm,/var/lib/banner} @@ -791,7 +798,54 @@ 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 "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 +%endif + +# noarch +echo "noarch-[^-]*-.*" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform %ifarch %{ppc} #sed -e '/_target_platform/s/[%]{_target_cpu}/ppc/' \ @@ -809,6 +863,7 @@ install macros.perl $RPM_BUILD_ROOT%{_rpmlibdir}/macros.perl install macros.python $RPM_BUILD_ROOT%{_rpmlibdir}/macros.python install macros.php $RPM_BUILD_ROOT%{_rpmlibdir}/macros.php install macros.mono $RPM_BUILD_ROOT%{_rpmlibdir}/macros.mono +install %{SOURCE15} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.java install %{SOURCE1} doc/manual/groups install %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/install-build-tree @@ -816,6 +871,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}/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 @@ -827,8 +883,6 @@ install %{SOURCE33} $RPM_BUILD_ROOT%{_bindir}/banner.sh install %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo -install rpmio/ugid.h $RPM_BUILD_ROOT%{_includedir}/rpm - # obsolete but still installed rm $RPM_BUILD_ROOT%{_rpmlibdir}/rpmrc @@ -1041,7 +1095,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %attr(755,root,root) %{_bindir}/rpmdeps %{!?with_system_libmagic:%attr(755,root,root) %{_bindir}/rpmfile} %attr(755,root,root) %{_rpmlibdir}/find-debuginfo.sh -%attr(755,root,root) %{_rpmlibdir}/rpm2cpio.sh %attr(755,root,root) %{_rpmlibdir}/tgpg %attr(755,root,root) %{_rpmlibdir}/rpmdb_loadcvt %{_mandir}/man8/rpm2cpio.8* @@ -1085,8 +1138,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 @@ -1114,9 +1165,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 @@ -1143,6 +1197,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.*