X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.spec;h=d152e48ead4343e63eeec3cff51f9aa6d8aa9c11;hp=e8fba70daf786a0d2f59d37c680904a2b83083a2;hb=3c7590cced6fbf3e1db7331dfd2f1645da02d4f5;hpb=e56a10a99ba7fc25a5cdf31832a719db89750327 diff --git a/rpm.spec b/rpm.spec index e8fba70..d152e48 100644 --- a/rpm.spec +++ b/rpm.spec @@ -9,25 +9,16 @@ # i386 i386 # - python(abi) cap is not provided automatically because /usr/lib*/libpython2*.so.* # matches ELF first -# - TODO: add macros for some ppc, mipsel, alpha and sparc -# - uppackaged list: -# /usr/lib/rpm/http.req -# /usr/lib/rpm/install-sh -# /usr/lib/rpm/mono-find-provides -# /usr/lib/rpm/mono-find-requires -# /usr/lib/rpm/osgideps.pl -# /usr/lib/rpm/perldeps.pl -# /usr/lib/rpm/vcheck -# /usr/share/man/man8/rpmconstant.8 +# - add macros for some ppc, mipsel, alpha and sparc # # - headerGet() making poldek segfault http://rpm5.org/cvs/tktview?tn=38,1 # - rpm doesn't exit when no sources/patches available http://rpm5.org/cvs/tktview?tn=40,1 # - http://rpm5.org/cvs/tktview?tn=41&_submit=Show +# - when adopting, use 4.5 ticket for checklist: https://bugs.launchpad.net/pld-linux/+bug/262985 # # Conditional build: %bcond_with static # build static rpm+rpmi -%bcond_with apidocs # don't generate documentation with doxygen -%bcond_with autoreqdep # autogenerate package name deps in addition to sonames/perl(X) +%bcond_without apidocs # don't generate documentation with doxygen %bcond_without python # don't build python bindings %bcond_without selinux # build without selinux support %bcond_without suggest_tags # build without Suggest tag (bootstrapping) @@ -50,10 +41,10 @@ ERROR %endif # versions of required libraries -%define reqdb_ver 4.7.25 +%define reqdb_ver 5.3 %define reqpopt_ver 1.15 %define beecrypt_ver 2:4.1.2-4 -%define sover 5.3 +%define sover 5.4 Summary: RPM Package Manager Summary(de.UTF-8): RPM Packet-Manager @@ -63,100 +54,186 @@ Summary(pt_BR.UTF-8): Gerenciador de pacotes RPM Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm -Version: 5.3.1 -Release: 0.1 +Version: 5.4.10 +Release: 0.8 License: LGPL Group: Base -Source0: http://rpm5.org/files/rpm/rpm-5.3/%{name}-%{version}.tar.gz -# Source0-md5: ee172f54e9b596056f8ecf13ae6afa9e +# http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm +Source0: %{name}-%{version}.tar.gz +# Source0-md5: 5d099161bdd3203265ab32ffad3360b5 +Source100: cpu-os-macros.tar.gz +# Source100-md5: 928034a5bdceb398881bc14b5f29973b Source1: %{name}.groups -Source2: %{name}.platform +Source2: macros.pld.in Source3: %{name}-install-tree Source4: %{name}-find-spec-bcond Source5: %{name}-hrmib-cache Source6: %{name}-groups-po.awk Source7: %{name}-compress-doc -Source8: %{name}-check-files Source9: %{name}-php-provides Source10: %{name}-php-requires Source11: %{name}.sysinfo Source12: perl.prov Source13: %{name}-user_group.sh Source14: %{name}.sysconfig -Source15: %{name}-macros.java Source16: %{name}-java-requires # http://svn.pld-linux.org/banner.sh/ Source17: banner.sh -Source18: %{name}-pld.macros Source19: ftp://ftp.pld-linux.org/dists/th/PLD-3.0-Th-GPG-key.asc # Source19-md5: 08b29584dd349aac9caa7610131a0a88 Source20: %{name}-mimetypedeps -Source100: %{name}-macros-athlon -Source101: %{name}-macros-i386 -Source102: %{name}-macros-i486 -Source103: %{name}-macros-i586 -Source104: %{name}-macros-i686 -Source105: %{name}-macros-noarch -Source106: %{name}-macros-pentium3 -Source107: %{name}-macros-pentium4 -Source108: %{name}-macros-ppc -Source109: %{name}-macros-x86_64 -Source110: %{name}-macros-ia32e -Source111: %{name}-macros-amd64 - +Source21: macros.local +Source22: rpm.noautocompressdoc +Source23: rpm.noautoprov +Source24: rpm.noautoprovfiles +Source25: rpm.noautoreq +Source26: rpm.noautoreqdep +Source27: rpm.noautoreqfiles +Source29: %{name}-php-requires.php Patch0: %{name}-branch.patch Patch1: %{name}-man_pl.patch Patch2: %{name}-popt-aliases.patch Patch3: %{name}-rpmpopt.patch Patch4: %{name}-perl-macros.patch Patch5: %{name}-perl-req-perlfile.patch -Patch6: %{name}-noexpand.patch -Patch7: %{name}-scripts-closefds.patch -Patch8: %{name}-php-macros.patch -Patch9: %{name}-gettext-in-header.patch -Patch10: %{name}-compress-doc.patch -Patch11: %{name}-lua.patch -Patch12: %{name}-am.patch - -Patch14: %{name}-etc_dir.patch -Patch16: %{name}-php-deps.patch -Patch17: %{name}-macros.patch -Patch18: %{name}-macros-th.patch -Patch19: %{name}-glob.patch - -Patch23: %{name}-pkgconfigdeps.patch - -Patch26: %{name}-notsc.patch -Patch27: %{name}-hack-norpmlibdep.patch - -Patch32: %{name}-pld-autodep.patch -Patch34: %{name}-epoch0.patch -Patch35: %{name}-perl_req-INC_dirs.patch -Patch36: %{name}-debuginfo.patch -Patch37: %{name}-doxygen_hack.patch -Patch38: %{name}-perl_req-use_base.patch -Patch39: %{name}-perl_req-skip_multiline.patch -Patch40: %{name}-perl_req-heredocs_pod.patch - -Patch41: vendor-pld.patch - -Patch42: %{name}-old-fileconflicts-behaviour.patch - -Patch46: %{name}-mono.patch -Patch47: %{name}-javadeps.patch - -Patch52: %{name}-morearchs.patch - -Patch55: %{name}-truncate-cvslog.patch - -Patch59: %{name}-libtool-deps.patch -Patch60: %{name}-mimetype.patch -Patch61: %{name}-sparc64.patch -Patch62: %{name}-gendiff.patch -Patch63: %{name}-lua-exit-chroot-correctly.patch -Patch70: %{name}-configure-autoconf.patch -Patch71: db.patch -Patch72: openmp.patch +Patch6: %{name}-scripts-closefds.patch +Patch7: %{name}-php-macros.patch +Patch8: %{name}-gettext-in-header.patch +Patch9: %{name}-lua.patch +Patch10: %{name}-etc_dir.patch +Patch11: %{name}-php-deps.patch +Patch12: %{name}-glob.patch +Patch13: %{name}-notsc.patch +Patch14: %{name}-hack-norpmlibdep.patch +Patch15: %{name}-epoch0.patch +Patch16: %{name}-perl_req-INC_dirs.patch +Patch17: %{name}-debuginfo.patch +Patch18: vendor-pld.patch +Patch19: %{name}-old-fileconflicts-behaviour.patch +Patch20: %{name}-javadeps.patch +Patch21: %{name}-truncate-cvslog.patch +Patch22: %{name}-libtool-deps.patch +Patch23: %{name}-mimetype.patch +Patch24: %{name}-sparc64.patch +Patch25: %{name}-gendiff.patch +Patch26: openmp.patch +Patch27: %{name}-URPM-build-fix.patch +Patch28: %{name}-db5.3.patch +Patch29: %{name}-helperEVR-noassert.patch +Patch30: %{name}-unglobal.patch +Patch31: %{name}-builddir-readlink.patch +Patch32: %{name}-changelog_order_check_nonfatal.patch +Patch33: %{name}-cleanbody.patch +Patch34: %{name}-dirdeps-macro.patch +Patch35: %{name}-installbeforeerase.patch +Patch36: %{name}-libmagic-locale.patch +Patch37: %{name}-namespace-probe.patch +Patch38: %{name}-popt-coreutils.patch +Patch39: %{name}-postun-nofail.patch +Patch40: %{name}-silence-RPM_CHAR_TYPE.patch +Patch41: %{name}-fix-missing-types-in-headers.patch + +# Patches imported from Mandriva + +# status: ready to merge, it's already been merged on HEAD, so commiting it to rpm-5_4 +# would basically just mean backporting it.. +Patch1000: rpm-5.4.4-add-_specfile-macro.patch +# status: needs to be cleaned up and properly reviewed together with rest +# of the patches related to dependency generation +Patch1001: rpm-5.4.9-avoid-dependencies-on-self.patch +# status: probably ready to merge +Patch1002: rpm-5.4.4-pkgconfigdeps-check-path.patch +# status: probably okay to merge, but discuss on rpm-devel first +Patch1003: rpm-5.4.4-glob-wildcards-for-loading-macro-files.patch +# status: needs to be discussed +Patch1004: rpm-5.4.4-allow-installation-of-repackaged-rpms.patch +# status: ready to merge +Patch1005: rpm-5.4.8-dont-show-suggests-with-requires.patch +# status: ready for merge +Patch1006: rpm-5.4.9-strip-buildroot-away-from-duplicate-files-list.patch +# status: probably okay to merge, but discuss on rpm-devel first +Patch1007: rpm-5.4.10-duplicate_files_terminate_build.patch +# status: same as above +Patch1008: rpm-5.4.10-unpackaged_subdirs_terminate_build.patch +# mdvbz#64898 +# status: uncertain, might be okay to merge, discuss on rpm-devel first +Patch1009: rpm-5.4.4-rpmbuild-withoutclean.patch +# no sense in having an additional dependency on 'pkgconfig' on all packages that +# have a pkgconfig file, it's not needed for them to be made useful and anything +# actuallly using pkgconfig for this purpose will pull it in as a dependency anyways... +# status: might be okay to merge, but discuss on rpm-devel first +Patch1010: rpm-5.4.4-drop-useless-auto-generated-pkgconfig-dependency.patch +# status: ready for merge +Patch1011: rpm-5.4.4-fix-rpmconstant-to-always-use-LC_CTYPE-C-for-case-conversion.patch +# $RPM_BUILD_DIR isn't necessarily the same as $PWD, it's %%{_builddir}, not +# %%{_builddir}/%%{?buildsubdir}, messing up paths in debug packages created.. +# status: needs to be discussed and investigated a bit better.. +Patch1012: rpm-5.4.4-pass-_builddir-properly-to-find-debuginfo.patch +# status: probably okay to merge, but discuss on rpm-devel first +Patch1013: rpm-5.4.10-files-listed-twice-terminates-build.patch +# status: probably okay to merge +Patch1014: rpm-5.4.9-ruby1.9-fixes.patch +# status: keep locally +Patch1015: rpm-5.4.9-keep-loading-script-macros.patch +# status: same as for other dep gen patches +Patch1016: rpm-5.4.9-update-rpmfc-when-removing-dependencies-on-self.patch +# status: idem +Patch1017: rpm-5.4.9-rpmfc-extract-dependencies-for-all-files.patch +# status: ready for merge +Patch1018: rpm-5.4.5-rubygems-add-missing-newline.patch +# status: probably okay to merge +Patch1019: rpm-5.4.5-python-export-spec-macros.patch +# status: idem +Patch1020: rpm-5.4.9-font-provides.patch +# stauus: idem +Patch1021: rpm-5.4.7-kmod-dependencies.patch +# status: probably okay to merge, discuss on rpm-devel first +Patch1022: rpm-5.4.5-skip-dependencies-for-character-devices.patch +# status: ready to merge +Patch1023: rpm-5.4.5-rpmfc-use-strlen-not-sizeof.patch +# status: probably okay to merge +Patch1024: rpm-5.4.5-rpmfc-apply-python-coloring-from-magic.patch +# status: ready to merge +Patch1025: rpm-5.4.7-rpmfc-fix-invalid-free-if-not-_defaultdocdir-set.patch +# status: probably okay to merge +Patch1026: rpm-5.4.10-dont-try-generate-rpmfc-dependencies-from-doc-files.patch +# status: ready +Patch1027: rpm-5.4.7-fix-generation-of-ruby-abi-provides.patch +# crash reproducable with 'rpm -qa --triggers' +# status: ready +Patch1028: rpm-5.4.7-hdrfmt-fix-unitialized-argv-element.patch +# status: same as for other dep gen patches +Patch1029: rpm-5.4.7-dont-consider-trigger-dependencies-as-overlapping.patch +# status: ready +Patch1030: rpm-5.4.7-fix-minor-memleaks.patch +# status: ready +Patch1031: rpm-5.4.9-mire-fix-strings-lacking-null-terminator.patch +# status: ready +Patch1032: rpm-5.4.9-rpmpython-fix-input.patch +# status: ready +Patch1033: rpm-5.4.7-no-seqid_init-on-rdonly-database.patch +# status: probably ready for merging +Patch1034: rpm-5.4.9-avoid-double-slash-in-path-for-dirname-filetrigger-matching.patch +# status: probably ready to merge, discuss on rpm-devel first +Patch1035: rpm-5.4.9-fix-verify-segfault.patch +# status: ready and should be merged +Patch1036: rpm-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 +# page as the target file. +# status: should go upstream, but uncertain about "correct" fix, ie. this is +# more of a workaround, while rewriting rpmdav code to behave consistently +# would be "the right thing to do". Yet I'm not fully able to grasp all of the +# code and don't want to spend more time just to get the API.. +Patch1037: rpm-5.4.10-fix-neon-saving-error-pages-as-target-file.patch +# As the transaction flags for ignoring arch & os are no longer used, there's +# currently no way to ignore arch & os of packages anymore. This patch adds +# support for doing this again by defining rpm variables and overriding +# --ignorearch & --ignoreos to set these. +# status: needs to be discussed upstream before thinking about merging +Patch1038: rpm-5.4.10-support-ignore-arch-and-os-again.patch + URL: http://rpm5.org/ BuildRequires: autoconf >= 2.60 BuildRequires: automake >= 1.4 @@ -176,6 +253,7 @@ BuildRequires: libtool >= 1:1.4.2-9 BuildRequires: libxml2-devel BuildRequires: neon-devel >= 0.25.5 %endif +BuildRequires: ossp-uuid-devel BuildRequires: patch >= 2.2 BuildRequires: popt-devel >= %{reqpopt_ver} %{?with_system_lua:BuildRequires: lua51-devel >= 5.1.2} @@ -598,6 +676,7 @@ Group: Applications/File Requires: %{name} = %{version}-%{release} Requires: python Requires: python-modules +Requires: python-distribute %description pythonprov Python macros, which simplifies creation of RPM packages with Python @@ -668,89 +747,107 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze źrodeł RPM-a przez doxygen. %prep -%setup -q -n %{name}-%{version}%{?subver} +%setup -q -n %{name}-%{version}%{?subver} -a100 #patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 -#%patch6 -p1 // in upstream +%patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 -# compress doc in upstream -%patch10 -p1 -%{?with_system_lua:%patch11 -p1} -#patch12 -p1 +%{?with_system_lua:%patch9 -p1} # CHECK ME - macrofiles: ~/etc could be used -#%%patch14 -p1 -%patch16 -p1 -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 -echo '%%define __mono_provides /usr/lib/rpm/mono-find-provides' > macros.mono -echo '%%define __mono_requires /usr/lib/rpm/mono-find-requires' >> macros.mono -install %{SOURCE9} scripts/php.prov.in -install %{SOURCE10} scripts/php.req.in -install %{SOURCE12} scripts/perl.prov -# looks like upstream?? -#%patch23 -p1 - -%ifarch i386 i486 -# disable TSC -patch26 -p1 +#%%patch10 -p1 +%patch11 -p1 +%ifnarch i386 i486 +# enable TSC for capable archs +%patch13 -p1 %endif -%patch27 -p1 -# to port -#%patch32 -p1 -%patch34 -p1 -%patch35 -p0 -%patch36 -p1 -%patch37 -p1 -#patch38 -p1 applied -#patch39 -p1 applied -#patch40 -p1 applied -%patch41 -p1 -%patch42 -p1 -%patch46 -p1 -# port to new implementation -#%patch47 -p1 -# OLD COMMENTED OUT -#%%patch52 -p1 -- morearchs (rpmrc patch) adds ppc7400, ppc7400 -%patch55 -p1 -%patch59 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p0 %patch17 -p1 %patch18 -p1 +%patch19 -p1 +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 # Maybe, at last we can remove this? -#patch19 -p1 -# port to new implementation -#%patch60 -p1 +#patch12 -p1 +%patch23 -p1 %ifarch sparc64 -%patch61 -p1 +%patch24 -p1 %endif -%patch62 -p1 -#patch63 -p1 applied upstream -%patch70 -p1 -%patch71 -p1 -%patch72 -p1 -b .wiget +%patch25 -p1 +%patch26 -p1 -b .wiget +%patch27 -p1 +%patch28 -p1 +%patch29 -p1 +%patch30 -p1 +%patch31 -p1 +%patch32 -p1 +%patch33 -p1 +%patch34 -p1 +%patch35 -p1 +%patch36 -p1 +%patch37 -p1 +%patch38 -p1 +%patch39 -p1 +%patch40 -p1 +%patch41 -p1 -cd scripts -mv -f perl.req perl.req.in -mv -f perl.prov perl.prov.in -cd .. +%patch1000 -p1 +%patch1001 -p1 +%patch1002 -p1 +%patch1003 -p1 +%patch1004 -p1 +%patch1005 -p1 +%patch1006 -p1 +%patch1007 -p1 +%patch1008 -p1 +%patch1009 -p1 +%patch1010 -p1 +%patch1011 -p1 +%patch1012 -p1 +%patch1013 -p1 +%patch1014 -p1 +%patch1015 -p1 +%patch1016 -p1 +%patch1017 -p1 +%patch1018 -p1 +%patch1019 -p1 +%patch1020 -p1 +%patch1021 -p1 +%patch1022 -p1 +%patch1023 -p1 +%patch1024 -p1 +%patch1025 -p1 +%patch1026 -p1 +%patch1027 -p1 +%patch1028 -p1 +%patch1029 -p1 +%patch1030 -p1 +%patch1031 -p1 +%patch1032 -p1 +%patch1033 -p1 +%patch1034 -p1 +%patch1035 -p1 +%patch1036 -p1 +%patch1037 -p1 +%patch1038 -p1 + +install %{SOURCE2} macros/pld.in +install %{SOURCE9} scripts/php.prov.in +install %{SOURCE10} scripts/php.req.in +install %{SOURCE12} scripts/perl.prov.in + +%{__mv} -f scripts/perl.req{,.in} # generate Group translations to *.po awk -f %{SOURCE6} %{SOURCE1} -# update macros paths -#for f in doc{,/ja,/pl}/rpm.8 doc{,/ja,/pl}/rpmbuild.8 ; do -# sed -e 's@lib/rpm/redhat@lib/rpm/pld@g' $f > ${f}.tmp -# mv -f ${f}.tmp $f -#done - %build %{__libtoolize} #%{__autopoint} @@ -759,9 +856,12 @@ awk -f %{SOURCE6} %{SOURCE1} %{__autoconf} %{__automake} -# 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 -i -e 's|@host@|%{_target_cpu}-%{_target_vendor}-linux-gnu|' -e 's|@host_cpu@|%{_target_cpu}|' macros.in +sed -i \ + -e 's|@host@|%{_target_cpu}-%{_target_vendor}-%{_target_os}|' \ + -e 's|@host_cpu@|%{_target_cpu}|' \ + -e 's|@host_os@|%{_target_os}|' \ + macros/macros.in %{?with_system_lua:CPPFLAGS="-I/usr/include/lua51 %{rpmcppflags}"} # pass CC and CXX too in case of building with some older configure macro @@ -770,7 +870,6 @@ awk -f %{SOURCE6} %{SOURCE1} CXX="%{__newcxx}" \ CPP="%{__newcpp}" \ WITH_PERL_VERSION=no \ - %{?with_autoreqdep:--enable-adding-packages-names-in-autogenerated-dependancies} \ --enable-shared \ --enable-static \ %{!?with_apidocs:--without-apidocs} \ @@ -786,15 +885,17 @@ awk -f %{SOURCE6} %{SOURCE1} --with-neon=%{?with_neon:external}%{!?with_neon:no} \ --with-file=external \ --with-popt=external \ - --with-db=%{?with_db:internal}%{!?with_db:no} \ + --with-db=%{?with_db:external}%{!?with_db:no} \ --with-sqlite=%{?with_sqlite:yes}%{!?with_sqlite:no} \ --with-dbapi=%{!?with_sqlite_dbapi:db}%{?with_sqlite_dbapi:sqlite} \ --with-lua=%{!?with_system_lua:internal}%{?with_system_lua:external} \ --with-pcre=external \ --with-keyutils=none \ + --with-uuid=%{_libdir}:%{_includedir}/ossp-uuid \ --without-path-versioned \ - --with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/macros.pld:%{_rpmlibdir}/macros.build:%{_rpmlibdir}/%%{_target}/macros:%{_sysconfdir}/rpm/macros.*:%{_sysconfdir}/rpm/macros:%{_sysconfdir}/rpm/%%{_target}/macros:~/etc/rpmmacros:~/etc/.rpmmacros:~/.rpmmacros' \ - --with-bugreport="http://bugs.pld-linux.org/" + --with-extra-path-macros='%{_sysconfdir}/rpm/macros.d/*.macros:%{_rpmlibdir}/macros.d/pld:%{_rpmlibdir}/macros.build:~/etc/rpmmacros:~/etc/.rpmmacros:~/.rpmmacros' \ + --with-bugreport="http://bugs.pld-linux.org/" \ + --with-vendor=pld %{__make} -j1 \ CC="%{__cc}" \ @@ -815,29 +916,29 @@ install %{SOURCE19} $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/PLD-3.0-Th-GPG-key # install ARCH macros install -d $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux -install %{SOURCE105} $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux/macros +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 %{SOURCE100} $RPM_BUILD_ROOT%{_rpmlibdir}/athlon-linux/macros -install %{SOURCE101} $RPM_BUILD_ROOT%{_rpmlibdir}/i386-linux/macros -install %{SOURCE102} $RPM_BUILD_ROOT%{_rpmlibdir}/i486-linux/macros -install %{SOURCE103} $RPM_BUILD_ROOT%{_rpmlibdir}/i586-linux/macros -install %{SOURCE104} $RPM_BUILD_ROOT%{_rpmlibdir}/i686-linux/macros -install %{SOURCE106} $RPM_BUILD_ROOT%{_rpmlibdir}/pentium3-linux/macros -install %{SOURCE107} $RPM_BUILD_ROOT%{_rpmlibdir}/pentium4-linux/macros +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 %endif %ifarch %{x8664} install -d $RPM_BUILD_ROOT%{_rpmlibdir}/{x86_64,ia32e,amd64}-linux -install %{SOURCE109} $RPM_BUILD_ROOT%{_rpmlibdir}/x86_64-linux/macros -install %{SOURCE110} $RPM_BUILD_ROOT%{_rpmlibdir}/ia32e-linux/macros -install %{SOURCE111} $RPM_BUILD_ROOT%{_rpmlibdir}/amd64-linux/macros +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 %endif %ifarch %{ppc} install -d $RPM_BUILD_ROOT%{_rpmlibdir}/ppc-linux -install %{SOURCE108} $RPM_BUILD_ROOT%{_rpmlibdir}/ppc-linux/macros +install cpu-os-macros/ppc-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/ppc-linux/macros %endif cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform @@ -922,11 +1023,6 @@ sparc-[^-]*-[Ll]inux(-gnu)? noarch-[^-]*-.* EOF -%ifarch %{ppc} -#sed -e '/_target_platform/s/[%]{_target_cpu}/ppc/' \ -# -i $RPM_BUILD_ROOT%{_rpmlibdir}/ppc74[05]0-linux/macros -%endif - 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 @@ -935,22 +1031,15 @@ rm $RPM_BUILD_ROOT%{_rpmlibdir}/find-lang.sh # not installed since 4.4.8 (-tools-perl subpackage) install scripts/rpmdiff scripts/rpmdiff.cgi $RPM_BUILD_ROOT%{_rpmlibdir} -install macros.perl $RPM_BUILD_ROOT%{_rpmlibdir}/macros.perl -install macros.python $RPM_BUILD_ROOT%{_rpmlibdir}/macros.python -install macros.php $RPM_BUILD_ROOT%{_rpmlibdir}/macros.php -install macros.mono $RPM_BUILD_ROOT%{_rpmlibdir}/macros.mono -install %{SOURCE15} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.java -install %{SOURCE18} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.pld - install %{SOURCE1} doc/manual/groups install %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/install-build-tree 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 %{SOURCE13} $RPM_BUILD_ROOT%{_rpmlibdir}/user_group.sh install %{SOURCE16} $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 %{SOURCE29} $RPM_BUILD_ROOT%{_rpmlibdir}/php.req.php install %{SOURCE20} $RPM_BUILD_ROOT%{_rpmlibdir}/mimetypedeps.sh install %{SOURCE5} $RPM_BUILD_ROOT%{_rpmlibdir}/hrmib-cache install %{SOURCE14} $RPM_BUILD_ROOT/etc/sysconfig/rpm @@ -959,6 +1048,14 @@ install %{SOURCE17} $RPM_BUILD_ROOT%{_bindir}/banner.sh install -d $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo +install %{SOURCE21} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros +install %{SOURCE22} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautocompressdoc +install %{SOURCE23} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprov +install %{SOURCE24} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprovfiles +install %{SOURCE25} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreq +install %{SOURCE26} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreqdep +install %{SOURCE27} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreqfiles + touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Conflictname touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Dirnames install %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Filelinktos @@ -966,99 +1063,6 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Obsoletename touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Providename touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Requirename -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 <> $m -done -# remove arch dependant macros which have no use on noarch -%{__sed} -i -e ' -/{__spec_install_post_strip}/d -/{__spec_install_post_chrpath}/d -/{__spec_install_post_compress_modules}/d -' $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux/macros - # Bourne shell script vs ELF executable linked with rpm,rpmdb,rpmio mv $RPM_BUILD_ROOT{%{_rpmlibdir},%{_bindir}}/rpm2cpio %py_ocomp $RPM_BUILD_ROOT%{py_sitedir} %py_comp $RPM_BUILD_ROOT%{py_sitedir} -rm $RPM_BUILD_ROOT%{py_sitedir}/rpm/*.{la,a,py} +%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/rpm/*.{la,a,py} # wrong location, not used anyway -rm $RPM_BUILD_ROOT%{_rpmlibdir}/rpm.{daily,log,xinetd} +%{__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 +%{__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 +%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/dbconvert.sh %find_lang %{name} -rm -rf manual +%{__rm} -rf manual cp -a doc/manual manual -rm -f manual/Makefile* +%{__rm} -f manual/Makefile* %clean rm -rf $RPM_BUILD_ROOT @@ -1132,10 +1129,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %{_sysconfdir}/pki/rpm-gpg/PLD-3.0-Th-GPG-key.asc %attr(755,root,root) /bin/rpm -#%attr(755,root,root) %{_bindir}/rpmdb -#%attr(755,root,root) %{_bindir}/rpmquery -#%attr(755,root,root) %{_bindir}/rpmsign -#%attr(755,root,root) %{_bindir}/rpmverify %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rpm/macros %dir %{_sysconfdir}/rpm/sysinfo @@ -1143,7 +1136,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %config %verify(not md5 mtime size) %{_sysconfdir}/rpm/sysinfo/* %config %verify(not md5 mtime size) %{_sysconfdir}/rpm/platform - %{_mandir}/man8/rpm.8* %lang(fr) %{_mandir}/fr/man8/rpm.8* %lang(ja) %{_mandir}/ja/man8/rpm.8* @@ -1153,6 +1145,9 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %lang(sk) %{_mandir}/sk/man8/rpm.8* %dir /var/lib/rpm +%dir /var/lib/rpm/log +%dir /var/lib/rpm/tmp +%config(noreplace) %verify(not md5 mtime size) /var/lib/rpm/DB_CONFIG %dir %attr(700,root,root) /var/spool/repackage %dir /var/lock/rpm /var/lock/rpm/transaction @@ -1161,25 +1156,25 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f # net-snmp hrSWInstalledName queries, bash-completions %dir /var/cache/hrmib -#%attr(755,root,root) %{_rpmlibdir}/rpmd -#%{!?with_static:%attr(755,root,root) %{_rpmlibdir}/rpm[eiu]} -#%attr(755,root,root) %{_rpmlibdir}/rpmk -#%attr(755,root,root) %{_rpmlibdir}/rpm[qv] - %{_rpmlibdir}/qf %{_rpmlibdir}/rpmpopt* %{_rpmlibdir}/macros -%{_rpmlibdir}/macros.pld +%dir %{_rpmlibdir}/macros.d +%{_rpmlibdir}/macros.d/pld %{_rpmlibdir}/cpuinfo.yaml %attr(755,root,root) %{_rpmlibdir}/hrmib-cache +%dir %{_rpmlibdir}/bin +%attr(755,root,root) %{_rpmlibdir}/bin/dbconvert + %files base %defattr(644,root,root,755) %dir %{_sysconfdir}/rpm %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 @@ -1208,6 +1203,7 @@ 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 @@ -1221,9 +1217,11 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %attr(755,root,root) %{_rpmlibdir}/find-debuginfo.sh %attr(755,root,root) %{_rpmlibdir}/rpmdb_loadcvt %attr(755,root,root) %{_rpmlibdir}/tgpg -%dir %{_rpmlibdir}/bin +%attr(755,root,root) %{_rpmlibdir}/bin/chroot +%attr(755,root,root) %{_rpmlibdir}/bin/cp %attr(755,root,root) %{_rpmlibdir}/bin/debugedit -%attr(755,root,root) %{_rpmlibdir}/bin/grep +%attr(755,root,root) %{_rpmlibdir}/bin/find +%attr(755,root,root) %{_rpmlibdir}/bin/mgo %attr(755,root,root) %{_rpmlibdir}/bin/mtree %attr(755,root,root) %{_rpmlibdir}/bin/rpmcache %attr(755,root,root) %{_rpmlibdir}/bin/rpmcmp @@ -1231,7 +1229,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %attr(755,root,root) %{_rpmlibdir}/bin/rpmdigest %attr(755,root,root) %{_rpmlibdir}/bin/rpmkey %attr(755,root,root) %{_rpmlibdir}/bin/rpmrepo -%{_mandir}/man1/rpmgrep.1* %{_mandir}/man8/rpm2cpio.8* %{_mandir}/man8/rpmcache.8* %{_mandir}/man8/rpmconstant.8* @@ -1261,9 +1258,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rpm/noauto* %attr(755,root,root) %{_rpmlibdir}/brp-* %attr(755,root,root) %{_rpmlibdir}/check-files -# %attr(755,root,root) %{_rpmlibdir}/check-prereqs %attr(755,root,root) %{_rpmlibdir}/compress-doc -#%attr(755,root,root) %{_rpmlibdir}/config.* %attr(755,root,root) %{_rpmlibdir}/cross-build %attr(755,root,root) %{_rpmlibdir}/find-spec-bcond %attr(755,root,root) %{_rpmlibdir}/getpo.sh @@ -1274,11 +1269,14 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %attr(755,root,root) %{_rpmlibdir}/mimetypedeps.sh # needs hacked pkg-config to return anything %attr(755,root,root) %{_rpmlibdir}/pkgconfigdeps.sh -%dir %{_rpmlibdir}/bin +%attr(755,root,root) %{_rpmlibdir}/bin/api-sanity-autotest.pl +%attr(755,root,root) %{_rpmlibdir}/bin/api-sanity-checker.pl %attr(755,root,root) %{_rpmlibdir}/bin/install-sh %attr(755,root,root) %{_rpmlibdir}/bin/mkinstalldirs -#%attr(755,root,root) %{_rpmlibdir}/rpmb -#%attr(755,root,root) %{_rpmlibdir}/rpmt +%attr(755,root,root) %{_rpmlibdir}/bin/pom2spec +%attr(755,root,root) %{_rpmlibdir}/bin/rpmspecdump +%attr(755,root,root) %{_rpmlibdir}/bin/sqlite3 +%attr(755,root,root) %{_rpmlibdir}/bin/wget %attr(755,root,root) %{_rpmlibdir}/vcheck %{_rpmlibdir}/noarch-* %ifarch %{ix86} @@ -1306,36 +1304,39 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %{_rpmlibdir}/ia32e* %{_rpmlibdir}/x86_64* %endif -# must be here for "Requires: rpm-*prov" to work -%{_rpmlibdir}/macros.java -%{_rpmlibdir}/macros.mono -%{_rpmlibdir}/macros.perl -%{_rpmlibdir}/macros.php # not used yet ... these six depend on perl %attr(755,root,root) %{_rpmlibdir}/http.req -#%attr(755,root,root) %{_rpmlibdir}/magic.prov -#%attr(755,root,root) %{_rpmlibdir}/magic.req -#%{_rpmlibdir}/sql.prov -#%{_rpmlibdir}/sql.req -#%{_rpmlibdir}/tcl.req -%attr(755,root,root) %{_rpmlibdir}/mono* -%dir %{_rpmlibdir}/macros.d -%{_rpmlibdir}/macros.d/perl +# we always used scripts provided by mono-devel, maybe move them here +#%attr(755,root,root) %{_rpmlibdir}/mono-find-provides +#%attr(755,root,root) %{_rpmlibdir}/mono-find-requires + +%attr(755,root,root) %{_rpmlibdir}/fontconfig.prov +# must be here for "Requires: rpm-*prov" to work +%{_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 %{_rpmlibdir}/macros.d/php %{_rpmlibdir}/macros.d/pkgconfig %{_rpmlibdir}/macros.d/python +%{_rpmlibdir}/macros.d/ruby %{_rpmlibdir}/macros.d/selinux +%{_rpmlibdir}/macros.d/tcl %{_rpmlibdir}/macros.rpmbuild +%attr(755,root,root) %{_rpmlibdir}/check-multiarch-files +%attr(755,root,root) %{_rpmlibdir}/gem_helper.rb +%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) %{_rpmlibdir}/rubygems.rb %attr(755,root,root) %{_bindir}/gendiff +%attr(755,root,root) %{_bindir}/multiarch-platform %attr(755,root,root) %{_bindir}/rpmbuild -%attr(755,root,root) %{_rpmlibdir}/bin/rpmspecdump -%attr(755,root,root) %{_rpmlibdir}/bin/wget %dir %{_rpmlibdir}/helpers %attr(755,root,root) %{_rpmlibdir}/helpers/makeshlibs @@ -1357,15 +1358,10 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %attr(755,root,root) %{_rpmlibdir}/perl.* %attr(755,root,root) %{_rpmlibdir}/osgideps.pl %attr(755,root,root) %{_rpmlibdir}/perldeps.pl -#%attr(755,root,root) %{_rpmlibdir}/find-perl-* -#%attr(755,root,root) %{_rpmlibdir}/find-*.perl -#%attr(755,root,root) %{_rpmlibdir}/find-prov.pl -#%attr(755,root,root) %{_rpmlibdir}/find-req.pl -#%attr(755,root,root) %{_rpmlibdir}/get_magic.pl %files pythonprov %defattr(644,root,root,755) -%{_rpmlibdir}/macros.python +%attr(755,root,root) %{_rpmlibdir}/pythoneggs.py %attr(755,root,root) %{_rpmlibdir}/pythondeps.sh %files php-pearprov