X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=c3c55523422f2cbefdc40ca3c7ca1b77d4a66d26;hb=8483a4b672512b2829806fbd9bb903b3bbc00026;hp=31b2f694e61b3e145680bd27fee7b13eb393d34d;hpb=c5555b4d20c27d7c686ea2cdae5a5cc55894f630;p=packages%2Frpm.git diff --git a/rpm.spec b/rpm.spec index 31b2f69..c3c5552 100644 --- a/rpm.spec +++ b/rpm.spec @@ -12,17 +12,19 @@ # 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 +# - fix linking, rpm is beeing linked against installed rpmio # # Conditional build: %bcond_with static # build static rpm+rpmi %bcond_without apidocs # don't generate documentation with doxygen -%bcond_with internal_db # internal db (db 4.5.20) +%bcond_with internal_db # internal db (db 4.5.20) %if "%{pld_release}" == "ac" %bcond_without autoreqdep # autogenerate package name deps in addition to sonames/perl(X) -%bcond_with nptl # internal db: don't use process-shared POSIX mutexes (NPTL provides full interface) +%bcond_with nptl # internal db: don't use process-shared POSIX mutexes (NPTL provides full interface) %else -%bcond_with autoreqdep # autogenerate package name deps in addition to sonames/perl(X) -%bcond_without nptl # internal db: don't use process-shared POSIX mutexes (NPTL provides full interface) +%bcond_with autoreqdep # autogenerate package name deps in addition to sonames/perl(X) +%bcond_without nptl # internal db: don't use process-shared POSIX mutexes (NPTL provides full interface) %endif %bcond_without python # don't build python bindings %bcond_without selinux # build without selinux support @@ -55,7 +57,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 4.5 -Release: 22 +Release: 60 License: LGPL Group: Base Source0: %{name}-%{version}.tar.gz @@ -82,6 +84,8 @@ Source17: %{name}-java-requires # http://svn.pld-linux.org/banner.sh/ Source18: banner.sh Source19: %{name}-macros.gstreamer +Source20: macros.php +Source21: %{name}-php-requires.php Patch1000: %{name}-new-debuginfo.patch Patch1067: %{name}-disable-features.patch Patch1070: %{name}-rpmrc-ac.patch @@ -92,12 +96,15 @@ 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 +Patch16: %{name}-libmagic-locale.patch Patch17: %{name}-ldconfig-always.patch Patch18: %{name}-macros-ac.patch Patch19: %{name}-macros-th.patch @@ -171,6 +178,13 @@ 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 +Patch103: %{name}-lua-exit-chroot-correctly.patch +Patch104: %{name}-glob.patch +Patch105: %{name}-am.patch URL: http://rpm5.org/ BuildRequires: autoconf >= 2.57 BuildRequires: automake >= 1.4 @@ -179,6 +193,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 @@ -188,7 +203,7 @@ BuildRequires: libtool >= 1:1.4.2-9 BuildRequires: libxml2-devel BuildRequires: neon-devel >= 0.25.5 %endif -BuildRequires: ossp-uuid-devel >= 1.6.2-6 +BuildRequires: ossp-uuid-devel >= 1.6.2-8 BuildRequires: patch >= 2.2 BuildRequires: popt-devel >= %{reqpopt_ver} %{?with_python:BuildRequires: python-devel >= 1:2.3} @@ -197,7 +212,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 +229,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 +343,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 +372,12 @@ 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: ossp-uuid-devel >= 1.6.2-6 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 +437,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,13 +556,13 @@ Requires: gcc >= 5:3.4 Requires: glibc-devel Requires: grep Requires: gzip -Requires: lzma Requires: make Requires: patch Requires: sed Requires: sh-utils Requires: tar Requires: textutils +Requires: xz Provides: rpmbuild(monoautodeps) Provides: rpmbuild(noauto) = 3 %ifarch %{x8664} @@ -697,18 +715,20 @@ 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 +%patch16 -p1 %patch17 -p1 sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in echo '%%define __perl_provides %%{__perl} /usr/lib/rpm/perl.prov' > macros.perl echo '%%define __perl_requires %%{__perl} /usr/lib/rpm/perl.req' >> macros.perl echo '# obsoleted file' > macros.python -echo '%%define __php_provides /usr/lib/rpm/php.prov' > macros.php -echo '%%define __php_requires /usr/lib/rpm/php.req' >> macros.php +cp -p %{SOURCE20} 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 %{SOURCE10} scripts/php.prov @@ -749,7 +769,6 @@ install %{SOURCE13} scripts/perl.prov %endif %patch51 -p1 #%patch52 -p1 -%patch53 -p1 %patch55 -p1 %patch56 -p1 %patch57 -p1 @@ -790,6 +809,14 @@ install %{SOURCE13} scripts/perl.prov %patch96 -p1 %patch97 -p1 %patch98 -p1 +%patch99 -p1 +%patch53 -p1 +%patch100 -p1 +%patch101 -p1 +%patch102 -p1 +%patch103 -p1 +%patch104 -p1 +%patch105 -p1 mv -f po/{sr,sr@Latn}.po rm -rf sqlite zlib popt @@ -854,13 +881,16 @@ 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 -CPPFLAGS=-I/usr/include/oosp-uuid +CPPFLAGS="%{rpmcppflags} -I/usr/include/ossp-uuid" %configure \ CC="%{__newcc}" \ CXX="%{__newcxx}" \ @@ -898,8 +928,7 @@ install %{SOURCE9} $RPM_BUILD_ROOT/etc/pki/rpm-gpg %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ staticLDFLAGS=%{?with_static:-all-static} \ - pylibdir=%{py_libdir} \ - pkgbindir="%{_bindir}" + pylibdir=%{py_libdir} cat <<'EOF' > $RPM_BUILD_ROOT/etc/tmpwatch/rpm.conf # Cleanup 90-days old repackage files. @@ -973,16 +1002,28 @@ s390-[^-]*-[Ll]inux(-gnu)? %ifarch sparc64 sparc64-[^-]*-[Ll]inux(-gnu)? -sparcv8-[^-]*-[Ll]inux(-gnu)? -sparcv9-[^-]*-[Ll]inux(-gnu)? %endif -%ifarch sparcv9 -sparcv8-[^-]*-[Ll]inux(-gnu)? +%ifarch sparcv9 sparc64 sparcv9-[^-]*-[Ll]inux(-gnu)? %endif %ifarch sparc sparcv9 sparc64 sparc-[^-]*-[Ll]inux(-gnu)? %endif +%ifarch armv5tel +armv5tel-[^-]*-[Ll]inux(-gnu)? +%endif +%ifarch armv4t armv5tel +armv4t-[^-]*-[Ll]inux(-gnu)? +%endif +%ifarch armv3t armv4t armv5tel +armv3t-[^-]*-[Ll]inux(-gnu)? +%endif +%ifarch armv5teb +armv5teb-[^-]*-[Ll]inux(-gnu)? +%endif +%ifarch armv4b armv5teb +armv4b-[^-]*-[Ll]inux(-gnu)? +%endif # noarch noarch-[^-]*-.* @@ -994,31 +1035,30 @@ 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} +cp -p %{SOURCE21} $RPM_BUILD_ROOT%{_rpmlibdir}/php.req.php +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,14 +1078,17 @@ cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros < $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.lang <&2 "You should rebuild your rpmdb: rpm --rebuilddb to avoid random rpmdb errors" +%if "%{pld_release}" == "th" +echo >&2 "You probably want to remove db4.5 package now" +%endif %triggerpostun -- %{name} < 4.4.9-44 %{_rpmlibdir}/hrmib-cache @@ -1287,6 +1334,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %{_libdir}/librpmdb.la %{_libdir}/librpmio.la %{_includedir}/rpm +%{_pkgconfigdir}/rpm.pc %files static %defattr(644,root,root,755) @@ -1365,7 +1413,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %ifarch %{ppc} %{_rpmlibdir}/ppc* %endif -%ifarch sparc sparc64 +%ifarch sparc sparcv9 sparc64 %{_rpmlibdir}/sparc* %endif %ifarch %{x8664} @@ -1373,6 +1421,9 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %{_rpmlibdir}/ia32e* %{_rpmlibdir}/x86_64* %endif +%ifarch armv5tel armv4t armv3t armv5teb armv4b +%{_rpmlibdir}/arm* +%endif # must be here for "Requires: rpm-*prov" to work %{_rpmlibdir}/macros.gstreamer %{_rpmlibdir}/macros.java