X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=c8ad9d6c51670d75fd1f7e7713f9c902378a87d0;hb=1a583afdef5d37f526b757dafcae3e408dec0d9c;hp=81e9032cbd39e5fe01078ad90ef9ebc408c2e073;hpb=a63662c4dca8ff218882fdae66d360433abda276;p=packages%2Frpm.git diff --git a/rpm.spec b/rpm.spec index 81e9032..c8ad9d6 100644 --- a/rpm.spec +++ b/rpm.spec @@ -2,27 +2,25 @@ # 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) -# - consider using system libmagic not internal libfmagic -# (but internal has different method of passing output) -# +# - repackaging when lzma is not installed (todo: fix digest signature of header) +# # Conditional build: -%bcond_with static # build static rpmi (not supported at the moment) +%bcond_with static # build static rpm+rpmi %bcond_without apidocs # don't generate documentation with doxygen %bcond_with autoreqdep # autogenerate package name deps in addition to sonames/perl(X) -%bcond_without home_etc # build without HOME_ETC support %bcond_without python # don't build python bindings %bcond_without selinux # build without selinux support -%bcond_without system_libmagic # don't use system libmagic +%bcond_without system_libmagic # don't use system libmagic %bcond_with neon # build with HTTP/WebDAV support (neon library) # force_cc - force using __cc other than "%{_target_cpu}-pld-linux-gcc" # force_cxx - force using __cxx other than "%{_target_cpu}-pld-linux-g++" # force_cpp - force using __cpp other than "%{_target_cpu}-pld-linux-gcc -E" # versions of required libraries -%define reqdb_ver 4.3.27-1 -%define reqpopt_ver 1.10.2 +%define reqdb_ver 4.4.20 +%define reqpopt_ver 1.10.6 %define beecrypt_ver 2:4.1.2-4 -%define rpm_macros_rev 1.236 +%define sover 4.4 Summary: RPM Package Manager Summary(de): RPM Packet-Manager Summary(es): Gestor de paquetes RPM @@ -31,13 +29,12 @@ Summary(pt_BR): Gerenciador de pacotes RPM Summary(ru): íÅÎÅÄÖÅÒ ÐÁËÅÔÏ× ÏÔ RPM Summary(uk): íÅÎÅÄÖÅÒ ÐÁËÅÔ¦× ×¦Ä RPM Name: rpm -%define sover 4.4 -Version: 4.4.2 -Release: 2 +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: e24ce468082479fe850c9d6563f56db5 +# Source0-md5: d012c81b5169f7377ea4a36607e1445e Source1: %{name}.groups Source2: %{name}.platform Source3: %{name}-install-tree @@ -48,7 +45,7 @@ Source7: %{name}-compress-doc Source8: %{name}-check-files Source9: %{name}-php-provides Source10: %{name}-php-requires -Source11: %{name}.macros + Source12: perl.prov Source13: %{name}-user_group.sh Source14: %{name}.sysconfig @@ -68,7 +65,7 @@ Patch7: %{name}-scripts-closefds.patch Patch8: %{name}-python-macros.patch Patch9: %{name}-gettext-in-header.patch Patch10: %{name}-compress-doc.patch -Patch11: %{name}-build.patch +Patch11: %{name}-rpmdeps-segv.patch Patch12: %{name}-system_libs.patch Patch13: %{name}-bb-and-short-circuit.patch Patch14: %{name}-etc_dir.patch @@ -76,7 +73,7 @@ Patch15: %{name}-system_libs-more.patch Patch16: %{name}-php-deps.patch Patch17: %{name}-ldconfig-always.patch Patch18: %{name}-perl_req.patch - +Patch19: %{name}-link.patch Patch20: %{name}-magic-usesystem.patch Patch21: %{name}-dontneedutils.patch Patch22: %{name}-provides-dont-obsolete.patch @@ -90,64 +87,78 @@ Patch29: %{name}-libdir64.patch Patch30: %{name}-libdir-links.patch Patch31: %{name}-missing-prototypes.patch Patch32: %{name}-pld-autodep.patch -Patch33: %{name}-rpmsq.patch +Patch33: %{name}-arch-x86_64.patch 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}-pythondeps.patch Patch40: %{name}-print-requires.patch Patch41: %{name}-reduce-stack-usage.patch -Patch42: %{name}-glob.patch +Patch42: %{name}-old-fileconflicts-behaviour.patch Patch43: %{name}-patch-quote.patch Patch44: %{name}-no-neon.patch Patch45: %{name}-no-sqlite.patch Patch46: %{name}-mono.patch -Patch47: %{name}-posttrans.patch +Patch47: %{name}-rpmrc-resurrect.patch +Patch48: %{name}-requireseq.patch +Patch49: %{name}-p4.patch +Patch50: %{name}-macros.patch +Patch51: %{name}-cleanlibdirs.patch +Patch52: %{name}-morearchs.patch +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/ -Icon: rpm.gif -BuildRequires: autoconf >= 2.52 +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: findutils BuildRequires: gettext-devel >= 0.11.4-2 -%{?with_home_etc:BuildRequires: home-etc-devel >= 1:1.0.9-2} -%{?with_system_libmagic:BuildRequires: libmagic-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 BuildRequires: libstdc++-devel -BuildRequires: libtool +BuildRequires: libtool >= 1:1.4.2-9 %if %{with neon} BuildRequires: libxml2-devel -BuildRequires: neon-devel >= 0.24.7-3 +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 -BuildRequires: readline-devel +%{?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} BuildRequires: bzip2-static >= 1.0.2-17 BuildRequires: db-static >= %{reqdb_ver} -BuildRequires: glibc-static >= 2.2.94 BuildRequires: elfutils-static -%{with_system_libmagic:BuildRequires: libmagic-static} +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 %endif +Requires: %{name}-base = %{version}-%{release} +Requires: %{name}-lib = %{version}-%{release} Requires: beecrypt >= %{beecrypt_ver} Requires: popt >= %{reqpopt_ver} -Requires: %{name}-lib = %{version}-%{release} %{!?with_static:Obsoletes: rpm-utils-static} Conflicts: glibc < 2.2.92 # avoid SEGV caused by mixed db versions @@ -160,6 +171,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # don't require very fresh rpm.macros to build %define __gettextize gettextize --copy --force --intl ; cp -f po/Makevars{.template,} %define ix86 i386 i486 i586 i686 athlon pentium3 pentium4 +%define ppc ppc ppc7400 ppc7450 %define x8664 amd64 ia32e x86_64 # stabilize new build environment @@ -169,6 +181,8 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _rpmlibdir /usr/lib/rpm +%define specflags -fno-strict-aliasing + %description RPM is a powerful package manager, which can be used to build, install, query, verify, update, and uninstall individual software @@ -218,6 +232,26 @@ RPM - ÓÌÕÖÂÏ×ϧ ¦ÎÆÏÒÍÁæ§, ÝÏ Í¦ÓÔÉÔØ ÎÁÚ×Õ, ×ÅÒÓ¦À, ÏÐÉÓ ÔÁ ¦ÎÛÕ ¦ÎÆÏÒÍÁæÀ ÐÒÏ ÐÁËÅÔ. +%package base +Summary: RPM base package - scripts used by rpm packages themselves +Summary(pl): Podstawowy pakiet RPM - skrypty u¿ywane przez same pakiety rpm +Group: Base +Requires: filesystem +Obsoletes: vserver-rpm + +%description base +The RPM base package contains scripts used by rpm packages themselves. +These include: +- scripts for adding/removing groups and users needed for rpm + packages, +- banner.sh to display %%banner messages from rpm scriptlets. + +%description base -l pl +Pakiet podstawowy RPM zwiera skrypty u¿ywane przez same pakiety rpm. +Zawiera on: +- skrypty dodaj±ce/usuwaj±ce grupy i u¿ytkowników dla pakietów rpm, +- banner.sh do pokazywania komunikatów %%banner dla skryptletów rpm. + %package lib Summary: RPMs library Summary(pl): Biblioteki RPM-a @@ -225,15 +259,12 @@ Group: Libraries Requires: beecrypt >= %{beecrypt_ver} Requires: db >= %{reqdb_ver} %{?with_selinux:Requires: libselinux >= 1.18} -%{?with_system_libmagic:Requires: libmagic >= 1.15-2} +%{?with_system_libmagic:Requires: libmagic >= 1.15-2} Requires: popt >= %{reqpopt_ver} Obsoletes: rpm-libs # avoid SEGV caused by mixed db versions Conflicts: poldek < 0.18.1-16 -%if %{with home_etc} -# avoid linking to /usr/lib -Conflicts: home-etc < 1.0.9-2 -%endif +Suggests: lzma %description lib RPMs library. @@ -255,9 +286,8 @@ Requires: beecrypt-devel >= %{beecrypt_ver} Requires: bzip2-devel Requires: db-devel >= %{reqdb_ver} Requires: elfutils-devel -%{?with_home_etc:Requires: home-etc-devel >= 1:1.0.9-2} +%{?with_system_libmagic:Requires: libmagic-devel} %{?with_selinux:Requires: libselinux-devel} -%{?with_system_libmagic:Requires: libmagic-devel} Requires: popt-devel >= %{reqpopt_ver} Requires: zlib-devel @@ -319,7 +349,7 @@ Requires: beecrypt-static >= %{beecrypt_ver} Requires: bzip2-static Requires: db-static >= %{reqdb_ver} Requires: elfutils-static -%{?with_system_libmagic:Requires: libmagic-static} +%{?with_system_libmagic:Requires: libmagic-static} Requires: popt-static >= %{reqpopt_ver} Requires: zlib-static @@ -407,30 +437,31 @@ Summary(ru): Summary(uk): óËÒÉÐÔÉ ÔÁ ÕÔÉ̦ÔÉ, ÎÅÏÂȦÄΦ ÄÌÑ ÐÏÂÕÄÏ×É ÐÁËÅÔ¦× Group: Applications/File Requires(pre): findutils +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 Requires: diffutils Requires: elfutils -Requires: file >= 4.14-1 +Requires: file >= 4.17 Requires: fileutils Requires: findutils Requires: gcc >= 5:3.4 Requires: glibc-devel Requires: grep Requires: gzip +Requires: lzma Requires: make Requires: patch -Requires: popt >= 1.7 Requires: sed Requires: sh-utils Requires: tar Requires: textutils -Provides: rpmbuild(macros) = %{rpm_macros_rev} Provides: rpmbuild(monoautodeps) Provides: rpmbuild(noauto) = 3 %ifarch %{x8664} @@ -534,6 +565,7 @@ Summary: Additional utilities for managing rpm packages and database Summary(pl): 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 @@ -578,22 +610,22 @@ Python para manipular pacotes e bancos de dados RPM. %package apidocs Summary: RPM API documentation and guides Summary(pl): Documentacja API RPM-a i przewodniki -Group: Documentation +Group: Documentation %description apidocs -Documentation for RPM API and guides in HTML format generated -from rpm sources by doxygen. +Documentation for RPM API and guides in HTML format generated from rpm +sources by doxygen. %description apidocs -l pl -Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane -ze ¼rode³ RPM-a przez doxygen. +Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze +¼rode³ RPM-a przez doxygen. %prep %setup -q +%patch0 -p1 %patch1 -p1 %patch2 -p1 -# temporarily moved after patch0 - messes too much in pl.po -#%patch3 -p1 +%patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 @@ -610,7 +642,7 @@ ze %patch17 -p1 %patch18 -p1 sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in -cp -f platform.in macros.pld.in +#cp -f platform.in macros.pld.in # what for? 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 @@ -622,7 +654,7 @@ install %{SOURCE5} scripts/find-lang.sh install %{SOURCE9} scripts/php.prov.in install %{SOURCE10} scripts/php.req.in install %{SOURCE12} scripts/perl.prov -cat %{SOURCE11} >> macros.in +%patch19 -p1 %patch20 -p1 %patch21 -p1 %patch22 -p1 @@ -641,6 +673,7 @@ cat %{SOURCE11} >> macros.in %patch35 -p0 %patch36 -p1 %patch37 -p1 +%patch38 -p1 %patch39 -p1 %patch40 -p1 %patch41 -p1 @@ -650,8 +683,17 @@ cat %{SOURCE11} >> macros.in %patch45 -p1 %patch46 -p1 %patch47 -p1 -%patch0 -p1 -%patch3 -p1 +%patch48 -p1 +%patch49 -p1 +%patch50 -p1 +%patch51 -p1 +#%patch52 -p1 +%patch53 -p1 +%patch54 -p1 +%patch55 -p1 +%patch56 -p1 +%patch57 -p1 +%patch58 -p1 cd scripts mv -f perl.req perl.req.in @@ -701,19 +743,19 @@ mv -f macros.tmp macros.in CPPFLAGS="-Dglob=rpm_glob -Dglobfree=rpm_globfree"; export CPPFLAGS # pass CC and CXX too in case of building with some older configure macro +# disable perl-RPM2 build, we have it in separate spec %configure \ CC="%{__newcc}" \ CXX="%{__newcxx}" \ CPP="%{__newcpp}" \ + WITH_PERL_VERSION=no \ %{?with_autoreqdep:--enable-adding-packages-names-in-autogenerated-dependancies} \ --enable-shared \ --enable-static \ - %{?with_apidocs:--with-apidocs} \ - %{?with_home_etc:--with-home_etc} \ - %{?with_python:--with-python=auto} \ + %{!?with_apidocs:--without-apidocs} \ + %{?with_python:--with-python=2.5} \ %{!?with_python:--without-python} \ %{!?with_selinux:--without-selinux} \ - --with-glob \ --without-db # file_LDFLAGS, debugedit_LDADD - no need to link "file" and "debugedit" statically @@ -724,21 +766,26 @@ CPPFLAGS="-Dglob=rpm_glob -Dglobfree=rpm_globfree"; export CPPFLAGS pylibdir=%{py_libdir} \ myLDFLAGS="%{rpmldflags}" \ file_LDFLAGS= \ - debugedit_LDADD="\$(WITH_LIBELF_LIB) -lpopt" - -# %{!?with_static:rpm_LDFLAGS="\$(myLDFLAGS)"} \ + 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} +install -d $RPM_BUILD_ROOT{/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm,/var/lib/banner} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ + staticLDFLAGS=%{?with_static:-all-static} \ pylibdir=%{py_libdir} \ pkgbindir="%{_bindir}" +%ifarch %{ppc} +#sed -e '/_target_platform/s/[%]{_target_cpu}/ppc/' \ +# -i $RPM_BUILD_ROOT%{_rpmlibdir}/ppc74[05]0-linux/macros +%endif + rm $RPM_BUILD_ROOT%{_rpmlibdir}/vpkg-provides* rm $RPM_BUILD_ROOT%{_rpmlibdir}/find-{prov,req}.pl rm $RPM_BUILD_ROOT%{_rpmlibdir}/find-{provides,requires}.perl @@ -781,6 +828,9 @@ cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros < $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprovfiles < $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprov < $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreqfiles < $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreq < $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreqdep < $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautocompressdoc <