X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=c8ad9d6c51670d75fd1f7e7713f9c902378a87d0;hb=1a583afdef5d37f526b757dafcae3e408dec0d9c;hp=c35ecb9b1632b6e5f4327cb20e5f0a6d40b79137;hpb=1d9ca0c1a6c4f7fbc563b8a489e6f20e74d066f1;p=packages%2Frpm.git diff --git a/rpm.spec b/rpm.spec index c35ecb9..c8ad9d6 100644 --- a/rpm.spec +++ b/rpm.spec @@ -2,6 +2,7 @@ # TODO: # - python(abi) cap is not provided automatically (because /usr/bin/python matches # ELF first; it should be provided by python-libs not binary anyway) +# - repackaging when lzma is not installed (todo: fix digest signature of header) # # Conditional build: %bcond_with static # build static rpm+rpmi @@ -28,12 +29,12 @@ Summary(pt_BR): Gerenciador de pacotes RPM Summary(ru): íÅÎÅÄÖÅÒ ÐÁËÅÔÏ× ÏÔ RPM Summary(uk): íÅÎÅÄÖÅÒ ÐÁËÅÔ¦× ×¦Ä RPM Name: rpm -Version: 4.4.6 -Release: 1.6 +Version: 4.4.7 +Release: 0.2 License: GPL Group: Base Source0: ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz -# Source0-md5: baa6f371446c65b4080d1cd1f194a7ae +# Source0-md5: d012c81b5169f7377ea4a36607e1445e Source1: %{name}.groups Source2: %{name}.platform Source3: %{name}-install-tree @@ -86,7 +87,7 @@ Patch29: %{name}-libdir64.patch Patch30: %{name}-libdir-links.patch Patch31: %{name}-missing-prototypes.patch Patch32: %{name}-pld-autodep.patch - +Patch33: %{name}-arch-x86_64.patch Patch34: %{name}-epoch0.patch Patch35: %{name}-perl_req-INC_dirs.patch Patch36: %{name}-debuginfo.patch @@ -100,7 +101,7 @@ Patch43: %{name}-patch-quote.patch Patch44: %{name}-no-neon.patch Patch45: %{name}-no-sqlite.patch Patch46: %{name}-mono.patch - +Patch47: %{name}-rpmrc-resurrect.patch Patch48: %{name}-requireseq.patch Patch49: %{name}-p4.patch Patch50: %{name}-macros.patch @@ -110,13 +111,14 @@ Patch53: %{name}-lzma.patch Patch54: %{name}-lzma2.patch Patch55: %{name}-truncate-cvslog.patch Patch56: %{name}-skip-backups.patch +Patch57: %{name}-as_needed-fix.patch +Patch58: %{name}-repackage-wo-lzma.patch URL: http://wraptastic.org/ BuildRequires: autoconf >= 2.57 BuildRequires: automake BuildRequires: beecrypt-devel >= %{beecrypt_ver} BuildRequires: bzip2-devel >= 1.0.2-17 BuildRequires: db-devel >= %{reqdb_ver} -%{?with_apidocs:BuildRequires: doxygen} BuildRequires: elfutils-devel >= 0.108 BuildRequires: gettext-devel >= 0.11.4-2 %{?with_system_libmagic:BuildRequires: libmagic-devel} @@ -130,11 +132,17 @@ BuildRequires: neon-devel >= 0.25.5 %endif BuildRequires: patch >= 2.2 BuildRequires: popt-devel >= %{reqpopt_ver} -%{?with_python:BuildRequires: python-devel >= 1:2.3} -BuildRequires: python-modules >= 1:2.3 +%{?with_python:BuildRequires: python-devel >= 1:2.5} +BuildRequires: python-modules >= 1:2.5 BuildRequires: rpm-perlprov %{?with_python:BuildRequires: rpm-pythonprov} BuildRequires: zlib-devel +%if %{with apidocs} +BuildRequires: doxygen +BuildRequires: ghostscript +BuildRequires: graphviz +BuildRequires: tetex-pdftex +%endif %if %{with static} # Require static library only for static build BuildRequires: beecrypt-static >= %{beecrypt_ver} @@ -256,6 +264,7 @@ Requires: popt >= %{reqpopt_ver} Obsoletes: rpm-libs # avoid SEGV caused by mixed db versions Conflicts: poldek < 0.18.1-16 +Suggests: lzma %description lib RPMs library. @@ -428,11 +437,12 @@ Summary(ru): Summary(uk): óËÒÉÐÔÉ ÔÁ ÕÔÉ̦ÔÉ, ÎÅÏÂȦÄΦ ÄÌÑ ÐÏÂÕÄÏ×É ÐÁËÅÔ¦× Group: Applications/File Requires(pre): findutils -Requires: %{name}-build-macros >= 1.302 +Requires: %{name}-build-macros >= 1.314 Requires: %{name}-utils = %{version}-%{release} Requires: /bin/id Requires: awk -Requires: binutils +# we need fixed binutils for -feliminate-dwarf2-dups +Requires: binutils >= 3:2.17.50.0.3-2 Requires: bzip2 Requires: chrpath >= 0.10-4 Requires: cpio @@ -658,7 +668,7 @@ install %{SOURCE12} scripts/perl.prov %patch30 -p1 %patch31 -p1 %patch32 -p1 - +%patch33 -p1 %patch34 -p1 %patch35 -p0 %patch36 -p1 @@ -672,7 +682,7 @@ install %{SOURCE12} scripts/perl.prov %{!?with_neon:%patch44 -p1} %patch45 -p1 %patch46 -p1 - +%patch47 -p1 %patch48 -p1 %patch49 -p1 %patch50 -p1 @@ -682,6 +692,8 @@ install %{SOURCE12} scripts/perl.prov %patch54 -p1 %patch55 -p1 %patch56 -p1 +%patch57 -p1 +%patch58 -p1 cd scripts mv -f perl.req perl.req.in @@ -740,8 +752,8 @@ CPPFLAGS="-Dglob=rpm_glob -Dglobfree=rpm_globfree"; export CPPFLAGS %{?with_autoreqdep:--enable-adding-packages-names-in-autogenerated-dependancies} \ --enable-shared \ --enable-static \ - %{?with_apidocs:--with-apidocs} \ - %{?with_python:--with-python=auto} \ + %{!?with_apidocs:--without-apidocs} \ + %{?with_python:--with-python=2.5} \ %{!?with_python:--without-python} \ %{!?with_selinux:--without-selinux} \ --without-db @@ -970,7 +982,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f #%attr(755,root,root) %{_rpmlibdir}/rpmk #%attr(755,root,root) %{_rpmlibdir}/rpm[qv] -%doc %attr(755,root,root) %{_rpmlibdir}/convertrpmrc.sh +#%doc %attr(755,root,root) %{_rpmlibdir}/convertrpmrc.sh %{_rpmlibdir}/rpmrc %{_rpmlibdir}/rpmpopt* @@ -1011,6 +1023,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %attr(755,root,root) %{_bindir}/rpm2cpio %attr(755,root,root) %{_bindir}/rpmcache %attr(755,root,root) %{_bindir}/rpmdeps +%attr(755,root,root) %{_bindir}/rpmdigest %attr(755,root,root) %{_bindir}/rpmgraph %{!?with_system_libmagic:%attr(755,root,root) %{_bindir}/rpmfile} %attr(755,root,root) %{_rpmlibdir}/find-debuginfo.sh @@ -1047,7 +1060,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rpm/noauto* %attr(755,root,root) %{_rpmlibdir}/brp-* %attr(755,root,root) %{_rpmlibdir}/check-files -%attr(755,root,root) %{_rpmlibdir}/check-prereqs +# %attr(755,root,root) %{_rpmlibdir}/check-prereqs %attr(755,root,root) %{_rpmlibdir}/compress-doc %attr(755,root,root) %{_rpmlibdir}/config.* %attr(755,root,root) %{_rpmlibdir}/cross-build @@ -1126,7 +1139,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f #%attr(755,root,root) %{_rpmlibdir}/find-*.perl #%attr(755,root,root) %{_rpmlibdir}/find-prov.pl #%attr(755,root,root) %{_rpmlibdir}/find-req.pl -%attr(755,root,root) %{_rpmlibdir}/get_magic.pl +#%attr(755,root,root) %{_rpmlibdir}/get_magic.pl %files pythonprov %defattr(644,root,root,755)