X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.spec;h=2e537c1e93c8dc3457ac668060cd9abbf3b21f59;hp=214bdce97b58fa4539ee69ae649dc819a8271171;hb=e9576b98b1c166be5e164c20df8d8659bb0431be;hpb=26a5bf703f08352569f20c6ca6356825502d4db5 diff --git a/rpm.spec b/rpm.spec index 214bdce..2e537c1 100644 --- a/rpm.spec +++ b/rpm.spec @@ -12,9 +12,11 @@ %bcond_without python # don't build python bindings %bcond_without selinux # build without selinux support %bcond_without suggest_tags # build without Suggest tag (bootstrapping) +%bcond_with db61 # use DB 6.1 instead of 5.2 %bcond_with neon # build with HTTP/WebDAV support (neon library) %bcond_with sqlite # build with SQLite support %bcond_with system_lua # use system lua +%bcond_without system_pcre # use system pcre %bcond_with keyutils # build with keyutils 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++" @@ -27,9 +29,15 @@ %endif # versions of required libraries +%if %{with db61} +%define reqdb_pkg db6.1 +%define reqdb_ver 6.1 +%define reqdb_pkgver 6.1.19 +%else %define reqdb_pkg db5.2 %define reqdb_ver 5.2 %define reqdb_pkgver 5.2.36.0-4 +%endif %define reqpopt_ver 1.15 %define beecrypt_ver 2:4.2.0 %define sover 5.4 @@ -42,15 +50,16 @@ Summary(pt_BR.UTF-8): Gerenciador de pacotes RPM Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm -Version: 5.4.12 -Release: 2 +Version: 5.4.15 +Release: 39 License: LGPL v2.1 Group: Base -# http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.12-0.20130725.src.rpm +# http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm Source0: %{name}-%{version}.tar.gz -# Source0-md5: 1af762bbedf936240b1e1a482cc7a193 -Source100: cpu-os-macros.tar.gz -# Source100-md5: 928034a5bdceb398881bc14b5f29973b +# Source0-md5: 4067f83ca8b5bf1a21e443c0cff3efa0 +# See README.cpu-os-macros how to update cpu-os-macros.a +Source100: cpu-os-macros.a +Source101: README.cpu-os-macros Source1: %{name}.groups Source2: macros.pld.in Source3: %{name}-install-tree @@ -68,20 +77,21 @@ Source14: %{name}-java-requires # http://svn.pld-linux.org/banner.sh/ Source15: banner.sh Source16: ftp://ftp.pld-linux.org/dists/th/PLD-3.0-Th-GPG-key.asc -# Source16-md5: 08b29584dd349aac9caa7610131a0a88 +# Source16-md5: 23914bb49fafe7153cee87126d966461 Source17: %{name}-mimetypedeps Source18: macros.local Source19: %{name}.noautocompressdoc Source20: %{name}.noautoprov Source21: %{name}.noautoprovfiles Source22: %{name}.noautoreq -Source23: %{name}.noautoreqdep Source24: %{name}.noautoreqfiles Source25: %{name}-php-requires.php Source26: %{name}db_checkversion.c Source27: macros.lang Source28: %{name}db_reset.c Source29: dbupgrade.sh +Source30: rubygems.rb +Source31: gem_helper.rb Patch0: %{name}-branch.patch Patch1: %{name}-man_pl.patch Patch2: %{name}-popt-aliases.patch @@ -108,7 +118,6 @@ Patch22: %{name}-sparc64.patch Patch23: %{name}-gendiff.patch Patch24: openmp.patch Patch25: %{name}-URPM-build-fix.patch -Patch26: %{name}-db5.3.patch Patch27: %{name}-helperEVR-noassert.patch Patch28: %{name}-unglobal.patch Patch29: %{name}-builddir-readlink.patch @@ -149,13 +158,31 @@ Patch64: %{name}-fix-compress-doc.patch Patch65: %{name}-parseSpec-skip-empty-tags.patch Patch66: %{name}-payload-use-hashed-inode.patch Patch67: %{name}-repackage-dont-force-max-compression.patch -Patch68: rubyprov-archdirs.patch -Patch69: rubyprov-abi-versioned.patch Patch70: python-%{name}sense-missingok.patch Patch71: %{name}-changelog-encoding.patch Patch72: %{name}-preserve-tag-type.patch -Patch73: gem_helper-spec-arg.patch -Patch74: rpm-fix-internal-lua-build.patch +Patch74: %{name}-fix-internal-lua-build.patch +Patch75: %{name}-double_check_file_deps.patch +Patch77: %{name}-lua-expat.patch +Patch78: %{name}-double_check_unpackaged_subdirs.patch +Patch79: %{name}-rpmspec.patch +Patch80: %{name}-revert-gpg-argv-parsing.patch +Patch81: %{name}-perl-magic.patch +Patch82: %{name}-5.4.15-use-DSA-sig.patch +Patch83: %{name}-ignore-missing-macro-files.patch +Patch84: x32.patch +Patch85: rpm-CVE-2013-6435.patch +Patch86: rpm-CVE-2014-8118.patch +Patch87: %{name}-file-output-for-ELF.patch +Patch88: %{name}-rpmtdnext.patch +Patch89: disable-header-verification.patch +Patch90: %{name}-cppcompat.patch +Patch91: py-disable-fetch.patch +Patch92: fast_python_deps.patch +Patch93: python2_explicit.patch +Patch94: do_not_write_before_macro_buffer.patch +Patch95: rpm-python-spec-header.patch +Patch96: skip-ldconfig-optimization.patch # Patches imported from Mandriva @@ -203,8 +230,6 @@ Patch1015: %{name}-5.4.9-keep-loading-script-macros.patch Patch1016: %{name}-5.4.9-update-rpmfc-when-removing-dependencies-on-self.patch # status: idem Patch1017: %{name}-5.4.9-rpmfc-extract-dependencies-for-all-files.patch -# status: ready for merge -Patch1018: %{name}-5.4.5-rubygems-add-missing-newline.patch # status: probably okay to merge Patch1019: %{name}-5.4.5-python-export-spec-macros.patch # status: idem @@ -213,8 +238,6 @@ Patch1020: %{name}-5.4.9-font-provides.patch Patch1021: %{name}-5.4.7-kmod-dependencies.patch # status: probably okay to merge, discuss on rpm-devel first Patch1022: %{name}-5.4.5-skip-dependencies-for-character-devices.patch -# status: ready to merge -Patch1023: %{name}-5.4.5-rpmfc-use-strlen-not-sizeof.patch # status: probably okay to merge Patch1024: %{name}-5.4.5-rpmfc-apply-python-coloring-from-magic.patch # status: probably okay to merge @@ -238,8 +261,6 @@ Patch1033: %{name}-5.4.7-no-seqid_init-on-rdonly-database.patch Patch1034: %{name}-5.4.9-avoid-double-slash-in-path-for-dirname-filetrigger-matching.patch # status: probably ready to merge, discuss on rpm-devel first Patch1035: %{name}-5.4.9-fix-verify-segfault.patch -# status: ready and should be merged -Patch1036: %{name}-5.4.9-fix-typo-in-rpmtag-header.patch # Due to rpmdav/neon being written in a different fashion than other rpmio clients, # the inconsistent behaviour affects code elsewhere which expects consistent behaviour, # with the result being that when unable to download files, neon will save error @@ -267,6 +288,21 @@ Patch1041: %{name}-5.4.9-disable-l10ndir.patch Patch1042: %{name}-5.4.9-fix-rpm_qa-pattern.patch # warning: introduces memory leak Patch1043: %{name}-5.4.12-copy-Value-string.patch +Patch1044: %{name}-5.4.12-fix-rpmlua-print.patch +Patch1045: %{name}-5.4.12-fix-rpmpython-module-import-init.patch +Patch1046: %{name}-5.4.12-truncate-output-buffer-after-use.patch +Patch1047: %{name}-5.4.13-perl-bindings-do-not-use-xmalloc.patch +# proyvind: +# there's a rpmdbchk tool I wrote a while back, which might help you. although +# the incidents it's able to deal with is rather limited ATM... it might help +# you out, if not and you'll be able to solve yer problem, you could take a +# stab at adding support for fixing your specific problem to the util ;) +# https://abf.io/openmandriva/rpm/raw/master/rpm-5.4.14-rpmdbchk.patch +Patch1048: %{name}-5.4.14-rpmdbchk.patch +# https://abf.io/openmandriva/rpm/raw/master/rpm-5.4.14-no-assert-abort-with-broken-headers.patch +Patch1049: %{name}-5.4.14-no-assert-abort-with-broken-headers.patch + +Patch1050: python-libx32.patch URL: http://rpm5.org/ BuildRequires: %{reqdb_pkg}-devel >= %{reqdb_pkgver} @@ -275,13 +311,12 @@ BuildRequires: sqlite3-devel %else BuildRequires: %{reqdb_pkg}-sql-devel >= %{reqdb_pkgver} %endif -BuildRequires: autoconf >= 2.60 +BuildRequires: autoconf >= 2.63 BuildRequires: automake >= 1.4 BuildRequires: beecrypt-devel >= %{beecrypt_ver} BuildRequires: bzip2-devel >= 1.0.2-17 BuildRequires: elfutils-devel >= 0.108 -#BuildRequires: gettext-autopoint >= 0.11.4-2 -BuildRequires: gettext-devel >= 0.11.4-2 +BuildRequires: gettext-tools >= 0.19.2 %{?with_keyutils:BuildRequires: keyutils-devel} BuildRequires: libmagic-devel %if %{with selinux} @@ -354,9 +389,16 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define x8664 amd64 ia32e x86_64 # stabilize new build environment +%ifnarch x32 %define __newcc %{?force_cc}%{!?force_cc:%{_target_cpu}-pld-linux-gcc} %define __newcxx %{?force_cxx}%{!?force_cxx:%{_target_cpu}-pld-linux-g++} %define __newcpp %{?force_cpp}%{!?force_cpp:%{_target_cpu}-pld-linux-gcc -E} +%else +# x32 is a very special case +%define __newcc %{?force_cc}%{!?force_cc:x86_64-pld-linux-gnux32-gcc} +%define __newcxx %{?force_cxx}%{!?force_cxx:x86_64-pld-linux-gnux32-g++} +%define __newcpp %{?force_cpp}%{!?force_cpp:x86_64-pld-linux-gnux32-gcc -E} +%endif %define _rpmlibdir /usr/lib/rpm %define _noautocompressdoc RPM-GPG-KEY @@ -471,7 +513,11 @@ Requires: bzip2-devel Requires: elfutils-devel %{?with_keyutils:Requires: keyutils-devel} Requires: libmagic-devel -%{?with_selinux:Requires: libselinux-devel} +%if %{with selinux} +Requires: libselinux-devel +Requires: libsemanage-devel +Requires: libsepol-devel +%endif Requires: popt-devel >= %{reqpopt_ver} Requires: zlib-devel @@ -535,6 +581,11 @@ Requires: bzip2-static Requires: elfutils-static %{?with_keyutils:Requires: keyutils-static} Requires: libmagic-static +%if %{with selinux} +Requires: libselinux-static +Requires: libsemanage-static +Requires: libsepol-static +%endif Requires: popt-static >= %{reqpopt_ver} Requires: zlib-static @@ -626,8 +677,9 @@ Summary(pt_BR.UTF-8): Scripts e programas executáveis usados para construir pac Summary(ru.UTF-8): Скрипты и утилиты, необходимые для сборки пакетов Summary(uk.UTF-8): Скрипти та утиліти, необхідні для побудови пакетів Group: Applications/File -Requires(pre): findutils -Requires: %{name}-build-macros >= 1.656 +Requires(pretrans): coreutils +Requires(pretrans): findutils +Requires: %{name}-build-macros >= 1.712 Requires: %{name}-utils = %{version}-%{release} Requires: /bin/id Requires: awk @@ -707,6 +759,7 @@ Summary(de.UTF-8): Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-P Summary(pl.UTF-8): Dodatkowe narzędzia do sprawdzenia zależności skryptów Perla w pakietach RPM Group: Applications/File Requires: %{name} = %{version}-%{release} +Requires: perl-Encode Requires: perl-devel Requires: perl-modules @@ -727,7 +780,7 @@ Summary(pl.UTF-8): Makra ułatwiające tworzenie pakietów RPM z programami napi Group: Applications/File Requires: %{name} = %{version}-%{release} Requires: python -Requires: python-distribute +Requires: python-setuptools Requires: python-modules %description pythonprov @@ -807,6 +860,9 @@ Python para manipular pacotes e bancos de dados RPM. Summary: RPM API documentation and guides Summary(pl.UTF-8): Documentacja API RPM-a i przewodniki Group: Documentation +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif %description apidocs Documentation for RPM API and guides in HTML format generated from rpm @@ -817,7 +873,12 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze źrodeł RPM-a przez doxygen. %prep -%setup -q -n %{name}-%{version}%{?subver} -a100 +%setup -q -n %{name}-%{version}%{?subver} +install -d platform +cd platform +ar x %{SOURCE100} +cd - + #patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -849,7 +910,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze %patch23 -p1 %patch24 -p1 %patch25 -p1 -####%patch26 -p1 %patch27 -p1 %patch28 -p1 %patch29 -p1 @@ -864,7 +924,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze %patch38 -p1 %patch39 -p1 %patch40 -p1 -####%patch41 -p1 +%{?with_db61:%patch41 -p1} %patch42 -p1 %patch43 -p1 %patch44 -p1 @@ -880,7 +940,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze %patch54 -p1 %patch55 -p1 %patch56 -p1 -%patch57 -p1 +%{!?with_db61:%patch57 -p1} %patch58 -p1 %patch60 -p1 %patch61 -p1 @@ -893,8 +953,22 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze %patch70 -p1 %patch71 -p1 %patch72 -p1 -%patch73 -p1 %patch74 -p1 +%patch75 -p1 +%patch77 -p0 +%patch78 -p1 +%patch79 -p1 +%patch80 -p1 +%patch81 -p0 +%patch82 -p1 +%patch84 -p1 +%patch85 -p1 +%patch86 -p1 +%patch87 -p1 +%patch88 -p1 +%patch89 -p1 +%patch90 -p1 +%patch91 -p1 %patch1000 -p1 %patch1001 -p1 @@ -914,12 +988,10 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze %patch1015 -p1 %patch1016 -p1 %patch1017 -p1 -%patch1018 -p1 %patch1019 -p1 %patch1020 -p1 %patch1021 -p1 %patch1022 -p1 -%patch1023 -p1 %patch1024 -p1 %patch1026 -p1 %patch1027 -p1 @@ -931,21 +1003,38 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze %patch1033 -p1 %patch1034 -p1 %patch1035 -p1 -%patch1036 -p1 %patch1037 -p1 %patch1038 -p1 %patch1039 -p1 %patch1040 -p1 -%patch1041 -p1 +# don't delete, may be usefull if jbj descides to enable this again +#%patch1041 -p1 %patch1042 -p1 %patch1043 -p1 -%patch68 -p1 -%patch69 -p1 +%patch1044 -p1 +%patch1045 -p1 +%patch1046 -p1 +%patch1047 -p1 +%patch1048 -p1 +%patch1049 -p1 + +%patch83 -p1 +%patch92 -p1 +%patch93 -p1 +%patch94 -p1 +%patch95 -p1 +%patch96 -p1 + +%patch1050 -p1 install %{SOURCE2} macros/pld.in install %{SOURCE8} scripts/php.prov.in install %{SOURCE9} scripts/php.req.in install %{SOURCE11} scripts/perl.prov.in +cp -p %{SOURCE30} scripts/rubygems.rb +cp -p %{SOURCE31} scripts/gem_helper.rb + +rm scripts/find-php* %{__mv} -f scripts/perl.req{,.in} @@ -955,7 +1044,7 @@ awk -f %{SOURCE6} %{SOURCE1} install %{SOURCE26} tools/rpmdb_checkversion.c install %{SOURCE28} tools/rpmdb_reset.c -for extlib in beecrypt neon pcre popt ; do +for extlib in beecrypt neon %{?with_system_pcre:pcre} popt; do [ -d $extlib ] && %{__rm} -r $extlib done @@ -982,34 +1071,35 @@ sed -i \ CPP="%{__newcpp}" \ WITH_PERL_VERSION=no \ __GST_INSPECT=%{_bindir}/gst-inspect-1.0 \ + --disable-silent-rules \ --enable-shared \ --enable-static \ %{!?with_apidocs:--without-apidocs} \ - %{?with_python:--with-python=%{py_ver} --with-python-lib-dir=%{py_sitedir}} \ - %{!?with_python:--without-python} \ - --with-selinux=%{!?with_selinux:no}%{?with_selinux:external} \ - --with-sepol=%{!?with_selinux:no}%{?with_selinux:external} \ - --with-semanage=%{!?with_selinux:no}%{?with_selinux:external} \ - --with-libelf \ - --with-zlib=external \ - --with-bzip2=external \ --with-beecrypt=external \ + --with-bugreport="http://bugs.pld-linux.org/" \ + --with-bzip2=external \ + --with-db=external \ + --with-dbapi=db \ + --with-file=external \ + --with-keyutils=%{?with_keyutils:external}%{!?with_keyutils:no} \ + --with-libelf \ + --with-lua=%{!?with_system_lua:internal}%{?with_system_lua:external} \ --with-lzma=external \ - --with-xz=external \ --with-neon=%{?with_neon:external}%{!?with_neon:no} \ - --with-file=external \ + --with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/macros.d/pld:%{_rpmlibdir}/%%{_target}/macros:%{_rpmlibdir}/macros.build:%{_sysconfdir}/rpm/macros.*:%{_sysconfdir}/rpm/macros:%{_sysconfdir}/rpm/%%{_target}/macros:%{_sysconfdir}/rpm/macros.d/*.macros:~/etc/.rpmmacros:~/.rpmmacros' \ + --without-path-versioned \ + --with-pcre=%{!?with_system_pcre:internal}%{?with_system_pcre:external} \ --with-popt=external \ - --with-db=external \ - --with-dbapi=db \ + %{?with_python:--with-python=%{py_ver} --with-python-lib-dir=%{py_sitedir}} \ + %{!?with_python:--without-python} \ + --with-selinux=%{!?with_selinux:no}%{?with_selinux:external} \ + --with-semanage=%{!?with_selinux:no}%{?with_selinux:external} \ + --with-sepol=%{!?with_selinux:no}%{?with_selinux:external} \ --with-sqlite=%{?with_sqlite:yes}%{!?with_sqlite:no} \ - --with-lua=%{!?with_system_lua:internal}%{?with_system_lua:external} \ - --with-pcre=external \ - --with-keyutils=%{?with_keyutils:external}%{!?with_keyutils:no} \ --with-uuid=%{_libdir}:%{_includedir}/ossp-uuid \ - --without-path-versioned \ - --with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/%{_target}/macros:%{_rpmlibdir}/macros.d/pld:%{_rpmlibdir}/macros.build:%{_sysconfdir}/rpm/macros.*:%{_sysconfdir}/rpm/macros:%{_sysconfdir}/rpm/%{_target}/macros:%{_sysconfdir}/rpm/macros.d/*.macros:~/etc/.rpmmacros:~/.rpmmacros' \ - --with-bugreport="http://bugs.pld-linux.org/" \ - --with-vendor=pld + --with-vendor=pld \ + --with-xz=external \ + --with-zlib=external %{__make} -j1 \ CC="%{__cc}" \ @@ -1043,71 +1133,92 @@ install %{SOURCE16} $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/PLD-3.0-Th-GPG-key pkgconfigdir=%{_pkgconfigdir} \ DESTDIR=$RPM_BUILD_ROOT -# install ARCH macros -install -d $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux -install cpu-os-macros/noarch-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux/macros - -%ifarch %{ix86} -install -d $RPM_BUILD_ROOT%{_rpmlibdir}/{i386,i486,i586,i686,athlon,pentium3,pentium4}-linux -install cpu-os-macros/athlon-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/athlon-linux/macros -install cpu-os-macros/i386-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/i386-linux/macros -install cpu-os-macros/i486-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/i486-linux/macros -install cpu-os-macros/i586-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/i586-linux/macros -install cpu-os-macros/i686-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/i686-linux/macros -install cpu-os-macros/pentium3-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/pentium3-linux/macros -install cpu-os-macros/pentium4-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/pentium4-linux/macros +# install platform macros +for f in platform/*macros; do + bn=${f#*/} + fn=${bn%.macros}/macros + install -m644 $f -D %{buildroot}%{_rpmlibdir}/$fn +done + +# cleanup +%ifnarch %{ix86} %{x8664} x32 +rm $RPM_BUILD_ROOT%{_rpmlibdir}/athlon-linux/macros +rm $RPM_BUILD_ROOT%{_rpmlibdir}/i386-linux/macros +rm $RPM_BUILD_ROOT%{_rpmlibdir}/i486-linux/macros +rm $RPM_BUILD_ROOT%{_rpmlibdir}/i586-linux/macros +rm $RPM_BUILD_ROOT%{_rpmlibdir}/i686-linux/macros +rm $RPM_BUILD_ROOT%{_rpmlibdir}/pentium3-linux/macros +rm $RPM_BUILD_ROOT%{_rpmlibdir}/pentium4-linux/macros %endif -%ifarch %{x8664} -install -d $RPM_BUILD_ROOT%{_rpmlibdir}/{x86_64,ia32e,amd64}-linux -install cpu-os-macros/x86_64-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/x86_64-linux/macros -install cpu-os-macros/ia32e-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/ia32e-linux/macros -install cpu-os-macros/amd64-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/amd64-linux/macros +%ifnarch %{x8664} x32 +rm $RPM_BUILD_ROOT%{_rpmlibdir}/amd64-linux/macros +rm $RPM_BUILD_ROOT%{_rpmlibdir}/ia32e-linux/macros +rm $RPM_BUILD_ROOT%{_rpmlibdir}/x32-linux/macros +rm $RPM_BUILD_ROOT%{_rpmlibdir}/x86_64-linux/macros %endif -%ifarch %{ppc} -install -d $RPM_BUILD_ROOT%{_rpmlibdir}/ppc-linux -install cpu-os-macros/ppc-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/ppc-linux/macros +%ifnarch %{ppc} +rm $RPM_BUILD_ROOT%{_rpmlibdir}/ppc-linux/macros %endif +rm $RPM_BUILD_ROOT%{_rpmlibdir}/alpha*-linux/macros +rm $RPM_BUILD_ROOT%{_rpmlibdir}/arm*-linux/macros +rm $RPM_BUILD_ROOT%{_rpmlibdir}/ia64-linux/macros +rm $RPM_BUILD_ROOT%{_rpmlibdir}/k6-linux/macros +rm $RPM_BUILD_ROOT%{_rpmlibdir}/mips*-linux/macros +rm $RPM_BUILD_ROOT%{_rpmlibdir}/ppc*series-linux/macros +rm $RPM_BUILD_ROOT%{_rpmlibdir}/ppc64*-linux/macros +rm $RPM_BUILD_ROOT%{_rpmlibdir}/s390*-linux/macros +rm $RPM_BUILD_ROOT%{_rpmlibdir}/sparc*-linux/macros + cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform # first platform file entry can't contain regexps +%ifarch x32 +%{_target_cpu}-%{_target_vendor}-linux-gnux32 +%else %{_target_cpu}-%{_target_vendor}-linux +%endif -# x86_64 things %ifarch x86_64 x86_64-[^-]*-[Ll]inux(-gnu)? amd64-[^-]*-[Ll]inux(-gnu)? +x32-[^-]*-[Ll]inux(-gnu(x32)?)? %endif %ifarch amd64 amd64-[^-]*-[Ll]inux(-gnu)? x86_64-[^-]*-[Ll]inux(-gnu)? +x32-[^-]*-[Ll]inux(-gnu(x32)?)? %endif %ifarch ia32e ia32e-[^-]*-[Ll]inux(-gnu)? x86_64-[^-]*-[Ll]inux(-gnu)? %endif +%ifarch x32 +x32-[^-]*-[Ll]inux(-gnu(x32)?)? +x86_64-[^-]*-[Ll]inux(-gnu)? +amd64-[^-]*-[Ll]inux(-gnu)? +%endif -# x86 things -%ifarch athlon %{x8664} +%ifarch athlon %{x8664} x32 athlon-[^-]*-[Ll]inux(-gnu)? %endif -%ifarch pentium4 athlon %{x8664} +%ifarch pentium4 athlon %{x8664} x32 pentium4-[^-]*-[Ll]inux(-gnu)? %endif -%ifarch pentium3 pentium4 athlon %{x8664} +%ifarch pentium3 pentium4 athlon %{x8664} x32 pentium3-[^-]*-[Ll]inux(-gnu)? %endif -%ifarch i686 pentium3 pentium4 athlon %{x8664} +%ifarch i686 pentium3 pentium4 athlon %{x8664} x32 i686-[^-]*-[Ll]inux(-gnu)? %endif -%ifarch i586 i686 pentium3 pentium4 athlon %{x8664} +%ifarch i586 i686 pentium3 pentium4 athlon %{x8664} x32 i586-[^-]*-[Ll]inux(-gnu)? %endif -%ifarch i486 i586 i686 pentium3 pentium4 athlon %{x8664} +%ifarch i486 i586 i686 pentium3 pentium4 athlon %{x8664} x32 i486-[^-]*-[Ll]inux(-gnu)? %endif -%ifarch %{ix86} %{x8664} +%ifarch %{ix86} %{x8664} x32 i386-[^-]*-[Ll]inux(-gnu)? %endif @@ -1148,18 +1259,20 @@ sparcv9-[^-]*-[Ll]inux(-gnu)? sparc-[^-]*-[Ll]inux(-gnu)? %endif -# noarch noarch-[^-]*-.* EOF -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 -rm $RPM_BUILD_ROOT%{_rpmlibdir}/find-lang.sh -rm $RPM_BUILD_ROOT%{_rpmlibdir}/lib/liblua.a -rm $RPM_BUILD_ROOT%{_rpmlibdir}/lib/liblua.la -rm $RPM_BUILD_ROOT%{_rpmlibdir}/mono-find-provides -rm $RPM_BUILD_ROOT%{_rpmlibdir}/mono-find-requires +# Squash Extra Blank Lines +%{__sed} -i -e '/./,/^$/!d' $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform + +%{__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 +%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/find-lang.sh +%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/lib/liblua.a +%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/lib/liblua.la +%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/mono-find-provides +%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/mono-find-requires # not installed since 4.4.8 (-tools-perl subpackage) install scripts/rpmdiff scripts/rpmdiff.cgi $RPM_BUILD_ROOT%{_rpmlibdir} @@ -1170,7 +1283,6 @@ install %{SOURCE4} $RPM_BUILD_ROOT%{_rpmlibdir}/find-spec-bcond install %{SOURCE7} $RPM_BUILD_ROOT%{_rpmlibdir}/compress-doc install %{SOURCE12} $RPM_BUILD_ROOT%{_rpmlibdir}/user_group.sh install %{SOURCE14} $RPM_BUILD_ROOT%{_rpmlibdir}/java-find-requires -install scripts/find-php* $RPM_BUILD_ROOT%{_rpmlibdir} install scripts/php.{prov,req} $RPM_BUILD_ROOT%{_rpmlibdir} cp -p %{SOURCE25} $RPM_BUILD_ROOT%{_rpmlibdir}/php.req.php install %{SOURCE17} $RPM_BUILD_ROOT%{_rpmlibdir}/mimetypedeps.sh @@ -1187,7 +1299,6 @@ install %{SOURCE19} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautocompressdoc install %{SOURCE20} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprov install %{SOURCE21} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprovfiles install %{SOURCE22} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreq -install %{SOURCE23} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreqdep install %{SOURCE24} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreqfiles touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Conflictname @@ -1206,6 +1317,9 @@ for m in gstreamer java mono perl php python; do echo "%%{load:%{_rpmlibdir}/macros.d/$m}" >$RPM_BUILD_ROOT%{_rpmlibdir}/macros.$m done +# moved to rpm-build-macros 1.699 +%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.d/kernel + # for rpm -e|-U --repackage install -d $RPM_BUILD_ROOT/var/{spool/repackage,lock/rpm} touch $RPM_BUILD_ROOT/var/lock/rpm/transaction @@ -1230,8 +1344,6 @@ mv $RPM_BUILD_ROOT{%{_rpmlibdir},%{_bindir}}/rpm2cpio # wrong location, not used anyway %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/rpm.{daily,log,xinetd} -# utils dropped in 4.4.8 -- their manuals -%{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man8/rpmgraph.8 # utils dropped in 5.4 -- their manuals %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/rpmgrep.1 # script obsoleted by /usr/lib/rpm/bin/dbconvert binary @@ -1298,7 +1410,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %{_mandir}/man8/rpm.8* %lang(fr) %{_mandir}/fr/man8/rpm.8* %lang(ja) %{_mandir}/ja/man8/rpm.8* -%lang(ko) %{_mandir}/ko/man8/rpm.8* %lang(pl) %{_mandir}/pl/man8/rpm.8* %lang(ru) %{_mandir}/ru/man8/rpm.8* %lang(sk) %{_mandir}/sk/man8/rpm.8* @@ -1322,7 +1433,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %{_rpmlibdir}/macros.d/pld %{_rpmlibdir}/cpuinfo.yaml %{_rpmlibdir}/noarch-* -%ifarch %{ix86} +%ifarch %{ix86} %{x8664} x32 %{_rpmlibdir}/i?86* %{_rpmlibdir}/pentium* %{_rpmlibdir}/athlon* @@ -1342,10 +1453,11 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %ifarch sparc sparc64 %{_rpmlibdir}/sparc* %endif -%ifarch %{x8664} +%ifarch %{x8664} x32 %{_rpmlibdir}/amd64* %{_rpmlibdir}/ia32e* %{_rpmlibdir}/x86_64* +%{_rpmlibdir}/x32* %endif %attr(755,root,root) %{_rpmlibdir}/hrmib-cache @@ -1355,6 +1467,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %attr(755,root,root) %{_rpmlibdir}/bin/dbupgrade.sh %attr(755,root,root) %{_rpmlibdir}/bin/rpmdb_checkversion %attr(755,root,root) %{_rpmlibdir}/bin/rpmdb_reset +%attr(755,root,root) %{_rpmlibdir}/bin/rpmdbchk %files base %defattr(644,root,root,755) @@ -1362,7 +1475,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rpm %dir %{_rpmlibdir} %attr(755,root,root) %{_bindir}/banner.sh -%attr(755,root,root) %{_bindir}/multiarch-dispatch %attr(755,root,root) %{_rpmlibdir}/user_group.sh %dir /var/lib/banner @@ -1391,7 +1503,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %attr(755,root,root) %{_libdir}/librpmmisc-%{sover}.so %{_libdir}/librpm*.la %{_includedir}/rpm -%{_includedir}/multiarch-dispatch.h %{_pkgconfigdir}/*.pc %files static @@ -1428,15 +1539,11 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %{?with_keyutils:%attr(755,root,root) %{_rpmlibdir}/bin/rpmkey} %attr(755,root,root) %{_rpmlibdir}/bin/rpmrepo %{_mandir}/man8/rpm2cpio.8* -%{_mandir}/man8/rpmcache.8* %{_mandir}/man8/rpmconstant.8* %{_mandir}/man8/rpmdeps.8* %{_mandir}/man8/rpmmtree.8* %lang(ja) %{_mandir}/ja/man8/rpm2cpio.8* -%lang(ja) %{_mandir}/ja/man8/rpmcache.8* -%lang(ko) %{_mandir}/ko/man8/rpm2cpio.8* %lang(pl) %{_mandir}/pl/man8/rpm2cpio.8* -%lang(pl) %{_mandir}/pl/man8/rpmcache.8* %lang(pl) %{_mandir}/pl/man8/rpmdeps.8* %lang(ru) %{_mandir}/ru/man8/rpm2cpio.8* @@ -1473,6 +1580,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %attr(755,root,root) %{_rpmlibdir}/bin/install-sh %attr(755,root,root) %{_rpmlibdir}/bin/mkinstalldirs %attr(755,root,root) %{_rpmlibdir}/bin/pom2spec +%attr(755,root,root) %{_rpmlibdir}/bin/rpmspec %attr(755,root,root) %{_rpmlibdir}/bin/rpmspecdump %attr(755,root,root) %{_rpmlibdir}/bin/sqlite3 %attr(755,root,root) %{_rpmlibdir}/bin/wget @@ -1488,7 +1596,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %{_rpmlibdir}/macros.d/cmake %{_rpmlibdir}/macros.d/gstreamer %{_rpmlibdir}/macros.d/java -%{_rpmlibdir}/macros.d/kernel %{_rpmlibdir}/macros.d/libtool %{_rpmlibdir}/macros.d/mono %{_rpmlibdir}/macros.d/perl @@ -1507,13 +1614,10 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %{_rpmlibdir}/macros.php %{_rpmlibdir}/macros.python -%attr(755,root,root) %{_rpmlibdir}/check-multiarch-files %attr(755,root,root) %{_rpmlibdir}/gstreamer.sh %attr(755,root,root) %{_rpmlibdir}/kmod-deps.sh -%attr(755,root,root) %{_rpmlibdir}/mkmultiarch %attr(755,root,root) %{_bindir}/gendiff -%attr(755,root,root) %{_bindir}/multiarch-platform %attr(755,root,root) %{_bindir}/rpmbuild %dir %{_rpmlibdir}/helpers @@ -1549,8 +1653,9 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %files php-pearprov %defattr(644,root,root,755) -%attr(755,root,root) %{_rpmlibdir}/php* -%attr(755,root,root) %{_rpmlibdir}/find-php* +%attr(755,root,root) %{_rpmlibdir}/php.prov +%attr(755,root,root) %{_rpmlibdir}/php.req +%attr(755,root,root) %{_rpmlibdir}/php.req.php %if %{with python} %files -n python-rpm