X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=c31428a3498423c9b769a0547294177c3bb4d6aa;hb=d68708d13fa5e28142a4edf58a8fd491cb85b72d;hp=d9bac7bae17cf68f8c74e0fe20ac420c648a524f;hpb=ecbe8a50e4afaf37da412bdda6de31b72dec7e96;p=packages%2Frpm.git diff --git a/rpm.spec b/rpm.spec index d9bac7b..c31428a 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,23 +1,24 @@ # # 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) # # Conditional build: %bcond_with static # build static rpmi (not supported at the moment) -%bcond_without docs # don't generate documentation with doxygen +%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 20040107 # 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.153 Summary: RPM Package Manager Summary(de): RPM Packet-Manager Summary(es): Gestor de paquetes RPM @@ -28,7 +29,7 @@ Summary(uk): Name: rpm %define ver 4.3 Version: %{ver} -Release: 0.%{snap}.6 +Release: 0.%{snap}.23 License: GPL Group: Base #Source0: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.2.x/%{name}-%{version}.%{snap}.tar.gz @@ -87,6 +88,13 @@ 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 @@ -94,11 +102,13 @@ BuildRequires: automake BuildRequires: beecrypt-devel >= %{beecrypt_ver} BuildRequires: bzip2-devel >= 1.0.1 BuildRequires: db-devel >= %{reqdb_ver} -%{?with_docs:BuildRequires: doxygen} +%{?with_doc:BuildRequires: doxygen} BuildRequires: gettext-devel >= 0.11.4-2 BuildRequires: elfutils-devel #BuildRequires: libmagic-devel -BuildRequires: libselinux-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} @@ -115,7 +125,7 @@ BuildRequires: db-static >= %{reqdb_ver} BuildRequires: glibc-static >= 2.2.94 BuildRequires: elfutils-static #BuildRequires: libmagic-static -BuildRequires: libselinux-static +%{?with_selinux:BuildRequires: libselinux-static} BuildRequires: popt-static >= %{reqpopt_ver} BuildRequires: zlib-static %endif @@ -201,9 +211,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 @@ -263,7 +273,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 @@ -452,7 +462,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 @@ -559,8 +569,8 @@ construir pacotes usando o RPM. %patch21 -p1 sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in cp -f platform.in macros.pld.in -echo '%%define __perl_provides /usr/lib/rpm/perl.prov' > macros.perl -echo '%%define __perl_requires /usr/lib/rpm/perl.req' >> 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_provides /usr/lib/rpm/php.prov' > macros.php echo '%%define __php_requires /usr/lib/rpm/php.req' >> macros.php @@ -585,6 +595,13 @@ cat %{SOURCE11} >> macros.in %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 +%patch40 -p1 +%patch41 -p1 +%patch42 -p1 +%patch43 -p0 +%patch44 -p1 cd scripts; mv -f perl.req perl.req.in @@ -623,8 +640,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 @@ -634,9 +651,10 @@ mv -f macros.tmp macros.in 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 @@ -680,11 +698,23 @@ 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 <