X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=5341450567df5c620692bdd07600dea6ceadb72d;hb=696c40ec8d02287260ad5947e8a0abd2799f4029;hp=ec67b4acc310cb489ed6caf0e9350ef0488e8ccb;hpb=bcd23f7b2e2832e9d694f9f027a0a3bd4e032ad6;p=packages%2Frpm.git diff --git a/rpm.spec b/rpm.spec index ec67b4a..5341450 100644 --- a/rpm.spec +++ b/rpm.spec @@ -12,6 +12,7 @@ # preserving payload format and compressor from original rpm, _not_ current settings # /usr/bin/install: cannot stat `./it.gmo': No such file or directory # /usr/bin/install: cannot stat `./sr@Latn.gmo': No such file or directory +# - maybe? http://rpm.org/gitweb?p=rpm.git;a=commitdiff;h=cfcd1f9bd98d5d0fc46a84931984efec3b9d47e2 # # Conditional build: %bcond_with static # build static rpm+rpmi @@ -55,7 +56,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 4.5 -Release: 21 +Release: 37 License: LGPL Group: Base Source0: %{name}-%{version}.tar.gz @@ -92,10 +93,12 @@ Patch3: %{name}-rpmpopt.patch Patch4: %{name}-perl-macros.patch Patch6: %{name}-noexpand.patch Patch7: %{name}-scripts-closefds.patch +Patch8: %{name}-db.patch Patch9: %{name}-gettext-in-header.patch Patch10: %{name}-compress-doc.patch Patch11: %{name}-rpm5-patchset-8074.patch Patch12: %{name}-system_libs.patch +Patch13: %{name}-unglobal.patch Patch14: %{name}-etc_dir.patch Patch15: %{name}-system_libs-more.patch Patch17: %{name}-ldconfig-always.patch @@ -171,6 +174,10 @@ Patch95: %{name}-gid-uucp.patch Patch96: %{name}-disable-hkp.patch Patch97: %{name}-sigpad.patch Patch98: %{name}-debugdir.patch +Patch99: %{name}-pkgconfig.patch +Patch100: %{name}-rpm5-debugedit.patch +Patch101: %{name}-builddir-readlink.patch +Patch102: pythondeps-speedup.patch URL: http://rpm5.org/ BuildRequires: autoconf >= 2.57 BuildRequires: automake >= 1.4 @@ -179,6 +186,7 @@ BuildRequires: bzip2-devel >= 1.0.2-17 %{!?with_internal_db:BuildRequires: db-devel >= %{reqdb_ver}} BuildRequires: elfutils-devel >= 0.108 BuildRequires: gettext-devel >= 0.11.4-2 +BuildRequires: keyutils-devel %{?with_system_libmagic:BuildRequires: libmagic-devel} %{?with_selinux:BuildRequires: libselinux-devel >= 1.18} # needed only for AM_PROG_CXX used for CXX substitution in rpm.macros @@ -197,7 +205,7 @@ BuildRequires: rpm-perlprov %{?with_python:BuildRequires: rpm-pythonprov} BuildRequires: rpmbuild(macros) >= 1.351 BuildRequires: tar >= 1:1.15.1 -BuildRequires: zlib-devel +BuildRequires: zlib-devel >= 1.2.3.3 %if %{with apidocs} BuildRequires: doxygen BuildRequires: ghostscript @@ -214,7 +222,7 @@ BuildRequires: glibc-static >= 2.2.94 %{?with_system_libmagic:BuildRequires: libmagic-static} %{?with_selinux:BuildRequires: libselinux-static >= 1.18} BuildRequires: popt-static >= %{reqpopt_ver} -BuildRequires: zlib-static +BuildRequires: zlib-static >= 1.2.3.3 %endif Requires: %{name}-base = %{version}-%{release} Requires: %{name}-lib = %{version}-%{release} @@ -328,8 +336,8 @@ Requires: beecrypt >= %{beecrypt_ver} Requires: ossp-uuid >= 1.6.2-4 Requires: popt >= %{reqpopt_ver} %{?with_internal_db:%{?with_nptl:Requires: uname(release) >= 2.6.0}} -Requires: zlib >= 1.2.3 -%{?with_suggest_tags:Suggests: lzma} +Requires: zlib >= 1.2.3.3 +%{?with_suggest_tags:Suggests: xz} Obsoletes: rpm-libs # avoid installing with incompatible (non-tukaani) lzma # avoid incompatible (-M0 not supported) lzma @@ -357,10 +365,11 @@ Requires: beecrypt-devel >= %{beecrypt_ver} Requires: bzip2-devel %{!?with_internal_db:Requires: db-devel >= %{reqdb_ver}} Requires: elfutils-devel +Requires: keyutils-devel %{?with_system_libmagic:Requires: libmagic-devel} %{?with_selinux:Requires: libselinux-devel} Requires: popt-devel >= %{reqpopt_ver} -Requires: zlib-devel +Requires: zlib-devel >= 1.2.3.3 %description devel The RPM packaging system includes C libraries that make it easy to @@ -420,9 +429,10 @@ Requires: beecrypt-static >= %{beecrypt_ver} Requires: bzip2-static %{!?with_internal_db:Requires: db-static >= %{reqdb_ver}} Requires: elfutils-static +Requires: keyutils-static %{?with_system_libmagic:Requires: libmagic-static} Requires: popt-static >= %{reqpopt_ver} -Requires: zlib-static +Requires: zlib-static >= 1.2.3.3 %description static RPM static libraries. @@ -538,7 +548,7 @@ Requires: gcc >= 5:3.4 Requires: glibc-devel Requires: grep Requires: gzip -Requires: lzma +Requires: xz Requires: make Requires: patch Requires: sed @@ -697,10 +707,12 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze %patch4 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %patch9 -p1 %patch10 -p1 %patch11 -p1 -R %patch12 -p1 +%patch13 -p1 %patch14 -p1 %patch17 -p1 sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in @@ -749,7 +761,6 @@ install %{SOURCE13} scripts/perl.prov %endif %patch51 -p1 #%patch52 -p1 -%patch53 -p1 %patch55 -p1 %patch56 -p1 %patch57 -p1 @@ -790,6 +801,11 @@ install %{SOURCE13} scripts/perl.prov %patch96 -p1 %patch97 -p1 %patch98 -p1 +%patch99 -p1 +%patch53 -p1 +%patch100 -p1 +%patch101 -p1 +%patch102 -p1 mv -f po/{sr,sr@Latn}.po rm -rf sqlite zlib popt @@ -854,9 +870,12 @@ fi cd .. %endif -# config.guess doesn't handle athlon, so we have to change it by hand. # rpm checks for CPU type at runtime, but it looks better -sed -i -e 's|@host@|%{_target_cpu}-%{_target_vendor}-linux-gnu|' -e 's|@host_cpu@|%{_target_cpu}|' macros.in +sed -i \ + -e 's|@host@|%{_target_cpu}-%{_target_vendor}-%{_target_os}|' \ + -e 's|@host_cpu@|%{_target_cpu}|' \ + -e 's|@host_os@|%{_target_os}|' \ + macros.in # pass CC and CXX too in case of building with some older configure macro # disable perl-RPM2 build, we have it in separate spec @@ -994,31 +1013,29 @@ 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} - -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 %{SOURCE16} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.java -install %{SOURCE19} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.gstreamer - -install %{SOURCE1} doc/manual/groups -install %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/install-build-tree -install %{SOURCE4} $RPM_BUILD_ROOT%{_rpmlibdir}/find-spec-bcond -install %{SOURCE7} $RPM_BUILD_ROOT%{_rpmlibdir}/compress-doc -install %{SOURCE14} $RPM_BUILD_ROOT%{_rpmlibdir}/user_group.sh -install %{SOURCE17} $RPM_BUILD_ROOT%{_rpmlibdir}/java-find-requires -install scripts/php.{prov,req} $RPM_BUILD_ROOT%{_rpmlibdir} -install %{SOURCE5} $RPM_BUILD_ROOT%{_rpmlibdir}/hrmib-cache -install %{SOURCE15} $RPM_BUILD_ROOT/etc/sysconfig/rpm - -install %{SOURCE18} $RPM_BUILD_ROOT%{_bindir}/banner.sh +install -p scripts/rpmdiff scripts/rpmdiff.cgi $RPM_BUILD_ROOT%{_rpmlibdir} + +cp -a macros.perl $RPM_BUILD_ROOT%{_rpmlibdir}/macros.perl +cp -a macros.python $RPM_BUILD_ROOT%{_rpmlibdir}/macros.python +cp -a macros.php $RPM_BUILD_ROOT%{_rpmlibdir}/macros.php +cp -a macros.mono $RPM_BUILD_ROOT%{_rpmlibdir}/macros.mono +cp -a %{SOURCE16} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.java +cp -a %{SOURCE19} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.gstreamer + +install -p %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/install-build-tree +install -p %{SOURCE4} $RPM_BUILD_ROOT%{_rpmlibdir}/find-spec-bcond +install -p %{SOURCE7} $RPM_BUILD_ROOT%{_rpmlibdir}/compress-doc +install -p %{SOURCE14} $RPM_BUILD_ROOT%{_rpmlibdir}/user_group.sh +install -p %{SOURCE17} $RPM_BUILD_ROOT%{_rpmlibdir}/java-find-requires +install -p scripts/php.{prov,req} $RPM_BUILD_ROOT%{_rpmlibdir} +install -p %{SOURCE5} $RPM_BUILD_ROOT%{_rpmlibdir}/hrmib-cache +install -p %{SOURCE18} $RPM_BUILD_ROOT%{_bindir}/banner.sh +cp -a %{SOURCE15} $RPM_BUILD_ROOT/etc/sysconfig/rpm install -d $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Conflictname touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Dirnames -install %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Filelinktos +cp -a %{SOURCE12} $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 @@ -1038,10 +1055,10 @@ cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros <