X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.spec;h=c06e8f4b4add85d40255bd5f4464d1c5e33af919;hp=3df4509c649026cae858baadf6ab6284dc915076;hb=3631a16ca39d99d26bf09198e145740d602493c5;hpb=9a64d6f662f73e8b7daa793e3f95032cc71c0421 diff --git a/rpm.spec b/rpm.spec index 3df4509..c06e8f4 100644 --- a/rpm.spec +++ b/rpm.spec @@ -47,7 +47,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 5.4.15 -Release: 53 +Release: 58 License: LGPL v2.1 Group: Base # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm @@ -125,7 +125,7 @@ Patch42: %{name}-pattern_Release.patch Patch43: %{name}-fix-___build_pre-macro.patch Patch44: %{name}-missing-patch-file-fails-build.patch Patch45: %{name}-remove-misleading-missing-patch-message.patch -Patch46: %{name}-file-magic-can-be-mixed-case.patch +Patch46: %{name}-rpm2cpio.patch Patch47: %{name}-query-always-noisy.patch Patch48: %{name}-verify-ghosts-broken-logic.patch Patch49: %{name}-python-enable-compat-RPMSENSE.patch @@ -176,6 +176,7 @@ Patch96: skip-ldconfig-optimization.patch Patch97: glibc.patch Patch98: extension-based-compression-detection.patch Patch99: %{name}-gpg-pinentry.patch +Patch100: dont-install-useless-scripts.patch # Patches imported from Mandriva @@ -360,7 +361,6 @@ Requires: %{name}-base = %{version}-%{release} Requires: %{name}-lib = %{version}-%{release} Requires: beecrypt >= %{beecrypt_ver} Requires: popt >= %{reqpopt_ver} -Provides: rpm-db-ver = %{reqdb_ver} Obsoletes: rpm-getdeps %{!?with_static:Obsoletes: rpm-utils-static} Conflicts: glibc < 2.2.92 @@ -467,6 +467,7 @@ Requires: beecrypt >= %{beecrypt_ver} Requires: libmagic >= 1.15-2 %{?with_selinux:Requires: libselinux >= 2.1.0} Requires: popt >= %{reqpopt_ver} +Provides: rpm-db-ver = %{reqdb_ver} Obsoletes: rpm-libs # avoid SEGV caused by mixed db versions Conflicts: poldek < 0.18.1-16 @@ -957,6 +958,7 @@ cd - %patch96 -p1 %patch97 -p1 %patch98 -p1 +%patch100 -p1 %patch1050 -p1 @@ -1012,7 +1014,7 @@ sed -i \ --with-lua=%{!?with_system_lua:internal}%{?with_system_lua:external} \ --with-lzma=external \ --with-neon=%{?with_neon:external}%{!?with_neon:no} \ - --with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/macros.d/pld:%{_rpmlibdir}/pld/macros:%{_rpmlibdir}/%%{_target}/macros:%{_rpmlibdir}/macros.build:%{_rpmlibdir}/macros.d/macros.*:%{_sysconfdir}/rpm/macros.*:%{_sysconfdir}/rpm/macros:%{_sysconfdir}/rpm/%%{_target}/macros:%{_sysconfdir}/rpm/macros.d/*.macros:~/etc/.rpmmacros:~/.rpmmacros' \ + --with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/macros.d/pld:%{_rpmlibdir}/pld/macros:%{_rpmlibdir}/%%{_target}/macros:%{_rpmlibdir}/macros.build:%{_sysconfdir}/rpm/macros.*:%{_sysconfdir}/rpm/macros:%{_sysconfdir}/rpm/%%{_target}/macros:%{_sysconfdir}/rpm/macros.d/*.macros:~/etc/.rpmmacros:~/.rpmmacros' \ --without-path-versioned \ --with-pcre=%{!?with_system_pcre:internal}%{?with_system_pcre:external} \ --with-popt=external \ @@ -1027,7 +1029,7 @@ sed -i \ --with-xz=external \ --with-zlib=external -%{__make} -j1 +%{__make} %{?with_apidocs:%{__make} apidocs} @@ -1052,7 +1054,7 @@ install -d $RPM_BUILD_ROOT{/bin,/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm} \ install %{SOURCE16} $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/PLD-3.0-Th-GPG-key.asc -%{__make} -j1 install \ +%{__make} install \ pkgconfigdir=%{_pkgconfigdir} \ DESTDIR=$RPM_BUILD_ROOT @@ -1230,11 +1232,11 @@ install tools/rpmdb_reset $RPM_BUILD_ROOT%{_rpmlibdir}/bin install %{SOURCE29} $RPM_BUILD_ROOT%{_rpmlibdir}/bin/dbupgrade.sh # create macro loading wrappers for backward compatibility -for m in gstreamer mono; do - echo "%%{load:%{_rpmlibdir}/macros.d/$m}" >$RPM_BUILD_ROOT%{_rpmlibdir}/macros.$m +for m in gstreamer libtool mono pkgconfig selinux; do + %{__mv} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.d/{$m,macros.$m} done -install %{SOURCE30} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.d/prov-req +install %{SOURCE30} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.d/macros.prov-req # moved to rpm-pld-macros-macros 1.699 %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.d/kernel @@ -1445,7 +1447,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %attr(755,root,root) %{_rpmlibdir}/bin/cp %attr(755,root,root) %{_rpmlibdir}/bin/debugedit %attr(755,root,root) %{_rpmlibdir}/bin/find -%attr(755,root,root) %{_rpmlibdir}/bin/mgo %attr(755,root,root) %{_rpmlibdir}/bin/mtree %attr(755,root,root) %{_rpmlibdir}/bin/rpmcache %attr(755,root,root) %{_rpmlibdir}/bin/rpmcmp @@ -1496,35 +1497,26 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %attr(755,root,root) %{_rpmlibdir}/libtooldeps.sh # needs hacked pkg-config to return anything %attr(755,root,root) %{_rpmlibdir}/pkgconfigdeps.sh -%attr(755,root,root) %{_rpmlibdir}/bin/api-sanity-autotest.pl -%attr(755,root,root) %{_rpmlibdir}/bin/api-sanity-checker.pl %{!?with_sqlite:%attr(755,root,root) %{_rpmlibdir}/bin/dbsql} %attr(755,root,root) %{_rpmlibdir}/bin/install-sh %attr(755,root,root) %{_rpmlibdir}/bin/mkinstalldirs -%attr(755,root,root) %{_rpmlibdir}/bin/pom2spec %attr(755,root,root) %{_rpmlibdir}/bin/rpmspec %attr(755,root,root) %{_rpmlibdir}/bin/rpmspecdump %attr(755,root,root) %{_rpmlibdir}/bin/sqlite3 %attr(755,root,root) %{_rpmlibdir}/bin/wget %attr(755,root,root) %{_rpmlibdir}/vcheck -# not used yet ... these six depend on perl -%attr(755,root,root) %{_rpmlibdir}/http.req # we always used scripts provided by mono-devel, maybe move them here #%attr(755,root,root) %{_rpmlibdir}/mono-find-provides #%attr(755,root,root) %{_rpmlibdir}/mono-find-requires %attr(755,root,root) %{_rpmlibdir}/fontconfig.prov -# must be here for "Requires: rpm-*prov" to work -%{_rpmlibdir}/macros.d/gstreamer -%{_rpmlibdir}/macros.d/libtool -%{_rpmlibdir}/macros.d/mono -%{_rpmlibdir}/macros.d/pkgconfig -%{_rpmlibdir}/macros.d/prov-req -%{_rpmlibdir}/macros.d/selinux +%{_rpmlibdir}/macros.d/macros.gstreamer +%{_rpmlibdir}/macros.d/macros.libtool +%{_rpmlibdir}/macros.d/macros.mono +%{_rpmlibdir}/macros.d/macros.pkgconfig +%{_rpmlibdir}/macros.d/macros.prov-req +%{_rpmlibdir}/macros.d/macros.selinux %{_rpmlibdir}/macros.rpmbuild -# compat wrappers -%{_rpmlibdir}/macros.gstreamer -%{_rpmlibdir}/macros.mono %attr(755,root,root) %{_rpmlibdir}/gstreamer.sh %attr(755,root,root) %{_rpmlibdir}/kmod-deps.sh