X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.spec;h=fda1614dfdec3d0b4cde596efc4c67c87e703612;hp=c095a2ac1676479ff32c113ae5a207ffae69a8f4;hb=37e965e83af05766c7487c942385dc8ce496fcb0;hpb=ae866251beb68c39b5da45dba7df8b859d36c87f diff --git a/rpm.spec b/rpm.spec index c095a2a..fda1614 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,38 +1,30 @@ # # TODO: +# - check if glob() patch needs resurrecting/rewriting # - check if we want shell autodeps: Requires: executable(ln) executable(mv) -# - %{_arch} = i686 not as used to be i386: +# - %{_arch} = i686 not as used to be i386 (platform file thing?): # 5.0.2: rpm -E '%_target_base_arch %_arch' # i386 i686 # 4.4.9: rpm -E '%_target_base_arch %_arch' # i386 i386 # - 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 -# - 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 autoreqdep # autogenerate package name deps in addition to sonames/perl(X) +%bcond_with 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) -%bcond_with neon # build with HTTP/WebDAV support (neon library) +%bcond_without neon # build with HTTP/WebDAV support (neon library) %bcond_without db # BerkeleyDB -%bcond_with sqlite # build with SQLite support +%bcond_without sqlite # build with SQLite support %bcond_with sqlite_dbapi # default database backend is sqlite %bcond_without system_lua # use system lua # force_cc - force using __cc other than "%{_target_cpu}-pld-linux-gcc" @@ -48,12 +40,12 @@ ERROR %endif -# # versions of required libraries -%define reqdb_ver 4.6.18 -%define reqpopt_ver 1.10.8 -%define beecrypt_ver 2:4.1.2-4 -%define sover 5.0 +%define reqdb_ver 5.3 +%define reqpopt_ver 1.15 +%define beecrypt_ver 2:4.1.2-4 +%define sover 5.4 + Summary: RPM Package Manager Summary(de.UTF-8): RPM Packet-Manager Summary(es.UTF-8): Gestor de paquetes RPM @@ -62,85 +54,93 @@ Summary(pt_BR.UTF-8): Gerenciador de pacotes RPM Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm -Version: 5.0.3 -Release: 0.2 +Version: 5.4.10 +Release: 0.1 License: LGPL Group: Base -Source0: http://rpm5.org/files/rpm/rpm-5.0/%{name}-%{version}.tar.gz -# Source0-md5: b3df4e54e84cf3344ce6b76fa2a8d5bf +# 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 - -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 - -#Patch0: %{name}-pl.po.patch +Source19: ftp://ftp.pld-linux.org/dists/th/PLD-3.0-Th-GPG-key.asc +# Source19-md5: 08b29584dd349aac9caa7610131a0a88 +Source20: %{name}-mimetypedeps +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-downgrade.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 Patch14: %{name}-etc_dir.patch Patch16: %{name}-php-deps.patch - -Patch23: %{name}-pkgconfigdeps.patch +Patch19: %{name}-glob.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 +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 -Patch58: %{name}-repackage-wo-lzma.patch Patch59: %{name}-libtool-deps.patch - +Patch60: %{name}-mimetype.patch Patch61: %{name}-sparc64.patch +Patch62: %{name}-gendiff.patch +Patch70: %{name}-configure-autoconf.patch +Patch72: openmp.patch +Patch73: %{name}-URPM-build-fix.patch +Patch74: %{name}-db5.3.patch +Patch75: %{name}-helperEVR-noassert.patch +Patch76: %{name}-unglobal.patch +Patch77: %{name}-builddir-readlink.patch +Patch78: %{name}-changelog_order_check_nonfatal.patch +Patch79: %{name}-cleanbody.patch +Patch80: %{name}-dirdeps-macro.patch +Patch81: %{name}-installbeforeerase.patch +Patch82: %{name}-libmagic-locale.patch +Patch83: %{name}-namespace-probe.patch +Patch84: %{name}-popt-coreutils.patch +Patch85: %{name}-postun-nofail.patch URL: http://rpm5.org/ BuildRequires: autoconf >= 2.60 BuildRequires: automake >= 1.4 @@ -148,8 +148,9 @@ BuildRequires: beecrypt-devel >= %{beecrypt_ver} BuildRequires: bzip2-devel >= 1.0.2-17 %{?with_db:BuildRequires: db-devel >= %{reqdb_ver}} BuildRequires: elfutils-devel >= 0.108 -BuildRequires: gettext-autopoint >= 0.11.4-2 +#BuildRequires: gettext-autopoint >= 0.11.4-2 BuildRequires: gettext-devel >= 0.11.4-2 +BuildRequires: keyutils-devel BuildRequires: libmagic-devel %{?with_selinux:BuildRequires: libselinux-devel >= 1.18} # needed only for AM_PROG_CXX used for CXX substitution in rpm.macros @@ -164,10 +165,17 @@ BuildRequires: popt-devel >= %{reqpopt_ver} %{?with_system_lua:BuildRequires: lua51-devel >= 5.1.2} %{?with_python:BuildRequires: python-devel >= 1:2.3} BuildRequires: python-modules >= 1:2.3 -BuildRequires: rpm-perlprov %{?with_python:BuildRequires: rpm-pythonprov} %{?with_sqlite:BuildRequires: sqlite3-devel} +BuildRequires: tcl BuildRequires: zlib-devel +BuildRequires: xz-devel +%if %{with apidocs} +BuildRequires: doxygen +BuildRequires: ghostscript +BuildRequires: graphviz +BuildRequires: tetex-pdftex +%endif %if %{with static} # Require static library only for static build BuildRequires: beecrypt-static >= %{beecrypt_ver} @@ -184,10 +192,14 @@ Requires: %{name}-base = %{version}-%{release} Requires: %{name}-lib = %{version}-%{release} Requires: beecrypt >= %{beecrypt_ver} Requires: popt >= %{reqpopt_ver} +Provides: rpm-db-ver = %{reqdb_ver} +Obsoletes: rpm-getdeps %{!?with_static:Obsoletes: rpm-utils-static} Conflicts: glibc < 2.2.92 # db4.6 poldek needed Conflicts: poldek < 0.21-0.20070703.00.3 +# segfaults with lzma 0.42.2 +Conflicts: lzma-libs < 4.999.3 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _binary_payload w9.gzdio @@ -289,8 +301,6 @@ Requires: beecrypt >= %{beecrypt_ver} Requires: libmagic >= 1.15-2 %{?with_selinux:Requires: libselinux >= 1.18} Requires: popt >= %{reqpopt_ver} -%{?with_suggest_tags:Suggests: lzma} -Obsoletes: rpm-apidocs Obsoletes: rpm-libs # avoid SEGV caused by mixed db versions Conflicts: poldek < 0.18.1-16 @@ -315,6 +325,7 @@ Requires: beecrypt-devel >= %{beecrypt_ver} Requires: bzip2-devel %{?with_db:Requires: db-devel >= %{reqdb_ver}} Requires: elfutils-devel +Requires: keyutils-devel Requires: libmagic-devel %{?with_selinux:Requires: libselinux-devel} Requires: popt-devel >= %{reqpopt_ver} @@ -378,6 +389,7 @@ Requires: beecrypt-static >= %{beecrypt_ver} Requires: bzip2-static %{?with_db:Requires: db-static >= %{reqdb_ver}} Requires: elfutils-static +Requires: keyutils-static Requires: libmagic-static Requires: popt-static >= %{reqpopt_ver} Requires: zlib-static @@ -411,6 +423,10 @@ Summary(pl.UTF-8): Dodatkowe narzędzia do zarządzania bazą RPM-a i pakietami Group: Applications/File Requires: %{name} = %{version}-%{release} Requires: popt >= %{reqpopt_ver} +%if %{with suggest_tags} +Suggests: bzip2 +Suggests: gzip +%endif Conflicts: filesystem-debuginfo < 3.0-16 %description utils @@ -487,7 +503,6 @@ Requires: gcc Requires: glibc-devel Requires: grep Requires: gzip -Requires: lzma Requires: make Requires: patch Requires: sed @@ -567,6 +582,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 @@ -623,58 +639,76 @@ RPM (RPM Package Manager). Esse pacote deve ser instalado se você quiser desenvolver programas em Python para manipular pacotes e bancos de dados RPM. -%prep -%setup -q +%package apidocs +Summary: RPM API documentation and guides +Summary(pl.UTF-8): Documentacja API RPM-a i przewodniki +Group: Documentation + +%description apidocs +Documentation for RPM API and guides in HTML format generated from rpm +sources by doxygen. -# APPLIED ALREADY? translationproject.org is used now -#%%patch0 -p1 +%description apidocs -l pl.UTF-8 +Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze +źrodeł RPM-a przez doxygen. + +%prep +%setup -q -n %{name}-%{version}%{?subver} -a100 +#patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch10 -p1 %{?with_system_lua:%patch11 -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 -%patch23 -p1 %ifarch i386 i486 # disable TSC %patch26 -p1 %endif %patch27 -p1 -%patch32 -p1 %patch34 -p1 %patch35 -p0 %patch36 -p1 %patch37 -p1 +%patch41 -p1 %patch42 -p1 -%patch46 -p1 %patch47 -p1 -# OLD COMMENTED OUT -#%%patch52 -p1 -- morearchs (rpmrc patch) adds ppc7400, ppc7400 %patch55 -p1 -%patch58 -p1 %patch59 -p1 +# Maybe, at last we can remove this? +#patch19 -p1 +%patch60 -p1 %ifarch sparc64 %patch61 -p1 %endif +%patch62 -p1 +%patch70 -p1 +%patch72 -p1 -b .wiget +%patch73 -p1 +%patch74 -p1 +%patch75 -p1 +%patch76 -p1 +%patch77 -p1 +%patch78 -p1 +%patch79 -p1 +%patch80 -p1 +%patch81 -p1 +%patch82 -p1 +%patch83 -p1 +%patch84 -p1 +%patch85 -p1 + +cp -p %{SOURCE2} macros/pld.in cd scripts mv -f perl.req perl.req.in @@ -684,34 +718,24 @@ cd .. # 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} +#%{__autopoint} %{__aclocal} %{__autoheader} %{__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 - -%{?with_system_lua:CPPFLAGS=-I/usr/include/lua51} +%{?with_system_lua:CPPFLAGS="-I/usr/include/lua51 %{rpmcppflags}"} # pass CC and CXX too in case of building with some older configure macro %configure \ CC="%{__newcc}" \ 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} \ %{?with_python:--with-python=%{py_ver} --with-python-lib-dir=%{py_sitedir}} \ %{!?with_python:--without-python} \ --with%{!?with_selinux:out}-selinux \ @@ -719,27 +743,34 @@ awk -f %{SOURCE6} %{SOURCE1} --with-zlib=external \ --with-bzip2=external \ --with-beecrypt=external \ + --with-lzma=external \ + --with-xz=external \ --with-neon=%{?with_neon:external}%{!?with_neon:no} \ --with-file=external \ --with-popt=external \ --with-db=%{?with_db:external}%{!?with_db:no} \ - --with-sqlite=%{?with_sqlite:external}%{!?with_sqlite: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=no \ + --with-pcre=external \ --with-keyutils=none \ --without-path-versioned \ - --with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/macros.pld:%{_rpmlibdir}/macros.build:%{_rpmlibdir}/%%{_target}/macros:%{_sysconfdir}/macros.*:%{_sysconfdir}/macros:%{_sysconfdir}/%%{_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.build:%{_rpmlibdir}/macros.d/pld:~/etc/rpmmacros:~/etc/.rpmmacros:~/.rpmmacros' \ + --with-bugreport="http://bugs.pld-linux.org/" \ + --with-vendor=pld -%{__make} \ +%{__make} -j1 \ CC="%{__cc}" \ CXX="%{__cxx}" \ CPP="%{__cpp}" +%{?with_apidocs:%{__make} apidocs} + %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/bin,/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm,/var/lib/banner,/var/cache/hrmib} +install -d $RPM_BUILD_ROOT{/bin,/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm,/var/lib/banner,/var/cache/hrmib,/etc/pki/rpm-gpg} + +install %{SOURCE19} $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/PLD-3.0-Th-GPG-key.asc %{__make} install \ pkgconfigdir=%{_pkgconfigdir} \ @@ -747,115 +778,112 @@ install -d $RPM_BUILD_ROOT{/bin,/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm,/var/ # 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 # first platform file entry can't contain regexps -echo "%{_target_cpu}-%{_target_vendor}-linux" > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +%{_target_cpu}-%{_target_vendor}-linux # x86_64 things %ifarch x86_64 -echo "amd64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform -echo "x86_64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +x86_64-[^-]*-[Ll]inux(-gnu)? +amd64-[^-]*-[Ll]inux(-gnu)? %endif %ifarch amd64 -echo "amd64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform -echo "x86_64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +amd64-[^-]*-[Ll]inux(-gnu)? +x86_64-[^-]*-[Ll]inux(-gnu)? %endif %ifarch ia32e -echo "ia32e-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform -echo "x86_64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +ia32e-[^-]*-[Ll]inux(-gnu)? +x86_64-[^-]*-[Ll]inux(-gnu)? %endif # x86 things %ifarch athlon %{x8664} -echo "athlon-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +athlon-[^-]*-[Ll]inux(-gnu)? %endif %ifarch pentium4 athlon %{x8664} -echo "pentium4-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +pentium4-[^-]*-[Ll]inux(-gnu)? %endif %ifarch pentium3 pentium4 athlon %{x8664} -echo "pentium3-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +pentium3-[^-]*-[Ll]inux(-gnu)? %endif %ifarch i686 pentium3 pentium4 athlon %{x8664} -echo "i686-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +i686-[^-]*-[Ll]inux(-gnu)? %endif %ifarch i586 i686 pentium3 pentium4 athlon %{x8664} -echo "i586-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +i586-[^-]*-[Ll]inux(-gnu)? %endif %ifarch i486 i586 i686 pentium3 pentium4 athlon %{x8664} -echo "i486-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +i486-[^-]*-[Ll]inux(-gnu)? %endif %ifarch %{ix86} %{x8664} -echo "i386-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +i386-[^-]*-[Ll]inux(-gnu)? %endif %ifarch alpha -echo "alpha-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +alpha-[^-]*-[Ll]inux(-gnu)? %endif %ifarch ia64 -echo "ia64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +ia64-[^-]*-[Ll]inux(-gnu)? %endif %ifarch ppc64 -echo "powerpc64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform -echo "ppc64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +powerpc64-[^-]*-[Ll]inux(-gnu)? +ppc64-[^-]*-[Ll]inux(-gnu)? %endif %ifarch %{ppc} ppc64 -echo "powerpc-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform -echo "ppc-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +powerpc-[^-]*-[Ll]inux(-gnu)? +ppc-[^-]*-[Ll]inux(-gnu)? %endif %ifarch s390x -echo "s390x-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +s390x-[^-]*-[Ll]inux(-gnu)? %endif %ifarch s390 s390x -echo "s390-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +s390-[^-]*-[Ll]inux(-gnu)? %endif %ifarch sparc64 -echo "sparc64-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform -echo "sparcv8-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform -echo "sparcv9-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +sparc64-[^-]*-[Ll]inux(-gnu)? +sparcv8-[^-]*-[Ll]inux(-gnu)? +sparcv9-[^-]*-[Ll]inux(-gnu)? %endif %ifarch sparcv9 -echo "sparcv8-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform -echo "sparcv9-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +sparcv8-[^-]*-[Ll]inux(-gnu)? +sparcv9-[^-]*-[Ll]inux(-gnu)? %endif %ifarch sparc sparcv9 sparc64 -echo "sparc-[^-]*-linux(-gnu)?" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform +sparc-[^-]*-[Ll]inux(-gnu)? %endif # noarch -echo "noarch-[^-]*-.*" >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform - -%ifarch %{ppc} -#sed -e '/_target_platform/s/[%]{_target_cpu}/ppc/' \ -# -i $RPM_BUILD_ROOT%{_rpmlibdir}/ppc74[05]0-linux/macros -%endif +noarch-[^-]*-.* +EOF rm $RPM_BUILD_ROOT%{_rpmlibdir}/vpkg-provides* rm $RPM_BUILD_ROOT%{_rpmlibdir}/find-{prov,req}.pl @@ -865,22 +893,16 @@ 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 @@ -888,6 +910,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 @@ -895,99 +925,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 -# unpackaged in 4.4.9, reasons unknown -rm $RPM_BUILD_ROOT%{_rpmlibdir}/symclash.{sh,py} +%{__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 @@ -1059,20 +987,17 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %defattr(644,root,root,755) %doc CHANGES CREDITS README pubkeys/JBJ-GPG-KEY manual/* +%dir %{_sysconfdir}/pki/rpm-gpg +%{_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 -%dir %{_sysconfdir}/rpm %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rpm/macros %dir %{_sysconfdir}/rpm/sysinfo # these are ok to be replaced %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* @@ -1082,6 +1007,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 @@ -1090,22 +1018,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 @@ -1115,6 +1046,8 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %attr(755,root,root) /%{_lib}/librpmdb-%{sover}.so %attr(755,root,root) /%{_lib}/librpmio-%{sover}.so %attr(755,root,root) /%{_lib}/librpmbuild-%{sover}.so +%attr(755,root,root) /%{_lib}/librpmmisc-%{sover}.so +%attr(755,root,root) /%{_lib}/librpmconstant-%{sover}.so %files devel %defattr(644,root,root,755) @@ -1132,6 +1065,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 @@ -1140,19 +1074,28 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %files utils %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/rpmconstant %attr(755,root,root) %{_bindir}/rpm2cpio -%attr(755,root,root) %{_rpmlibdir}/rpmcache -%attr(755,root,root) %{_rpmlibdir}/rpmcmp -%attr(755,root,root) %{_rpmlibdir}/rpmdeps -%attr(755,root,root) %{_rpmlibdir}/debugedit -%attr(755,root,root) %{_rpmlibdir}/rpmdigest +%attr(755,root,root) %{_bindir}/rpmconstant %attr(755,root,root) %{_rpmlibdir}/find-debuginfo.sh -%attr(755,root,root) %{_rpmlibdir}/tgpg %attr(755,root,root) %{_rpmlibdir}/rpmdb_loadcvt +%attr(755,root,root) %{_rpmlibdir}/tgpg +%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/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 +%attr(755,root,root) %{_rpmlibdir}/bin/rpmdeps +%attr(755,root,root) %{_rpmlibdir}/bin/rpmdigest +%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* @@ -1177,21 +1120,26 @@ 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 %attr(755,root,root) %{_rpmlibdir}/install-build-tree -%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 +%attr(755,root,root) %{_rpmlibdir}/mimetypedeps.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 +%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}/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} %{_rpmlibdir}/i?86* @@ -1218,22 +1166,40 @@ 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}/http.req +%attr(755,root,root) %{_rpmlibdir}/mono* + +# 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 +%dir %{_rpmlibdir}/helpers +%attr(755,root,root) %{_rpmlibdir}/helpers/makeshlibs + %{_mandir}/man1/gendiff.1* %{_mandir}/man8/rpmbuild.8* %lang(ja) %{_mandir}/ja/man8/rpmbuild.8* @@ -1249,16 +1215,12 @@ 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 +%attr(755,root,root) %{_rpmlibdir}/osgideps.pl +%attr(755,root,root) %{_rpmlibdir}/perldeps.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 @@ -1273,3 +1235,9 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %attr(755,root,root) %{py_sitedir}/rpm/*.so %{py_sitedir}/rpm/*.py[co] %endif + +%if %{with apidocs} +%files apidocs +%defattr(644,root,root,755) +%doc apidocs +%endif