X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.spec;h=ea26e77b6664cb6db34940d174fcbe314cc4b137;hp=b2c79ba1d4991e354afd7e6667f1ea8bdc206be4;hb=24123ddd1679b63fae2b8eb50c7c664787b245d7;hpb=bdd052407c802c0e28f945e256e43a165216e942 diff --git a/rpm.spec b/rpm.spec index b2c79ba..ea26e77 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,7 +1,8 @@ # # TODO: -# - use system libmagic not internal libfmagic -# - when really needed: _noauto{req,prov} for non-helper-generated deps +# - 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_with static # build static rpmi (not supported at the moment) @@ -12,13 +13,13 @@ # 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.145 +%define rpm_macros_rev 1.158 Summary: RPM Package Manager Summary(de): RPM Packet-Manager Summary(es): Gestor de paquetes RPM @@ -27,14 +28,15 @@ 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}.19 +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 @@ -56,7 +58,6 @@ 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 @@ -94,6 +95,7 @@ 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 @@ -102,10 +104,13 @@ BuildRequires: beecrypt-devel >= %{beecrypt_ver} BuildRequires: bzip2-devel >= 1.0.1 BuildRequires: db-devel >= %{reqdb_ver} %{?with_doc:BuildRequires: doxygen} -BuildRequires: gettext-devel >= 0.11.4-2 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} @@ -139,6 +144,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 # stabilize new build environment %define __cc %{?force_cc}%{!?force_cc:%{_target_cpu}-pld-linux-gcc} @@ -541,14 +547,14 @@ construir pacotes usando o RPM. ÐÏÂÕÄÏ×É RPM'¦×. %prep -%setup -q -%patch0 -p1 +%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 @@ -557,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 @@ -587,17 +594,24 @@ cat %{SOURCE11} >> macros.in %patch30 -p1 %patch31 -p1 %patch32 -p1 -%patch33 -p1 -%patch34 -p1 +# DROP +#%patch33 -p1 +# UPDATE +#%patch34 -p1 %patch35 -p1 %patch36 -p1 %patch37 -p1 -%patch38 -p1 -%patch39 -p1 +# STILL NOT FIXED IN RPM??? +#%patch38 -p1 +# OBSOLETE, merged upstream +#%patch39 -p1 %patch40 -p1 -%patch41 -p1 -%patch42 -p1 +# SAME AS patch38 +#%patch41 -p1 +# OBSOLETE, merged upstream +#%patch42 -p1 %patch43 -p0 +%patch44 -p1 cd scripts; mv -f perl.req perl.req.in @@ -618,6 +632,10 @@ 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 %{__libtoolize} @@ -636,8 +654,8 @@ cd .. # 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 @@ -743,17 +761,15 @@ cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautocompressdoc <