X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=5527f607c04b3c85ff98ed256adf8fa1a1f7508e;hb=697d85f4cbe0e800883c44b3f59d62b4a3cf4974;hp=ab72f36966e3fd0a6748d18d1fa795940a39ec28;hpb=31f4a5bc351da11e074f276c5b7d435ae1df754f;p=packages%2Frpm.git diff --git a/rpm.spec b/rpm.spec index ab72f36..5527f60 100644 --- a/rpm.spec +++ b/rpm.spec @@ -5,6 +5,7 @@ # - after ac drop amd64 patch and make x86_64 generic arch + subarchs amd64 and ia32e # # Conditional build: +%bcond_with distver # build with distversion field %bcond_with static # build static rpmi (not supported at the moment) %bcond_without apidocs # don't generate documentation with doxygen %bcond_without pkgnameinautoreq # don't put package name in autogenerated dependancy @@ -14,12 +15,12 @@ # 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" -%define snap 20040614 +%define snap 20041121 # versions of required libraries %define reqdb_ver 4.2.50-1 %define reqpopt_ver 1.9 -%define beecrypt_ver 2:4.0.0 -%define rpm_macros_rev 1.162 +%define beecrypt_ver 2:4.1.0 +%define rpm_macros_rev 1.177 Summary: RPM Package Manager Summary(de): RPM Packet-Manager Summary(es): Gestor de paquetes RPM @@ -29,14 +30,15 @@ Summary(ru): Summary(uk): íÅÎÅÄÖÅÒ ÐÁËÅÔ¦× ×¦Ä RPM Name: rpm %define ver 4.4 -%define sover 4.3 +%define sover 4.4 Version: %{ver} Release: 0.%{snap}.0.5 License: GPL Group: Base #Source0: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.2.x/%{name}-%{version}.%{snap}.tar.gz +# Snap tarball is generated from rpm-4_4 branch Source0: ftp://distfiles.pld-linux.org/src/%{name}-%{version}.%{snap}.tar.bz2 -# Source0-md5: a91b8e17f6e69208b188d2876e80aef9 +# Source0-md5: 9960ab3e3023b49b42c1e85acef33de5 Source1: %{name}.groups Source2: %{name}.platform Source3: %{name}-install-tree @@ -54,6 +56,8 @@ Source14: %{name}.sysconfig Source30: builder Source31: adapter.awk Source32: pldnotify.awk +# http://svn.pld-linux.org/banner.sh/ +Source33: banner.sh Patch1: %{name}-rpmrc.patch Patch2: %{name}-arch.patch Patch3: %{name}-rpmpopt.patch @@ -70,7 +74,6 @@ Patch14: %{name}-bb-and-short-circuit.patch Patch15: %{name}-etc_dir.patch Patch16: %{name}-system_libs-more.patch Patch17: %{name}-php-deps.patch -Patch18: %{name}-python-fix.patch Patch19: %{name}-ldconfig-always.patch Patch20: %{name}-perl_req.patch Patch21: %{name}-no-bin-env.patch @@ -85,18 +88,15 @@ Patch29: %{name}-hack-norpmlibdep.patch Patch30: %{name}-makefile-no_myLDADD_deps.patch Patch31: %{name}-libdir64.patch Patch32: %{name}-libdir-links.patch -Patch33: %{name}-context.patch Patch35: %{name}-missing-prototypes.patch Patch36: %{name}-pld-autodep.patch Patch37: %{name}-rpmsq.patch -Patch38: %{name}-file-readelf.patch -Patch39: %{name}-no_version_check_in_obsoletes.patch Patch40: %{name}-epoch0.patch -Patch41: %{name}-file-readelf-fix.patch Patch43: %{name}-perl_req-INC_dirs.patch Patch44: %{name}-debuginfo.patch Patch45: %{name}-beecrypt4.patch Patch46: %{name}-doxygen_hack.patch +Patch47: %{name}-distver.patch Patch100: %{name}-pl.po.patch URL: http://www.rpm.org/ Icon: rpm.gif @@ -115,6 +115,7 @@ BuildRequires: gettext-devel >= 0.11.4-2 BuildRequires: libstdc++-devel BuildRequires: libtool BuildRequires: libxml2-devel +BuildRequires: neon-devel >= 0.24.7-3 BuildRequires: patch >= 2.2 BuildRequires: popt-devel >= %{reqpopt_ver} %{?with_python:BuildRequires: python-devel >= 2.2} @@ -448,6 +449,7 @@ Summary(pl): Biblioteki RPM-a Group: Libraries Requires: db >= %{reqdb_ver} Requires: popt >= %{reqpopt_ver} +%{?with_distver:Provides: rpm-lib(distver)} # avoid SEGV caused by mixed db versions Conflicts: poldek < 0.18.1-16 @@ -493,7 +495,7 @@ Requires: sh-utils Requires: tar Requires: textutils Provides: rpmbuild(macros) = %{rpm_macros_rev} -Provides: rpmbuild(noauto) = 2 +Provides: rpmbuild(noauto) = 3 %ifarch amd64 Conflicts: automake < 1:1.7.9-2 Conflicts: libtool < 2:1.5-13 @@ -589,7 +591,6 @@ ze #%patch15 -p1 %patch16 -p1 %patch17 -p1 -%patch18 -p1 %patch19 -p1 %patch20 -p1 %patch21 -p1 @@ -616,19 +617,19 @@ cat %{SOURCE11} >> macros.in %patch30 -p1 %patch31 -p1 %patch32 -p1 -%patch33 -p1 %patch35 -p1 %patch36 -p1 %patch37 -p1 -%patch38 -p1 -%patch39 -p1 %patch40 -p1 -%patch41 -p1 %patch43 -p0 %patch44 -p1 -%patch45 -p1 -%patch46 -p1 -%patch100 -p1 +# OBSOLETE +#%patch45 -p1 +# NEEDS UPDATE +# %patch46 -p1 +%{?with_distver:%patch47 -p1} +# NEEDS UPDATE +#%patch100 -p1 %patch3 -p1 cd scripts; @@ -639,7 +640,7 @@ cd .. mv -f po/{no,nb}.po mv -f po/{sr,sr@Latn}.po -rm -rf zlib libelf db db3 popt rpmdb/db.h +rm -rf neon zlib libelf db db3 popt rpmdb/db.h # generate Group translations to *.po awk -f %{SOURCE6} %{SOURCE1} @@ -733,6 +734,7 @@ install %{SOURCE14} $RPM_BUILD_ROOT/etc/sysconfig/rpm install %{SOURCE30} $RPM_BUILD_ROOT%{_bindir}/builder install %{SOURCE31} $RPM_BUILD_ROOT%{_bindir}/adapter.awk install %{SOURCE32} $RPM_BUILD_ROOT%{_bindir}/pldnotify.awk +install %{SOURCE33} $RPM_BUILD_ROOT%{_bindir}/banner.sh install rpmio/ugid.h $RPM_BUILD_ROOT%{_includedir}/rpm @@ -790,8 +792,13 @@ cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreqdep < $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreqdep <