From: Marcin Krol Date: Wed, 29 Apr 2020 16:33:36 +0000 (+0200) Subject: - cleanup + dropped unused archs X-Git-Url: https://git.tld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=247bd0f753a3ec731d95cbde67da421f2908ff94 - cleanup + dropped unused archs --- diff --git a/rpm-installplatform.patch b/rpm-installplatform.patch index 250055b..cc75c1a 100644 --- a/rpm-installplatform.patch +++ b/rpm-installplatform.patch @@ -5,7 +5,7 @@ powerpc*|ppc*) SUBSTS='s_ppc64_ppc_ s_ppc\([^6ip]\|$\)_ppc64\1_ s_ppc\([^6ip]\|$\)_ppciseries_ s_ppc\([^6ip]\|$\)_ppcpseries_ s_ppc\([^6ip]\|$\)_ppc64iseries_ s_ppc\([^6ip]\|$\)_ppc64pseries_' ;; s390*) SUBSTS='s_s390x_s390_ s_s390\([^x]\|$\)_s390x\1_' ;; - x86_64|amd64|ia32e) SUBSTS='s,x86_64,x86_64, s,x86_64,ia32e, s,x86_64,amd64,' ;; -+ x86_64|amd64|ia32e) SUBSTS='s|x86_64|x86_64| s|x86_64|ia32e| s|x86_64|amd64|' ;; ++ x86_64|amd64|ia32e) SUBSTS='s|x86_64|x86_64| s|x86_64|amd64|' ;; *) SUBSTS=y___ ;; esac diff --git a/rpm-morearchs.patch b/rpm-morearchs.patch deleted file mode 100644 index 7cd8a5e..0000000 --- a/rpm-morearchs.patch +++ /dev/null @@ -1,106 +0,0 @@ -diff -ur rpm-4.4.4/Makefile.am rpm-4.4.4.morearchs/Makefile.am ---- rpm-4.4.4/Makefile.am 2006-02-11 15:01:38.000000000 +0000 -+++ rpm-4.4.4.morearchs/Makefile.am 2006-02-11 18:06:51.000000000 +0000 -@@ -188,6 +188,8 @@ - powerpc*) $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/ppc ;\ - $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/ppciseries ;\ - $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/ppcpseries ;\ -+ $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/ppc7400 ;\ -+ $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/ppc7450 ;\ - $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/ppc64 ;\ - $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/ppc64iseries ;\ - $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/ppc64pseries ;;\ -diff -ur rpm-4.4.4/installplatform rpm-4.4.4.morearchs/installplatform ---- rpm-4.4.4/installplatform 2005-10-25 21:19:24.000000000 +0000 -+++ rpm-4.4.4.morearchs/installplatform 2006-02-11 18:02:55.000000000 +0000 -@@ -33,7 +33,7 @@ - i[3456]86|pentium[34]|athlon) SUBSTS='s_i386_i386_ s_i386_i486_ s_i386_i586_ s_i386_i686_ s_i386_pentium3_ s_i386_pentium4_ s_i386_athlon_' ;; - alpha*) SUBSTS='s_alpha_alpha_ s_alpha_alphaev5_ s_alpha_alphaev56_ s_alpha_alphapca56_ s_alpha_alphaev6_ s_alpha_alphaev67_' ;; - sparc*) SUBSTS='s_sparc\(64\|v9\)_sparc_ s_sparc64_sparcv9_;s_sparc\([^v]\|$\)_sparcv9\1_ s_sparcv9_sparc64_;s_sparc\([^6]\|$\)_sparc64\1_' ;; -- powerpc*|ppc*) SUBSTS='s_ppc64_ppc_ s_ppc\([^6ip]\|$\)_ppc64\1_ s_ppc\([^6ip]\|$\)_ppciseries_ s_ppc\([^6ip]\|$\)_ppcpseries_ s_ppc\([^6ip]\|$\)_ppc64iseries_ s_ppc\([^6ip]\|$\)_ppc64pseries_' ;; -+ powerpc*|ppc*) SUBSTS='s_ppc64_ppc_ s_ppc\([^6ip]\|$\)_ppc64\1_ s_ppc\([^6ip]\|$\)_ppciseries_ s_ppc\([^6ip]\|$\)_ppcpseries_ s_ppc\([^6ip]\|$\)_ppc7400_ s_ppc\([^6ip]\|$\)_ppc7450_ s_ppc\([^6ip]\|$\)_ppc64iseries_ s_ppc\([^6ip]\|$\)_ppc64pseries_' ;; - s390*) SUBSTS='s_s390x_s390_ s_s390\([^x]\|$\)_s390x\1_' ;; - *) SUBSTS=y___ ;; - esac ---- rpm-4.4.5/lib/rpmrc.c.orig 2006-02-28 22:01:56.462419250 +0100 -+++ rpm-4.4.5/lib/rpmrc.c 2006-02-28 22:09:36.415164500 +0100 -@@ -1331,10 +1331,18 @@ - switch (pvr) { - /* IBM750FX, 7410, 7450, 7451, 7441, 7455, 7445 */ - case 0x7000: -+ strcpy(un.machine, "ppc"); -+ break; - case 0x8000: - case 0x8001: -+ case 0x8002: -+ case 0x8003: -+ /* 0x8000: 7450, 0x8001: 7455, 0x8002: 7457, 0x8003: 7447A */ -+ strcpy(un.machine, "ppc7450"); -+ break; - case 0x800c: -- strcpy(un.machine, "ppc"); -+ case 0x000c: -+ strcpy(un.machine, "ppc7400"); - break; - case 0x36: - case 0x37: -diff -ur rpm-4.4.4/macros.in rpm-4.4.4.morearchs/macros.in ---- rpm-4.4.4/macros.in 2006-02-11 15:01:38.000000000 +0000 -+++ rpm-4.4.4.morearchs/macros.in 2006-02-11 18:17:36.000000000 +0000 -@@ -1244,6 +1244,7 @@ - # conditionals. - # - %ix86 i386 i486 i586 i686 pentium3 pentium4 athlon -+%ppc ppc ppc7400 ppc7450 - - #------------------------------------------------------------------------ - # Use in %install to generate locale specific file lists. For example, -diff -ur rpm-4.4.4/rpmrc.in rpm-4.4.4.morearchs/rpmrc.in ---- rpm-4.4.4/rpmrc.in 2006-02-11 15:01:38.000000000 +0000 -+++ rpm-4.4.4.morearchs/rpmrc.in 2006-02-11 18:11:55.000000000 +0000 -@@ -42,6 +42,8 @@ - optflags: m68k -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_m68k: %{specflags_m68k}}} - - optflags: ppc -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc: %{specflags_ppc}}} -+optflags: ppc7400 -O2 -mcpu=7400 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc: %{specflags_ppc}}} -+optflags: ppc7450 -O2 -mcpu=7450 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc: %{specflags_ppc}}} - optflags: ppc8260 -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc8260: %{specflags_ppc8260}}} - optflags: ppc8560 -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc8560: %{specflags_ppc8560}}} - optflags: ppc32dy4 -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc32dy4: %{specflags_ppc32dy4}}} -@@ -110,6 +112,8 @@ - arch_canon: mips: mips 4 - - arch_canon: ppc: ppc 5 -+arch_canon: ppc7400: ppc7400 5 -+arch_canon: ppc7450: ppc7450 5 - arch_canon: ppc8260: ppc8260 5 - arch_canon: ppc8560: ppc8560 5 - arch_canon: ppc32dy4: ppc32dy4 5 -@@ -212,7 +216,8 @@ - buildarchtranslate: sun4u: sparc64 - buildarchtranslate: sparc64: sparc64 - --buildarchtranslate: osfmach3_ppc: ppc -+buildarchtranslate: ppc7400: ppc7400 -+buildarchtranslate: ppc7450: ppc7450 - buildarchtranslate: powerpc: ppc - buildarchtranslate: powerppc: ppc - buildarchtranslate: ppc8260: ppc -@@ -263,6 +268,8 @@ - arch_compat: osfmach3_i486: i486 osfmach3_i386 - arch_compat: osfmach3_i386: i486 - -+arch_compat: ppc7450: ppc7400 -+arch_compat: ppc7400: ppc - arch_compat: osfmach3_ppc: ppc - arch_compat: powerpc: ppc - arch_compat: powerppc: ppc -@@ -375,6 +382,8 @@ - - buildarch_compat: m68k: noarch - -+buildarch_compat: ppc7450: ppc7400 -+buildarch_compat: ppc7400: ppc - buildarch_compat: ppc8260: noarch - buildarch_compat: ppc8560: noarch - buildarch_compat: ppc32dy4: noarch diff --git a/rpm-pydebuginfo.patch b/rpm-pydebuginfo.patch deleted file mode 100644 index 1c9eac4..0000000 --- a/rpm-pydebuginfo.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- rpm-4.5/scripts/find-debuginfo.sh 2008-08-18 22:54:31.109085807 +0300 -+++ rpm-4.5/scripts/find-debuginfo.sh 2008-08-29 23:27:02.516217319 +0300 -@@ -10,30 +10,38 @@ - - LISTFILE=$BUILDDIR/debugfiles.list - SOURCEFILE=$BUILDDIR/debugsources.list -+DEBUGFILES=$BUILDDIR/debugfiles-add.list - - : > $SOURCEFILE --: > $LISTFILE -+touch $LISTFILE - --strip_to_debug() --{ -+strip_to_debug() { - objcopy --only-keep-debug --remove-section .comment "$2" "$1" - objcopy --add-gnu-debuglink="$1" "$2" - } - -+extract_debuginfo() { -+ : -+} -+ - if [ ! -d $RPM_BUILD_ROOT ]; then - # no buildroot, exit - exit 0 - fi - -+if [ -f $DEBUGFILES ]; then -+ cat $DEBUGFILES > $LISTFILE -+fi -+ - filelist=$(find $RPM_BUILD_ROOT ! -path "$RPM_BUILD_ROOT/usr/lib/debug/*.debug" -type f '(' -perm -0100 -or -perm -0010 -or -perm -0001 ')') --if [ -z "$filelist" ]; then -+if [ -z "$filelist" -a ! -f $DEBUGFILES ]; then - # no files, exit - exit 0 - fi - - filetypes=$(echo "$filelist" | xargs -r -d'\n' file) - elflist=$(echo "$filetypes" | awk -F: '/ELF.*, not stripped/ {print $1}') --if [ -z "$elflist" ]; then -+if [ -z "$elflist" -a ! -f $DEBUGFILES ]; then - # no elf objects, exit - exit 0 - fi -@@ -74,2 +82,5 @@ - find ${RPM_BUILD_ROOT}/usr/lib/debug -type f | sed -n -e "s#^$RPM_BUILD_ROOT##p" > $LISTFILE -+if [ -f $DEBUGFILES ]; then -+ sed -e "s#^$RPM_BUILD_ROOT##" $DEBUGFILES >> $LISTFILE -+fi - find ${RPM_BUILD_ROOT}/usr/src/debug -mindepth 1 -maxdepth 1 | sed -n -e "s#^$RPM_BUILD_ROOT##p" >> $LISTFILE diff --git a/rpm.spec b/rpm.spec index b3ae86e..d2d52cb 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,19 +1,3 @@ -# TODO: -# pluto_> btw. /usr/lib/rpm/find-debuginfo.sh needs fix. it extract debuginfo also from kernel modules. -# pluto_> there's a filelist=$(find $RPM_BUILD_ROOT ! -path "$RPM_BUILD_ROOT/usr/lib/debug/*.debug" -type f -# pluto_> and we need to add ! -path /lib/modules/... -# - python(abi) cap is not provided automatically because /usr/lib*/libpython2*.so.* -# matches ELF first -# - repackaging when lzma is not installed (todo: fix digest signature of header) -# rpmbuild computes digest when writing package to temporary file, then adds a few -# tags (incl. digest) and writes whole package to destination file; -# repackaging uses unchanged "immutable header" image from original rpm, also -# preserving payload format and compressor from original rpm, _not_ current settings -# /usr/bin/install: cannot stat `./it.gmo': No such file or directory -# /usr/bin/install: cannot stat `./sr@Latn.gmo': No such file or directory -# - maybe? http://rpm.org/gitweb?p=rpm.git;a=commitdiff;h=cfcd1f9bd98d5d0fc46a84931984efec3b9d47e2 -# - fix linking, rpm is beeing linked against installed rpmio -# # Conditional build: %bcond_with static # build static rpm+rpmi %bcond_with apidocs # don't generate documentation with doxygen @@ -60,7 +44,6 @@ Source15: %{name}.sysconfig Source18: banner.sh Source19: %{name}-macros.gstreamer Patch1000: %{name}-new-debuginfo.patch -#Patch0: %{name}-pl.po.patch Patch1: %{name}-rpmrc.patch Patch2: %{name}-arch.patch Patch3: %{name}-rpmpopt.patch @@ -103,7 +86,6 @@ Patch45: %{name}-no-sqlite.patch Patch48: %{name}-nopie.patch Patch50: %{name}-macros.patch Patch51: %{name}-cleanlibdirs.patch -Patch52: %{name}-morearchs.patch Patch53: %{name}-chroot-hack.patch Patch55: %{name}-truncate-cvslog.patch Patch56: %{name}-rpm5-patchset-8413.patch @@ -125,7 +107,6 @@ Patch72: %{name}-postun-nofail.patch Patch73: %{name}-namespace-probe.patch Patch74: %{name}-noversiondir.patch Patch75: %{name}-rpmte-segv.patch -Patch76: %{name}-pydebuginfo.patch Patch77: %{name}-dirdeps-macro.patch Patch78: %{name}-db3-configure.patch Patch79: %{name}-macros-cpp.patch @@ -236,9 +217,8 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # don't require very fresh rpm.macros to build %define __gettextize gettextize --copy --force --no-changelog; [ -f po/Makevars ] || cp -f po/Makevars{.template,} %define find_lang sh ./scripts/find-lang.sh $RPM_BUILD_ROOT -%define ix86 i386 i486 i586 i686 athlon pentium3 pentium4 -%define ppc ppc ppc7400 ppc7450 -%define x8664 amd64 ia32e x86_64 +%define ix86 i386 i486 i586 i686 +%define x8664 amd64 x86_64 # stabilize new build environment %define __newcc %{?force_cc}%{!?force_cc:%{_target_cpu}-tld-linux-gcc} @@ -304,7 +284,6 @@ Summary(pl.UTF-8): Podstawowy pakiet RPM - skrypty używane przez same pakiety r Group: Base Requires: filesystem Obsoletes: rpm-scripts -Obsoletes: vserver-rpm %description base The RPM base package contains scripts used by rpm packages themselves. @@ -651,7 +630,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze %setup -q cp -p %{SOURCE15} . %patch1000 -p1 -#%patch0 -p1 %patch2 -p1 %patch1 -p1 %patch3 -p1 @@ -668,9 +646,6 @@ cp -p %{SOURCE15} . %patch16 -p1 %patch17 -p1 sed -e 's/^/@tld@/' %{SOURCE2} >>platform.in -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 __mono_provides /usr/lib/rpm/mono-find-provides' > macros.mono echo '%%define __mono_requires /usr/lib/rpm/mono-find-requires' >> macros.mono install %{SOURCE13} scripts/perl.prov @@ -701,7 +676,6 @@ install %{SOURCE13} scripts/perl.prov %patch20 -p1 %patch35 -p1 %patch51 -p1 -#%patch52 -p1 %patch55 -p1 %patch56 -p1 %patch57 -p1 @@ -720,8 +694,6 @@ install %{SOURCE13} scripts/perl.prov %patch73 -p1 %patch74 -p1 %patch75 -p0 -# having .py sources in -debuginfo needs more testing -#%patch76 -p1 %patch77 -p0 %patch79 -p1 %patch80 -p1 @@ -877,95 +849,23 @@ cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform # first platform file entry can't contain regexps %{_target_cpu}-%{_target_vendor}-linux -%ifarch x86_64 -# x86_64 things -amd64-[^-]*-[Ll]inux(-gnu)? -x86_64-[^-]*-[Ll]inux(-gnu)? -%endif -%ifarch amd64 +%ifarch %{x8664} amd64-[^-]*-[Ll]inux(-gnu)? x86_64-[^-]*-[Ll]inux(-gnu)? %endif -%ifarch ia32e -ia32e-[^-]*-[Ll]inux(-gnu)? -x86_64-[^-]*-[Ll]inux(-gnu)? -%endif - -%ifarch athlon %{x8664} -# x86 things -athlon-[^-]*-[Ll]inux(-gnu)? -%endif -%ifarch pentium4 athlon %{x8664} -pentium4-[^-]*-[Ll]inux(-gnu)? -%endif -%ifarch pentium3 pentium4 athlon %{x8664} -pentium3-[^-]*-[Ll]inux(-gnu)? -%endif -%ifarch i686 pentium3 pentium4 athlon %{x8664} +%ifarch i686 %{x8664} i686-[^-]*-[Ll]inux(-gnu)? %endif -%ifarch i586 i686 pentium3 pentium4 athlon %{x8664} +%ifarch i586 i686 %{x8664} i586-[^-]*-[Ll]inux(-gnu)? %endif -%ifarch i486 i586 i686 pentium3 pentium4 athlon %{x8664} +%ifarch i486 i586 i686 %{x8664} i486-[^-]*-[Ll]inux(-gnu)? %endif %ifarch %{ix86} %{x8664} i386-[^-]*-[Ll]inux(-gnu)? %endif -%ifarch alpha -alpha-[^-]*-[Ll]inux(-gnu)? -%endif - -%ifarch ia64 -ia64-[^-]*-[Ll]inux(-gnu)? -%endif - -%ifarch ppc64 -powerpc64-[^-]*-[Ll]inux(-gnu)? -ppc64-[^-]*-[Ll]inux(-gnu)? -%endif -%ifarch ppc ppc64 -powerpc-[^-]*-[Ll]inux(-gnu)? -ppc-[^-]*-[Ll]inux(-gnu)? -%endif - -%ifarch s390x -s390x-[^-]*-[Ll]inux(-gnu)? -%endif -%ifarch s390 s390x -s390-[^-]*-[Ll]inux(-gnu)? -%endif - -%ifarch sparc64 -sparc64-[^-]*-[Ll]inux(-gnu)? -%endif -%ifarch sparcv9 sparc64 -sparcv9-[^-]*-[Ll]inux(-gnu)? -%endif -%ifarch sparc sparcv9 sparc64 -sparc-[^-]*-[Ll]inux(-gnu)? -%endif -%ifarch armv6l -armv6l-[^-]*-[Ll]inux(-gnu)? -%endif -%ifarch armv5tel -armv5tel-[^-]*-[Ll]inux(-gnu)? -%endif -%ifarch armv4t armv5tel -armv4t-[^-]*-[Ll]inux(-gnu)? -%endif -%ifarch armv3t armv4t armv5tel -armv3t-[^-]*-[Ll]inux(-gnu)? -%endif -%ifarch armv5teb -armv5teb-[^-]*-[Ll]inux(-gnu)? -%endif -%ifarch armv4b armv5teb -armv4b-[^-]*-[Ll]inux(-gnu)? -%endif - # noarch noarch-[^-]*-.* EOF @@ -978,8 +878,6 @@ rm $RPM_BUILD_ROOT%{_rpmlibdir}/find-lang.sh # not installed since 4.4.8 (-tools-perl subpackage) install -p scripts/rpmdiff scripts/rpmdiff.cgi $RPM_BUILD_ROOT%{_rpmlibdir} -cp -a macros.perl $RPM_BUILD_ROOT%{_rpmlibdir}/macros.perl -cp -a macros.python $RPM_BUILD_ROOT%{_rpmlibdir}/macros.python cp -a macros.mono $RPM_BUILD_ROOT%{_rpmlibdir}/macros.mono cp -a %{SOURCE19} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.gstreamer @@ -1160,19 +1058,11 @@ rm -rf $RPM_BUILD_ROOT %triggerpostun lib -- %{name}-lib < %{version} echo >&2 "rpm-lib upgrade: Removing /var/lib/rpm/__db* from older rpmdb version" rm -f /var/lib/rpm/__db* -if [ -d /vservers ]; then - echo >&2 "rpm-lib upgrade: Removing vservers apps/pkgmgmt/base/rpm/state/__* from older rpmdb version" - rm -f /etc/vservers/*/apps/pkgmgmt/base/rpm/state/__* -fi echo >&2 "You should rebuild your rpmdb: rpm --rebuilddb to avoid random rpmdb errors" -%triggerpostun lib -- db4.5 < %{reqdb_ver} -echo >&2 "db4.5 upgrade: Removing /var/lib/rpm/__db* from older rpmdb version" +%triggerpostun lib -- db4.7 < %{reqdb_ver} +echo >&2 "db4.7 upgrade: Removing /var/lib/rpm/__db* from older rpmdb version" rm -f /var/lib/rpm/__db* -if [ -d /vservers ]; then - echo >&2 "db4.5 upgrade: Removing vservers apps/pkgmgmt/base/rpm/state/__* from older rpmdb version" - rm -f /etc/vservers/*/apps/pkgmgmt/base/rpm/state/__* -fi echo >&2 "You should rebuild your rpmdb: rpm --rebuilddb to avoid random rpmdb errors" %triggerpostun -- %{name} < 4.4.9-44 @@ -1216,11 +1106,6 @@ 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}/rpmpopt* %{_rpmlibdir}/macros @@ -1301,59 +1186,24 @@ 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}/cross-build %attr(755,root,root) %{_rpmlibdir}/getpo.sh %attr(755,root,root) %{_rpmlibdir}/install-build-tree -#%attr(755,root,root) %{_rpmlibdir}/config.* -#%attr(755,root,root) %{_rpmlibdir}/mkinstalldirs %attr(755,root,root) %{_rpmlibdir}/u_pkg.sh %attr(755,root,root) %{_rpmlibdir}/executabledeps.sh %attr(755,root,root) %{_rpmlibdir}/libtooldeps.sh -# needs hacked pkg-config to return anything %attr(755,root,root) %{_rpmlibdir}/pkgconfigdeps.sh -#%attr(755,root,root) %{_rpmlibdir}/rpmb -#%attr(755,root,root) %{_rpmlibdir}/rpmt %{_rpmlibdir}/noarch-* %ifarch %{ix86} %{_rpmlibdir}/i?86* -%{_rpmlibdir}/pentium* -%{_rpmlibdir}/athlon* -%endif -%ifarch alpha -%{_rpmlibdir}/alpha* -%endif -%ifarch ia64 -%{_rpmlibdir}/ia64* -%endif -%ifarch mips mipsel mips64 mips64el -%{_rpmlibdir}/mips* -%endif -%ifarch %{ppc} -%{_rpmlibdir}/ppc* -%endif -%ifarch sparc sparcv9 sparc64 -%{_rpmlibdir}/sparc* %endif %ifarch %{x8664} %{_rpmlibdir}/amd64* -%{_rpmlibdir}/ia32e* %{_rpmlibdir}/x86_64* %endif -%ifarch armv6l armv5tel armv4t armv3t armv5teb armv4b -%{_rpmlibdir}/arm* -%endif # must be here for "Requires: rpm-*prov" to work %{_rpmlibdir}/macros.gstreamer %{_rpmlibdir}/macros.mono -%{_rpmlibdir}/macros.perl -# 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) %{_bindir}/gendiff %attr(755,root,root) %{_bindir}/rpmbuild @@ -1367,16 +1217,9 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %files perlprov %defattr(644,root,root,755) %attr(755,root,root) %{_rpmlibdir}/perl.* -#%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}/pythondeps.sh %attr(755,root,root) %{_rpmlibdir}/pythoneggs.py