X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.spec;h=3f74429c9c53206d181cce8b8123e4b1906ddbf4;hp=5b6ba726d35c227f2be9e4986d7e09219b4690b2;hb=83d6a3feb7104a8f850bfd225beb1010834006cd;hpb=7d610ded82c5ffddeb8e0fba7e5e2bc493459afd diff --git a/rpm.spec b/rpm.spec index 5b6ba72..3f74429 100644 --- a/rpm.spec +++ b/rpm.spec @@ -2,24 +2,23 @@ # 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) # # 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 python # don't build python bindings %bcond_without selinux # build without selinux support +%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.1 -%define beecrypt_ver 2:4.1.0 -%define rpm_macros_rev 1.225 +%define reqdb_ver 4.4.20 +%define reqpopt_ver 1.10.5 +%define beecrypt_ver 2:4.1.2-4 Summary: RPM Package Manager Summary(de): RPM Packet-Manager Summary(es): Gestor de paquetes RPM @@ -29,12 +28,12 @@ Summary(ru): Summary(uk): íÅÎÅÄÖÅÒ ÐÁËÅÔ¦× ×¦Ä RPM Name: rpm %define sover 4.4 -Version: 4.4.1 -Release: 1.11 +Version: 4.4.5 +Release: 0.1 License: GPL Group: Base Source0: ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz -# Source0-md5: 90ded9047b1b69d918c6c7c7b56fd7a9 +# Source0-md5: d5f434789c0c56d05d77be6f4262a561 Source1: %{name}.groups Source2: %{name}.platform Source3: %{name}-install-tree @@ -45,7 +44,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 @@ -54,6 +53,7 @@ Source31: adapter.awk Source32: pldnotify.awk # http://svn.pld-linux.org/banner.sh/ Source33: banner.sh +Source34: php-pear-build-macros Patch0: %{name}-pl.po.patch Patch1: %{name}-rpmrc.patch Patch2: %{name}-arch.patch @@ -65,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 @@ -73,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}-no-bin-env.patch +Patch19: %{name}-link.patch Patch20: %{name}-magic-usesystem.patch Patch21: %{name}-dontneedutils.patch Patch22: %{name}-provides-dont-obsolete.patch @@ -92,49 +92,62 @@ Patch34: %{name}-epoch0.patch Patch35: %{name}-perl_req-INC_dirs.patch Patch36: %{name}-debuginfo.patch Patch37: %{name}-doxygen_hack.patch -Patch38: %{name}-gcc4.patch +Patch38: %{name}-empty-rpmlock-path.patch Patch39: %{name}-pythondeps.patch Patch40: %{name}-print-requires.patch Patch41: %{name}-reduce-stack-usage.patch -URL: http://www.rpm.org/ -Icon: rpm.gif +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 + +Patch48: %{name}-requireseq.patch +Patch49: %{name}-p4.patch +Patch50: %{name}-macros.patch +Patch51: %{name}-cleanlibdirs.patch +Patch52: %{name}-morearchs.patch +URL: http://wraptastic.org/ BuildRequires: autoconf >= 2.52 BuildRequires: automake BuildRequires: beecrypt-devel >= %{beecrypt_ver} -BuildRequires: bzip2-devel >= 1.0.1 +BuildRequires: bzip2-devel >= 1.0.2-17 BuildRequires: db-devel >= %{reqdb_ver} %{?with_apidocs:BuildRequires: doxygen} -BuildRequires: elfutils-devel +BuildRequires: elfutils-devel >= 0.108 BuildRequires: findutils BuildRequires: gettext-devel >= 0.11.4-2 -#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 +%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 >= 2.2} -BuildRequires: python-modules >= 2.2 -BuildRequires: readline-devel +%{?with_python:BuildRequires: python-devel >= 1:2.3} +BuildRequires: python-modules >= 1:2.3 BuildRequires: rpm-perlprov +%{?with_python:BuildRequires: rpm-pythonprov} BuildRequires: zlib-devel %if %{with static} # Require static library only for static build BuildRequires: beecrypt-static >= %{beecrypt_ver} -BuildRequires: bzip2-static >= 1.0.2-5 +BuildRequires: bzip2-static >= 1.0.2-17 BuildRequires: db-static >= %{reqdb_ver} BuildRequires: glibc-static >= 2.2.94 BuildRequires: elfutils-static -#BuildRequires: libmagic-static +%{?with_system_libmagic:BuildRequires: libmagic-static} %{?with_selinux:BuildRequires: libselinux-static >= 1.18} BuildRequires: popt-static >= %{reqpopt_ver} BuildRequires: zlib-static %endif Requires: beecrypt >= %{beecrypt_ver} Requires: popt >= %{reqpopt_ver} +Requires: %{name}-base = %{version}-%{release} Requires: %{name}-lib = %{version}-%{release} %{!?with_static:Obsoletes: rpm-utils-static} Conflicts: glibc < 2.2.92 @@ -148,6 +161,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 @@ -157,6 +171,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 @@ -206,13 +222,35 @@ 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 +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 Group: Libraries +Requires: beecrypt >= %{beecrypt_ver} Requires: db >= %{reqdb_ver} -%{?with_selinux:BuildRequires: libselinux >= 1.18} +%{?with_selinux:Requires: libselinux >= 1.18} +%{?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 @@ -237,6 +275,7 @@ Requires: bzip2-devel Requires: db-devel >= %{reqdb_ver} Requires: elfutils-devel %{?with_selinux:Requires: libselinux-devel} +%{?with_system_libmagic:Requires: libmagic-devel} Requires: popt-devel >= %{reqpopt_ver} Requires: zlib-devel @@ -298,6 +337,7 @@ Requires: beecrypt-static >= %{beecrypt_ver} Requires: bzip2-static Requires: db-static >= %{reqdb_ver} Requires: elfutils-static +%{?with_system_libmagic:Requires: libmagic-static} Requires: popt-static >= %{reqpopt_ver} Requires: zlib-static @@ -385,6 +425,7 @@ Summary(ru): Summary(uk): óËÒÉÐÔÉ ÔÁ ÕÔÉ̦ÔÉ, ÎÅÏÂȦÄΦ ÄÌÑ ÐÏÂÕÄÏ×É ÐÁËÅÔ¦× Group: Applications/File Requires(pre): findutils +Requires: %{name}-build-macros >= 1.284 Requires: %{name}-utils = %{version}-%{release} Requires: /bin/id Requires: awk @@ -394,22 +435,20 @@ Requires: chrpath >= 0.10-4 Requires: cpio Requires: diffutils Requires: elfutils -Requires: file >= 4.13-2 +Requires: file >= 4.14-1 Requires: fileutils Requires: findutils -# because of -fvisibility... related fixes -Requires: gcc >= 5:4.0.1-0.20050514.2 +Requires: gcc >= 5:3.4 Requires: glibc-devel Requires: grep Requires: gzip 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} Conflicts: automake < 1:1.7.9-2 @@ -497,6 +536,7 @@ Summary(pl): Makra u Group: Applications/File Requires: %{name} = %{version}-%{release} Requires: python +Requires: python-modules %description pythonprov Python macros, which simplifies creation of rpm packages with Python @@ -511,15 +551,24 @@ 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: php-pear-PEAR >= 1:1.4.0-0.b1.3 +Requires: php-zlib +Requires: sed >= 4.0 %description php-pearprov Additional utilities for checking php pear provides/requires in rpm packages. +This package provides rpm macros and dependencies to help building +PEAR packages. + %description php-pearprov -l pl Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci skryptów php pear w pakietach rpm. +Ten pakiet dostarcza makra rpm-a i zale¿no¶ci pomagaj±ce przy +budowaniu pakietów PEAR-a. + %package -n python-rpm Summary: Python interface to RPM library Summary(pl): Pythonowy interfejs do biblioteki RPM-a @@ -567,10 +616,10 @@ ze %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 @@ -581,25 +630,24 @@ ze %patch11 -p1 %patch12 -p1 %patch13 -p1 -# home-etc FIXME -#%patch14 -p1 +%patch14 -p1 %patch15 -p1 %patch16 -p1 %patch17 -p1 %patch18 -p1 -%patch19 -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 -echo '%%define __php_provides /usr/lib/rpm/php.prov' > macros.php -echo '%%define __php_requires /usr/lib/rpm/php.req' >> macros.php +install %{SOURCE34} 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 %{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 @@ -622,10 +670,19 @@ cat %{SOURCE11} >> macros.in %patch39 -p1 %patch40 -p1 %patch41 -p1 -%patch0 -p1 -%patch3 -p1 - -cd scripts; +%patch42 -p1 +%patch43 -p1 +%{!?with_neon:%patch44 -p1} +%patch45 -p1 +%patch46 -p1 + +%patch48 -p1 +%patch49 -p1 +%patch50 -p1 +%patch51 -p1 +%patch52 -p1 + +cd scripts mv -f perl.req perl.req.in mv -f perl.prov perl.prov.in cd .. @@ -633,7 +690,7 @@ cd .. mv -f po/{no,nb}.po mv -f po/{sr,sr@Latn}.po -rm -rf neon zlib libelf db db3 popt rpmdb/db.h +rm -rf sqlite zlib db db3 popt rpmdb/db.h # generate Group translations to *.po awk -f %{SOURCE6} %{SOURCE1} @@ -645,6 +702,9 @@ for f in doc{,/ja,/pl}/rpm.8 doc{,/ja,/pl}/rpmbuild.8 ; do done %build +%if %{with system_libmagic} +rm -rf file +%else cd file %{__libtoolize} %{__aclocal} @@ -652,6 +712,7 @@ cd file %{__autoconf} %{__automake} cd .. +%endif %{__libtoolize} %{__gettextize} @@ -666,15 +727,19 @@ sed -e 's|@host@|%{_target_cpu}-%{_target_vendor}-linux-gnu|' \ -e 's|@host_cpu@|%{_target_cpu}|' macros.in > macros.tmp 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_apidoc:--with-apidocs} \ - %{?with_pkgnameinautoreq:--enable-adding-packages-names-in-autogenerated-dependancies} \ + %{?with_apidocs:--with-apidocs} \ %{?with_python:--with-python=auto} \ %{!?with_python:--without-python} \ %{!?with_selinux:--without-selinux} \ @@ -688,20 +753,26 @@ mv -f macros.tmp macros.in pylibdir=%{py_libdir} \ myLDFLAGS="%{rpmldflags}" \ file_LDFLAGS= \ - debugedit_LDADD="\$(WITH_LIBELF_LIB) -lpopt" + debugedit_LDADD="\$(WITH_LIBELF_LIB) -lpopt" \ + staticLDFLAGS=%{?with_static:-all-static} -# %{!?with_static:rpm_LDFLAGS="\$(myLDFLAGS)"} \ %{?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 @@ -709,6 +780,7 @@ rm $RPM_BUILD_ROOT%{_rpmlibdir}/find-{provides,requires}.perl 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 %{SOURCE1} doc/manual/groups install %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/install-build-tree @@ -814,6 +886,8 @@ cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreqdep < $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautocompressdoc <