X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.spec;h=ea26e77b6664cb6db34940d174fcbe314cc4b137;hp=fca957f48a21ad6bec57a4e06e4a3e58165383c1;hb=24123ddd1679b63fae2b8eb50c7c664787b245d7;hpb=dacb4fe6c38507280cbba57e5a59f92c0459c436 diff --git a/rpm.spec b/rpm.spec index fca957f..ea26e77 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,23 +1,25 @@ # # TODO: -# - fix perl.req and perl.prov to support _noauto macros -# - use system libmagic not internal libfmagic +# - consider using system libmagic not internal libfmagic +# (but internal has different method of passing output) +# - after ac drop amd64 patch and make x86_64 generic arch + subarchs amd64 and ia32e # # Conditional build: -%bcond_without static # - build shared /bin/rpm (doesn't work at the moment) -%bcond_without docs # - don't generate documentation with doxygen -%bcond_without python # - don't build python bindings +%bcond_with static # build static rpmi (not supported at the moment) +%bcond_without doc # don't generate documentation with doxygen +%bcond_without python # don't build python bindings +%bcond_without selinux # dont enable selinux support # 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" -%include /usr/lib/rpm/macros.python -%define snap 20040107 +%include /usr/lib/rpm/macros.python +%define snap 20040614 # versions of required libraries %define reqdb_ver 4.2.50-1 %define reqpopt_ver 1.9 %define beecrypt_ver 3.0.0-0.20030610.1 -%define rpm_macros_rev 1.133 +%define rpm_macros_rev 1.158 Summary: RPM Package Manager Summary(de): RPM Packet-Manager Summary(es): Gestor de paquetes RPM @@ -26,41 +28,36 @@ Summary(pt_BR): Gerenciador de pacotes RPM Summary(ru): íÅÎÅÄÖÅÒ ÐÁËÅÔÏ× ÏÔ RPM Summary(uk): íÅÎÅÄÖÅÒ ÐÁËÅÔ¦× ×¦Ä RPM Name: rpm -%define ver 4.3 +%define ver 4.4 +%define sover 4.3 Version: %{ver} -Release: 0.%{snap}.2 +Release: 0.%{snap}.0.1 License: GPL Group: Base #Source0: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.2.x/%{name}-%{version}.%{snap}.tar.gz Source0: ftp://distfiles.pld-linux.org/src/%{name}-%{version}.%{snap}.tar.bz2 -# Source0-md5: c1bc4a2ae441fbd4da8dd90149bab2f2 +# Source0-md5: a91b8e17f6e69208b188d2876e80aef9 Source1: %{name}.groups Source2: %{name}.platform Source3: %{name}-install-tree -#Source4: %{name}-find-rpm-provides -Source5: %{name}-find-spec-bcond -Source6: %{name}-find-lang -#Source7: %{name}-find-provides -#Source8: %{name}-find-requires -Source9: %{name}-groups-po.awk -Source10: %{name}-compress-doc -Source11: %{name}-check-files -Source12: %{name}-php-provides -Source13: %{name}-php-requires -Source14: %{name}.macros -#Source15: %{name}-find-provides-wrapper -#Source16: %{name}-find-requires-wrapper +Source4: %{name}-find-spec-bcond +Source5: %{name}-find-lang +Source6: %{name}-groups-po.awk +Source7: %{name}-compress-doc +Source8: %{name}-check-files +Source9: %{name}-php-provides +Source10: %{name}-php-requires +Source11: %{name}.macros +Source12: perl.prov Source30: builder Source31: adapter.awk Source32: pldnotify.awk -Source33: perl.prov Patch0: %{name}-pl.po.patch Patch1: %{name}-rpmrc.patch Patch2: %{name}-arch.patch Patch3: %{name}-rpmpopt.patch Patch4: %{name}-perl-macros.patch Patch5: %{name}-perl-req-perlfile.patch -Patch6: %{name}-glob.patch Patch7: %{name}-noexpand.patch Patch8: %{name}-scripts-closefds.patch Patch9: %{name}-python-macros.patch @@ -87,9 +84,18 @@ Patch29: %{name}-hack-norpmlibdep.patch Patch30: %{name}-makefile-no_myLDADD_deps.patch Patch31: %{name}-libdir64.patch Patch32: %{name}-libdir-links.patch -Patch33: %{name}-find_required_pkgs_on_build.patch -Patch34: %{name}-noautoreqprovfiles.patch -Patch35: %{name}-context.patch +Patch33: %{name}-context.patch +Patch34: %{name}-nls-fixes.patch +Patch35: %{name}-missing-prototypes.patch +Patch36: %{name}-pld-autodep.patch +Patch37: %{name}-rpmsq.patch +Patch38: %{name}-file-readelf.patch +Patch39: %{name}-pentiumX.patch +Patch40: %{name}-epoch0.patch +Patch41: %{name}-file-readelf-fix.patch +Patch42: %{name}-cpuid.patch +Patch43: %{name}-perl_req-INC_dirs.patch +Patch44: %{name}-debuginfo.patch URL: http://www.rpm.org/ Icon: rpm.gif BuildRequires: autoconf >= 2.52 @@ -97,10 +103,14 @@ BuildRequires: automake BuildRequires: beecrypt-devel >= %{beecrypt_ver} BuildRequires: bzip2-devel >= 1.0.1 BuildRequires: db-devel >= %{reqdb_ver} -%{?with_docs:BuildRequires: doxygen} -BuildRequires: gettext-devel >= 0.11.4-2 +%{?with_doc:BuildRequires: doxygen} BuildRequires: elfutils-devel +BuildRequires: findutils +BuildRequires: gettext-devel >= 0.11.4-2 #BuildRequires: libmagic-devel +%{?with_selinux:BuildRequires: libselinux-devel} +# needed only for AM_PROG_CXX used for CXX substitution in rpm.macros +BuildRequires: libstdc++-devel BuildRequires: libtool BuildRequires: patch >= 2.2 BuildRequires: popt-devel >= %{reqpopt_ver} @@ -109,7 +119,6 @@ BuildRequires: python-modules >= 2.2 BuildRequires: rpm-perlprov BuildRequires: rpm-pythonprov BuildRequires: zlib-devel -BuildRequires: libselinux-devel %if %{with static} # Require static library only for static build BuildRequires: beecrypt-static >= %{beecrypt_ver} @@ -118,21 +127,24 @@ BuildRequires: db-static >= %{reqdb_ver} BuildRequires: glibc-static >= 2.2.94 BuildRequires: elfutils-static #BuildRequires: libmagic-static +%{?with_selinux:BuildRequires: libselinux-static} BuildRequires: popt-static >= %{reqpopt_ver} BuildRequires: zlib-static %endif 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 Conflicts: poldek < 0.18.1-16 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _binary_payload w9.gzdio -%define _noPayloadPrefix 1 +%define _binary_payload w9.gzdio +%define _noPayloadPrefix 1 # 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 # stabilize new build environment %define __cc %{?force_cc}%{!?force_cc:%{_target_cpu}-pld-linux-gcc} @@ -202,9 +214,9 @@ Group: Development/Libraries Requires: %{name}-lib = %{version}-%{release} Requires: beecrypt-devel >= %{beecrypt_ver} Requires: bzip2-devel -Requires: db-devel +Requires: db-devel >= %{reqdb_ver} Requires: elfutils-devel -Requires: libselinux-devel +%{?with_selinux:Requires: libselinux-devel} Requires: popt-devel >= %{reqpopt_ver} Requires: zlib-devel @@ -264,7 +276,7 @@ Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: beecrypt-static >= %{beecrypt_ver} Requires: bzip2-static -Requires: db-static +Requires: db-static >= %{reqdb_ver} Requires: elfutils-static Requires: popt-static >= %{reqpopt_ver} Requires: zlib-static @@ -453,7 +465,7 @@ Requires: %{name}-utils = %{version}-%{release} Requires: /bin/id Requires: awk Requires: binutils -Requires: chrpath +Requires: chrpath >= 0.10-4 Requires: diffutils Requires: file >= 4.01 Requires: fileutils @@ -535,15 +547,14 @@ construir pacotes usando o RPM. ÐÏÂÕÄÏ×É RPM'¦×. %prep -%setup -q -# pl.po translation +%setup -q -n %{name} +# UPDATE #%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p1 @@ -552,7 +563,8 @@ construir pacotes usando o RPM. %patch12 -p1 %patch13 -p1 %patch14 -p1 -%patch15 -p1 +# home-etc FIXME +#%patch15 -p1 %patch16 -p1 %patch17 -p1 %patch18 -p1 @@ -561,14 +573,16 @@ construir pacotes usando o RPM. %patch21 -p1 sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in cp -f platform.in macros.pld.in -echo '%%define _perl_deps 1' > macros.perl +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_deps 1' > macros.php -install %{SOURCE6} scripts/find-lang.sh -install %{SOURCE12} scripts/php.prov.in -install %{SOURCE13} scripts/php.req.in -install %{SOURCE33} scripts/perl.prov -cat %{SOURCE14} >> macros.in +echo '%%define __php_provides /usr/lib/rpm/php.prov' > macros.php +echo '%%define __php_requires /usr/lib/rpm/php.req' >> macros.php +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 %patch22 -p1 %patch23 -p1 %patch24 -p1 @@ -580,19 +594,37 @@ cat %{SOURCE14} >> macros.in %patch30 -p1 %patch31 -p1 %patch32 -p1 -%patch33 -p1 -%patch34 -p1 +# DROP +#%patch33 -p1 +# UPDATE +#%patch34 -p1 %patch35 -p1 +%patch36 -p1 +%patch37 -p1 +# STILL NOT FIXED IN RPM??? +#%patch38 -p1 +# OBSOLETE, merged upstream +#%patch39 -p1 +%patch40 -p1 +# SAME AS patch38 +#%patch41 -p1 +# OBSOLETE, merged upstream +#%patch42 -p1 +%patch43 -p0 +%patch44 -p1 cd scripts; mv -f perl.req perl.req.in mv -f perl.prov perl.prov.in cd .. +mv -f po/{no,nb}.po +mv -f po/{sr,sr@Latn}.po + rm -rf zlib libelf db db3 popt rpmdb/db.h # generate Group translations to *.po -awk -f %{SOURCE9} %{SOURCE1} +awk -f %{SOURCE6} %{SOURCE1} # update macros paths for f in doc{,/ja,/pl}/rpm.8 doc{,/ja,/pl}/rpmbuild.8 ; do @@ -600,9 +632,12 @@ for f in doc{,/ja,/pl}/rpm.8 doc{,/ja,/pl}/rpmbuild.8 ; do mv -f ${f}.tmp $f done +# ... and make some cleanings +rm -fr $(find ./ -type d -name CVS ) +rm -f $(find ./ -type f -name ".cvsignore" ) + %build cd file -rm -f missing %{__libtoolize} %{__aclocal} %{__autoheader} @@ -610,7 +645,6 @@ rm -f missing %{__automake} cd .. -rm -f missing %{__libtoolize} %{__gettextize} %{__aclocal} @@ -620,23 +654,31 @@ rm -f missing # 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 -e 's|@host@|%{_target_cpu}-%{_target_vendor}-linux-gnu|' \ - -e 's|@host_cpu@|%{_target_cpu}|' macros.in > macros.tmp +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 # pass CC and CXX too in case of building with some older configure macro %configure \ - CC="%{__cc}" CXX="%{__cxx}" CPP="%{__cpp}" \ + CC="%{__cc}" \ + CXX="%{__cxx}" \ + CPP="%{__cpp}" \ --enable-shared \ --enable-static \ - %{?with_docs:--with-apidocs} \ + %{?with_doc:--with-apidocs} \ %{?with_python:--with-python=auto} \ %{!?with_python:--without-python} \ + %{!?with_selinux:--without-selinux} \ --without-db +# file_LDFLAGS, debugedit_LDADD - no need to link "file" and "debugedit" statically %{__make} \ - %{!?with_static:rpm_LDFLAGS="\$(myLDFLAGS)"} \ - myLDFLAGS="%{rpmldflags}" + pylibdir=%{py_libdir} \ + myLDFLAGS="%{rpmldflags}" \ + file_LDFLAGS= \ + debugedit_LDADD="\$(WITH_LIBELF_LIB) -lpopt" + +# %{!?with_static:rpm_LDFLAGS="\$(myLDFLAGS)"} \ %install rm -rf $RPM_BUILD_ROOT @@ -644,6 +686,7 @@ install -d $RPM_BUILD_ROOT/%{_lib} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ + pylibdir=%{py_libdir} \ pkgbindir="%{_bindir}" rm $RPM_BUILD_ROOT%{_rpmlibdir}/vpkg-provides* @@ -656,9 +699,9 @@ install macros.php $RPM_BUILD_ROOT%{_rpmlibdir}/macros.php install %{SOURCE1} doc/manual/groups install %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/install-build-tree -install %{SOURCE5} $RPM_BUILD_ROOT%{_rpmlibdir}/find-spec-bcond -install %{SOURCE10} $RPM_BUILD_ROOT%{_rpmlibdir}/compress-doc -install %{SOURCE11} $RPM_BUILD_ROOT%{_rpmlibdir}/check-files +install %{SOURCE4} $RPM_BUILD_ROOT%{_rpmlibdir}/find-spec-bcond +install %{SOURCE7} $RPM_BUILD_ROOT%{_rpmlibdir}/compress-doc +install %{SOURCE8} $RPM_BUILD_ROOT%{_rpmlibdir}/check-files install scripts/find-php* $RPM_BUILD_ROOT%{_rpmlibdir} install scripts/php.{prov,req} $RPM_BUILD_ROOT%{_rpmlibdir} @@ -669,29 +712,41 @@ install %{SOURCE32} $RPM_BUILD_ROOT%{_bindir}/pldnotify.awk install rpmio/ugid.h $RPM_BUILD_ROOT%{_includedir}/rpm install -d $RPM_BUILD_ROOT%{_sysconfdir}/rpm + +%ifarch %{ix86} +ix86re=$(echo "(%{ix86})"|sed 's/ /|/g') +perl -p -i -e 's/^(buildarchtranslate: '"$ix86re"': ).*/\1%{_target_cpu}/' \ + $RPM_BUILD_ROOT%{_rpmlibdir}/rpmrc +%endif + 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 <