X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.spec;h=d59aa28190824d632d797926a229afa4f9968115;hp=cbe819bdfc3345ebec1673a6bd590eb014fc3ca5;hb=f9d0e5f6d91699719c7d612f62fc2cdc13e6c73d;hpb=40675133962076a573eee7bb6293127a5d81bf2b diff --git a/rpm.spec b/rpm.spec index cbe819b..d59aa28 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,27 +1,15 @@ # # TODO: -# - make key infrastructure code fallback from keyutils to plain mode in case keyctl -# returns -ENOSYS -# - add macros for some ppc, mipsel, alpha and sparc -# # - 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_without apidocs # don't generate documentation with doxygen -%bcond_without python # don't build python bindings +%bcond_without python2 # don't build python bindings +%bcond_without python3 # don't build python bindings %bcond_without selinux # build without selinux support -%bcond_without suggest_tags # build without Suggest tag (bootstrapping) +%bcond_without recommends_tags # build without Recommends tag (bootstrapping) %bcond_with db61 # use DB 6.1 instead of 5.3 -%bcond_with neon # build with HTTP/WebDAV support (neon library) -%bcond_with sqlite # build with SQLite support -%bcond_without system_pcre # use system pcre -%bcond_with keyutils # build with keyutils support - -%if %{with sqlite} -# Error: /lib64/librpmio-5.4.so: undefined symbol: sqlite3_enable_load_extension -%define sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo ERROR) -%endif # versions of required libraries %if %{with db61} @@ -83,44 +71,37 @@ 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 -Patch4: %{name}-perl-macros.patch -Patch5: %{name}-perl-req-perlfile.patch -Patch6: %{name}-scripts-closefds.patch -Patch7: %{name}-php-macros.patch -Patch9: %{name}-lua.patch -Patch14: %{name}-perl_req-INC_dirs.patch -Patch15: %{name}-debuginfo.patch -Patch16: vendor-pld.patch -Patch18: %{name}-javadeps.patch -Patch20: %{name}-libtool-deps.patch -Patch29: %{name}-builddir-readlink.patch -Patch30: %{name}-changelog_order_check_nonfatal.patch -Patch35: %{name}-namespace-compare.patch -Patch37: %{name}-postun-nofail.patch -Patch61: %{name}-clean-docdir.patch -Patch64: %{name}-fix-compress-doc.patch -Patch81: %{name}-perl-magic.patch -Patch83: %{name}-ignore-missing-macro-files.patch -Patch84: x32.patch - -URL: http://rpm5.org/ +Patch0: %{name}-man_pl.patch +Patch1: %{name}-popt-aliases.patch +Patch2: %{name}-perl-macros.patch +Patch3: %{name}-perl-req-perlfile.patch +Patch4: %{name}-scripts-closefds.patch +Patch5: %{name}-php-macros.patch +Patch6: %{name}-lua.patch +Patch7: %{name}-perl_req-INC_dirs.patch +Patch8: %{name}-debuginfo.patch +Patch9: %{name}-javadeps.patch +Patch10: %{name}-libtool-deps.patch +Patch11: %{name}-builddir-readlink.patch +Patch12: %{name}-changelog_order_check_nonfatal.patch +Patch13: %{name}-postun-nofail.patch +Patch14: %{name}-clean-docdir.patch +Patch15: %{name}-perl-magic.patch +Patch16: %{name}-ignore-missing-macro-files.patch +Patch17: x32.patch +Patch18: %{name}-fix-compress-doc.patch +Patch19: vendor-pld.patch +URL: https://rpm.org/ BuildRequires: %{reqdb_pkg}-devel >= %{reqdb_pkgver} -%if %{with sqlite} -BuildRequires: sqlite3-devel -%else BuildRequires: %{reqdb_pkg}-sql-devel >= %{reqdb_pkgver} -%endif BuildRequires: autoconf >= 2.63 BuildRequires: automake >= 1.4 -BuildRequires: openssl-devel >= %{openssl_ver} BuildRequires: bzip2-devel >= 1.0.2-17 BuildRequires: elfutils-devel >= 0.108 BuildRequires: gettext-tools >= 0.19.2 -%{?with_keyutils:BuildRequires: keyutils-devel} +BuildRequires: libarchive-devel BuildRequires: libmagic-devel +BuildRequires: openssl-devel >= %{openssl_ver} %if %{with selinux} BuildRequires: libselinux-devel >= 2.1.0 BuildRequires: libsemanage-devel >= 2.1.0 @@ -129,20 +110,20 @@ BuildRequires: libsepol-devel >= 2.1.0 # needed only for AM_PROG_CXX used for CXX substitution in rpm.macros BuildRequires: libstdc++-devel BuildRequires: libtool >= 1:1.4.2-9 -%if %{with neon} -BuildRequires: libxml2-devel -BuildRequires: neon-devel >= 0.25.5 -%endif BuildRequires: lua53-devel >= 5.3.5 BuildRequires: ossp-uuid-devel BuildRequires: patch >= 2.2 BuildRequires: popt-devel >= %{reqpopt_ver} -%{?with_python:BuildRequires: python-devel >= 1:2.3} +%{?with_python2:BuildRequires: python-devel >= 1:2.3} +%{?with_python3:BuildRequires: python3-devel} BuildRequires: python-modules >= 1:2.3 -%{?with_python:BuildRequires: rpm-pythonprov} +%if %{with python2} || %{with python3} +BuildRequires: rpm-pythonprov +%endif BuildRequires: tcl BuildRequires: xz-devel BuildRequires: zlib-devel +BuildRequires: zstd-devel %if %{with apidocs} BuildRequires: doxygen BuildRequires: ghostscript @@ -152,11 +133,11 @@ BuildRequires: tetex-pdftex %if %{with static} # Require static library only for static build BuildRequires: %{reqdb_pkg}-static >= %{reqdb_pkgver} -BuildRequires: openssl-static >= %{openssl_ver} BuildRequires: bzip2-static >= 1.0.2-17 BuildRequires: elfutils-static BuildRequires: glibc-static >= 2.2.94 BuildRequires: libmagic-static +BuildRequires: openssl-static >= %{openssl_ver} %if %{with selinux} BuildRequires: libselinux-static >= 2.1.0 BuildRequires: libsemanage-static >= 2.1.0 @@ -164,15 +145,17 @@ BuildRequires: libsepol-static >= 2.1.0 %endif BuildRequires: popt-static >= %{reqpopt_ver} BuildRequires: zlib-static +BuildRequires: zstd-static %endif Requires(posttrans): coreutils -Requires: FHS >= 3.0-2 Requires: %{name}-base = %{version}-%{release} Requires: %{name}-lib = %{version}-%{release} +Requires: FHS >= 3.0-2 Requires: openssl >= %{openssl_ver} Requires: popt >= %{reqpopt_ver} Provides: rpm-db-ver = %{reqdb_ver} Obsoletes: rpm-getdeps +Obsoletes: rpm-utils-perl %{!?with_static:Obsoletes: rpm-utils-static} Conflicts: glibc < 2.2.92 # db4.6 poldek needed @@ -185,9 +168,8 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _binary_payload w9.gzdio # don't require very fresh rpm.macros to build -%define __gettextize gettextize --copy --force --intl ; 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 ix86 i386 i486 i586 i686 athlon geode pentium3 pentium4 %define ppc ppc ppc7400 ppc7450 %define x8664 amd64 ia32e x86_64 @@ -269,14 +251,10 @@ Summary: RPMs library Summary(pl.UTF-8): Biblioteki RPM-a Group: Libraries Requires: %{reqdb_pkg} >= %{reqdb_pkgver} -%if %{with sqlite} -Requires: sqlite3 >= %{sqlite_build_version} -%else Requires: %{reqdb_pkg}-sql >= %{reqdb_pkgver} -%endif -Requires: openssl >= %{openssl_ver} Requires: libmagic >= 1.15-2 %{?with_selinux:Requires: libselinux >= 2.1.0} +Requires: openssl >= %{openssl_ver} Requires: popt >= %{reqpopt_ver} Obsoletes: rpm-libs # avoid SEGV caused by mixed db versions @@ -299,11 +277,10 @@ Summary(uk.UTF-8): Хедери та бібліотеки для програм, Group: Development/Libraries Requires: %{name}-lib = %{version}-%{release} Requires: %{reqdb_pkg}-devel >= %{reqdb_pkgver} -Requires: openssl-devel >= %{openssl_ver} Requires: bzip2-devel Requires: elfutils-devel -%{?with_keyutils:Requires: keyutils-devel} Requires: libmagic-devel +Requires: openssl-devel >= %{openssl_ver} %if %{with selinux} Requires: libselinux-devel Requires: libsemanage-devel @@ -367,11 +344,10 @@ Summary(uk.UTF-8): Статична бібліотека для програм, Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} Requires: %{reqdb_pkg}-static >= %{reqdb_pkgver} -Requires: openssl-static >= %{openssl_ver} Requires: bzip2-static Requires: elfutils-static -%{?with_keyutils:Requires: keyutils-static} Requires: libmagic-static +Requires: openssl-static >= %{openssl_ver} %if %{with selinux} Requires: libselinux-static Requires: libsemanage-static @@ -409,9 +385,9 @@ 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 +%if %{with recommends_tags} +Recommends: bzip2 +Recommends: gzip %endif Conflicts: filesystem-debuginfo < 3.0-16 @@ -571,8 +547,8 @@ 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-setuptools Requires: python-modules +Requires: python-setuptools %description pythonprov Python macros, which simplifies creation of RPM packages with Python @@ -625,7 +601,7 @@ Requires: python Obsoletes: rpm-python %description -n python-rpm -The rpm-python package contains a module which permits applications +The python-rpm package contains a module which permits applications written in the Python programming language to use the interface supplied by RPM (RPM Package Manager) libraries. @@ -633,27 +609,56 @@ This package should be installed if you want to develop Python programs that will manipulate RPM packages and databases. %description -n python-rpm -l pl.UTF-8 -Pakiet rpm-python zawiera moduł, który pozwala aplikacjom napisanym w +Pakiet python-rpm zawiera moduł, który pozwala aplikacjom napisanym w Pythonie na używanie interfejsu dostarczanego przez biblioteki RPM-a. Pakiet ten powinien zostać zainstalowany, jeśli chcesz pisać w Pythonie programy manipulujące pakietami i bazami danych rpm. %description -n python-rpm -l pt_BR.UTF-8 -O pacote rpm-python contém um módulo que permite que aplicações +O pacote python-rpm contém um módulo que permite que aplicações escritas em Python utilizem a interface fornecida pelas bibliotecas RPM (RPM Package Manager). Esse pacote deve ser instalado se você quiser desenvolver programas em Python para manipular pacotes e bancos de dados RPM. +%package -n python3-rpm +Summary: Python 3 interface to RPM library +Summary(pl.UTF-8): Interfejs Pythona 3 do biblioteki RPM-a +Summary(pt_BR.UTF-8): Módulo Python 3 para aplicativos que manipulam pacotes RPM +Group: Development/Languages/Python +Requires: %{name} = %{version}-%{release} +Requires: python3 + +%description -n python3-rpm +The python3-rpm package contains a module which permits applications +written in the Python 3 programming language to use the interface +supplied by RPM (RPM Package Manager) libraries. + +This package should be installed if you want to develop Python 3 +programs that will manipulate RPM packages and databases. + +%description -n python3-rpm -l pl.UTF-8 +Pakiet python3-rpm zawiera moduł, który pozwala aplikacjom napisanym w +Pythonie 3 na używanie interfejsu dostarczanego przez biblioteki RPM-a. + +Pakiet ten powinien zostać zainstalowany, jeśli chcesz pisać w +Pythonie 3 programy manipulujące pakietami i bazami danych rpm. + +%description -n python3-rpm -l pt_BR.UTF-8 +O pacote python3-rpm contém um módulo que permite que aplicações +escritas em Python 3 utilizem a interface fornecida pelas bibliotecas +RPM (RPM Package Manager). + +Esse pacote deve ser instalado se você quiser desenvolver programas em +Python 3 para manipular pacotes e bancos de dados RPM. + %package apidocs 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 @@ -665,33 +670,30 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze %prep %setup -q -n %{name}-%{version}%{?subver} - -#patch0 -p1 +%patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 -#%patch7 -p1 +%patch7 -p0 +%patch8 -p1 %patch9 -p1 -%patch14 -p0 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 %patch15 -p1 -#%patch16 -p1 +%patch16 -p1 +%patch17 -p1 #%patch18 -p1 -%patch20 -p1 -%patch29 -p1 -%patch30 -p1 -#%patch35 -p1 -%patch37 -p1 -%patch61 -p1 -#%patch64 -p1 -%patch81 -p1 -%patch83 -p1 -#%patch84 -p1 +#%patch19 -p1 install %{SOURCE2} pld.in -#install %{SOURCE8} scripts/php.prov.in -#install %{SOURCE9} scripts/php.req.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 @@ -704,15 +706,10 @@ awk -f %{SOURCE6} %{SOURCE1} install %{SOURCE26} tools/rpmdb_checkversion.c install %{SOURCE28} tools/rpmdb_reset.c -for extlib in openssl neon %{?with_system_pcre:pcre} popt; do - [ -d $extlib ] && %{__rm} -r $extlib -done - %{__sed} -i -e '1s,/usr/bin/python,%{__python},' scripts/pythondistdeps.py %build %{__libtoolize} -#%{__autopoint} %{__aclocal} %{__autoheader} %{__autoconf} @@ -730,35 +727,28 @@ CPPFLAGS="-I/usr/include/lua53 %{rpmcppflags}" WITH_PERL_VERSION=no \ __GST_INSPECT=%{_bindir}/gst-inspect-1.0 \ __GPG=%{_bindir}/gpg \ + %{?with_python3:PYTHON=python3} \ + %{!?with_python3:%{?with_python2:PYTHON=python2}} \ --disable-silent-rules \ --enable-shared \ --enable-static \ - %{!?with_apidocs:--without-apidocs} \ + --enable-bdb \ + --enable-zstd \ --with-crypto=openssl \ - --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-lzma=external \ - --with-neon=%{?with_neon:external}%{!?with_neon:no} \ - --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_python:--with-python=%{py_ver} --with-python-lib-dir=%{py_sitedir}} \ - %{!?with_python:--without-python} \ + --with-cap \ + --with-acl \ + --with-audit \ + --with-archive \ +%if %{with python2} || %{with python3} + --enable-python \ +%endif --with-selinux=%{!?with_selinux:no}%{?with_selinux:yes} \ - --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-uuid=%{_libdir}:%{_includedir}/ossp-uuid \ - --with-vendor=pld \ - --with-xz=external \ - --with-zlib=external + --with-vendor=pld + +# --enable-ndb (EXPERIMENTAL) enable the new rpm database format +# --enable-lmdb=[yes/no/auto] (EXPERIMENTAL) build with LMDB rpm database format support (default=auto) +# --with-imaevm build with imaevm support %{__make} @@ -776,20 +766,32 @@ if tools/rpmdb_reset -V 2>&1 | grep "t match library version"; then exit 1 fi +%if %{with python2} +cd python +%py_build +cd .. +%endif + +%if %{with python3} +cd python +%py3_build +%endif + %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/bin,/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm} \ - $RPM_BUILD_ROOT{/var/lib/banner,/var/cache/hrmib,/etc/pki/rpm-gpg} +install -d $RPM_BUILD_ROOT{/bin,/%{_lib},/etc/sysconfig,%{_sysconfdir}/{rpm,pki/rpm-gpg}} \ + $RPM_BUILD_ROOT{/var/lib/banner,/var/cache/hrmib} -install %{SOURCE16} $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/PLD-3.0-Th-GPG-key.asc +cp -p %{SOURCE16} $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/PLD-3.0-Th-GPG-key.asc -%{__make} -j1 install \ +%{__make} install \ pkgconfigdir=%{_pkgconfigdir} \ DESTDIR=$RPM_BUILD_ROOT # cleanup %ifnarch %{ix86} %{x8664} x32 rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/athlon-linux/macros +rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/geode-linux/macros rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/i386-linux/macros rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/i486-linux/macros rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/i586-linux/macros @@ -806,152 +808,60 @@ rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/x86_64-linux/macros %endif %ifnarch %{ppc} +rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/m68k-linux/macros +rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/ppc32dy4-linux/macros +rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/ppc64*-linux/macros +rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/ppc8260-linux/macros +rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/ppc8560-linux/macros rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/ppc-linux/macros +rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/ppc*series-linux/macros %endif +rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/aarch64-linux/macros rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/alpha*-linux/macros rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/arm*-linux/macros rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/ia64-linux/macros rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/mips*-linux/macros -rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/ppc*series-linux/macros -rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/ppc64*-linux/macros +rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/riscv64-linux/macros rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/s390*-linux/macros +rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/sh*-linux/macros rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/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 - -%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 - -%ifarch athlon %{x8664} x32 -athlon-[^-]*-[Ll]inux(-gnu)? -%endif -%ifarch pentium4 athlon %{x8664} x32 -pentium4-[^-]*-[Ll]inux(-gnu)? -%endif -%ifarch pentium3 pentium4 athlon %{x8664} x32 -pentium3-[^-]*-[Ll]inux(-gnu)? -%endif -%ifarch i686 pentium3 pentium4 athlon %{x8664} x32 -i686-[^-]*-[Ll]inux(-gnu)? -%endif -%ifarch i586 i686 pentium3 pentium4 athlon %{x8664} x32 -i586-[^-]*-[Ll]inux(-gnu)? -%endif -%ifarch i486 i586 i686 pentium3 pentium4 athlon %{x8664} x32 -i486-[^-]*-[Ll]inux(-gnu)? -%endif -%ifarch %{ix86} %{x8664} x32 -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)? -sparcv8-[^-]*-[Ll]inux(-gnu)? -sparcv9-[^-]*-[Ll]inux(-gnu)? -%endif -%ifarch sparcv9 -sparcv8-[^-]*-[Ll]inux(-gnu)? -sparcv9-[^-]*-[Ll]inux(-gnu)? -%endif -%ifarch sparc sparcv9 sparc64 -sparc-[^-]*-[Ll]inux(-gnu)? -%endif - -noarch-[^-]*-.* -EOF - -# Squash Extra Blank Lines -%{__sed} -i -e '/./,/^$/!d' $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform - %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/find-lang.sh -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 %{SOURCE12} $RPM_BUILD_ROOT%{_rpmlibdir}/user_group.sh -install %{SOURCE14} $RPM_BUILD_ROOT%{_rpmlibdir}/java-find-requires -#install scripts/php.{prov,req} $RPM_BUILD_ROOT%{_rpmlibdir} +cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/install-build-tree +cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_rpmlibdir}/find-spec-bcond +cp -p %{SOURCE7} $RPM_BUILD_ROOT%{_rpmlibdir}/compress-doc +cp -p %{SOURCE12} $RPM_BUILD_ROOT%{_rpmlibdir}/user_group.sh +cp -p %{SOURCE14} $RPM_BUILD_ROOT%{_rpmlibdir}/java-find-requires +cp -p 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 -install %{SOURCE5} $RPM_BUILD_ROOT%{_rpmlibdir}/hrmib-cache -install %{SOURCE13} $RPM_BUILD_ROOT/etc/sysconfig/rpm +cp -p %{SOURCE17} $RPM_BUILD_ROOT%{_rpmlibdir}/mimetypedeps.sh +cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_rpmlibdir}/hrmib-cache +cp -p %{SOURCE13} $RPM_BUILD_ROOT/etc/sysconfig/rpm -install %{SOURCE15} $RPM_BUILD_ROOT%{_bindir}/banner.sh +cp -p %{SOURCE15} $RPM_BUILD_ROOT%{_bindir}/banner.sh install -d $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo -install %{SOURCE18} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros -install %{SOURCE27} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.lang -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 %{SOURCE24} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreqfiles +cp -p %{SOURCE18} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros +cp -p %{SOURCE27} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.lang +cp -p %{SOURCE19} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautocompressdoc +cp -p %{SOURCE20} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprov +cp -p %{SOURCE21} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprovfiles +cp -p %{SOURCE22} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreq +cp -p %{SOURCE24} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreqfiles touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Conflictname touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Dirnames -install %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Filelinktos +cp -p %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Filelinktos touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Obsoletename touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Providename touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Requirename -install tools/rpmdb_checkversion $RPM_BUILD_ROOT%{_rpmlibdir}/bin -install tools/rpmdb_reset $RPM_BUILD_ROOT%{_rpmlibdir}/bin -#install %{SOURCE29} $RPM_BUILD_ROOT%{_rpmlibdir}/bin/dbupgrade.sh - -# create macro loading wrappers for backward compatibility -for m in gstreamer java mono perl php python; do - echo "%%{load:%{_rpmlibdir}/macros.d/$m}" >$RPM_BUILD_ROOT%{_rpmlibdir}/macros.$m -done +cp -p tools/rpmdb_checkversion $RPM_BUILD_ROOT%{_rpmlibdir}/ +cp -p tools/rpmdb_reset $RPM_BUILD_ROOT%{_rpmlibdir}/ +cp -p %{SOURCE29} $RPM_BUILD_ROOT%{_rpmlibdir}/dbupgrade.sh # move rpm to /bin mv $RPM_BUILD_ROOT%{_bindir}/rpm $RPM_BUILD_ROOT/bin @@ -961,22 +871,30 @@ for a in librpm.so librpmbuild.so librpmio.so librpmsign.so; do ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/${a}.*.*.*) $RPM_BUILD_ROOT%{_libdir}/${a} done -%if %{with python} -%py_ocomp $RPM_BUILD_ROOT%{py_sitedir} -%py_comp $RPM_BUILD_ROOT%{py_sitedir} +%if %{with python2} +# Remove anything that rpm make install might put there +%{__rm} -rf $RPM_BUILD_ROOT%{py_sitedir} +cd python +%py_install +%py_postclean +cd .. +%endif -#%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/rpm/*.{la,a,py} +%if %{with python3} +# Remove anything that rpm make install might put there +%{__rm} -rf $RPM_BUILD_ROOT%{py3_sitedir} +cd python +%py3_install +cd .. %endif +%{__rm} $RPM_BUILD_ROOT%{_libdir}/rpm-plugins/*.la + # wrong location, not used anyway %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/rpm.{daily,log} %find_lang %{name} -%{__rm} -rf manual -cp -a doc/manual manual -%{__rm} -f manual/Makefile* - %clean rm -rf $RPM_BUILD_ROOT @@ -990,7 +908,7 @@ fi %posttrans if [ -e /var/lib/rpm/Packages ] && \ - ! %{_rpmlibdir}/bin/rpmdb_checkversion -h /var/lib/rpm -d /var/lib/rpm; then + ! %{_rpmlibdir}/rpmdb_checkversion -h /var/lib/rpm -d /var/lib/rpm; then if [ ! -e /var/lib/rpm.rpmbackup-%{version}-%{release} ] && \ /bin/cp -a /var/lib/rpm /var/lib/rpm.rpmbackup-%{version}-%{release}; then echo @@ -1001,7 +919,7 @@ if [ -e /var/lib/rpm/Packages ] && \ echo 'If poldek aborts after migration with rpmdb error, this is expected behaviour,' echo 'you should ignore it and restart poldek' echo - %{_rpmlibdir}/bin/dbupgrade.sh + %{_rpmlibdir}/dbupgrade.sh fi %triggerpostun -- %{name} < 4.4.9-44 @@ -1015,7 +933,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %files -f %{name}.lang %defattr(644,root,root,755) -%doc ChangeLog CREDITS README manual/* +%doc ChangeLog CREDITS README %dir /etc/pki/rpm-gpg /etc/pki/rpm-gpg/PLD-3.0-Th-GPG-key.asc @@ -1027,11 +945,11 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %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* +%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* @@ -1051,9 +969,16 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f #%{_rpmlibdir}/macros.d/pld %{_rpmlibdir}/platform/noarch-* %ifarch %{ix86} %{x8664} x32 +%{_rpmlibdir}/platform/athlon* +%{_rpmlibdir}/platform/geode* %{_rpmlibdir}/platform/i?86* %{_rpmlibdir}/platform/pentium* -%{_rpmlibdir}/platform/athlon* +%endif +%ifarch %{x8664} x32 +%{_rpmlibdir}/platform/amd64* +%{_rpmlibdir}/platform/ia32e* +%{_rpmlibdir}/platform/x86_64* +%{_rpmlibdir}/platform/x32* %endif %ifarch alpha %{_rpmlibdir}/platform/alpha* @@ -1070,21 +995,12 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %ifarch sparc sparc64 %{_rpmlibdir}/platform/sparc* %endif -%ifarch %{x8664} x32 -%{_rpmlibdir}/platform/amd64* -%{_rpmlibdir}/platform/ia32e* -%{_rpmlibdir}/platform/x86_64* -#%{_rpmlibdir}/platform/x32* -%endif %attr(755,root,root) %{_rpmlibdir}/hrmib-cache -%dir %{_rpmlibdir}/bin -#%attr(755,root,root) %{_rpmlibdir}/bin/dbconvert -#%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 +%attr(755,root,root) %{_rpmlibdir}/dbupgrade.sh +%attr(755,root,root) %{_rpmlibdir}/rpmdb_checkversion +%attr(755,root,root) %{_rpmlibdir}/rpmdb_reset %files base %defattr(644,root,root,755) @@ -1122,39 +1038,21 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %files utils %defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/rpm2archive %attr(755,root,root) %{_bindir}/rpm2cpio -#%attr(755,root,root) %{_bindir}/rpmconstant +%attr(755,root,root) %{_rpmlibdir}/rpm2cpio.sh %attr(755,root,root) %{_rpmlibdir}/find-debuginfo.sh %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 -%if %{with selinux} -#%attr(755,root,root) %{_rpmlibdir}/bin/semodule -#%attr(755,root,root) %{_rpmlibdir}/bin/spooktool -%endif -%{?with_keyutils:%attr(755,root,root) %{_rpmlibdir}/bin/rpmkey} -#%attr(755,root,root) %{_rpmlibdir}/bin/rpmrepo +%attr(755,root,root) %{_rpmlibdir}/debugedit +%attr(755,root,root) %{_rpmlibdir}/rpmdeps %{_mandir}/man8/rpm2cpio.8* -#%{_mandir}/man8/rpmconstant.8* %{_mandir}/man8/rpmdeps.8* -#%{_mandir}/man8/rpmmtree.8* %lang(ja) %{_mandir}/ja/man8/rpm2cpio.8* +%lang(ko) %{_mandir}/ko/man8/rpm2cpio.8* %lang(pl) %{_mandir}/pl/man8/rpm2cpio.8* -%lang(pl) %{_mandir}/pl/man8/rpmdeps.8* %lang(ru) %{_mandir}/ru/man8/rpm2cpio.8* - -%files utils-perl -%defattr(644,root,root,755) -#%attr(755,root,root) %{_rpmlibdir}/rpmdiff* +%lang(pl) %{_mandir}/pl/man8/rpmdeps.8* %if %{with static} %files utils-static @@ -1169,29 +1067,14 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %attr(755,root,root) %{_rpmlibdir}/brp-* %attr(755,root,root) %{_rpmlibdir}/check-files %attr(755,root,root) %{_rpmlibdir}/compress-doc -#%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}/u_pkg.sh -#%attr(755,root,root) %{_rpmlibdir}/executabledeps.sh +%attr(755,root,root) %{_rpmlibdir}/elfdeps %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}/bin/api-sanity-autotest.pl -#%attr(755,root,root) %{_rpmlibdir}/bin/api-sanity-checker.pl -#%{!?with_sqlite:%attr(755,root,root) %{_rpmlibdir}/bin/dbsql} -#%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 -#%attr(755,root,root) %{_rpmlibdir}/vcheck -# not used yet ... these six depend on perl -#%attr(755,root,root) %{_rpmlibdir}/http.req +%attr(755,root,root) %{_rpmlibdir}/mkinstalldirs # 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 @@ -1211,28 +1094,33 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f #%{_rpmlibdir}/macros.d/selinux #%{_rpmlibdir}/macros.d/tcl #%{_rpmlibdir}/macros.rpmbuild -# compat wrappers -#%{_rpmlibdir}/macros.gstreamer -%{_rpmlibdir}/macros.java -%{_rpmlibdir}/macros.mono -%{_rpmlibdir}/macros.perl -%{_rpmlibdir}/macros.php -%{_rpmlibdir}/macros.python -#%attr(755,root,root) %{_rpmlibdir}/gstreamer.sh -#%attr(755,root,root) %{_rpmlibdir}/kmod-deps.sh +%dir %{_rpmlibdir}/fileattrs +%{_rpmlibdir}/fileattrs/debuginfo.attr +%{_rpmlibdir}/fileattrs/desktop.attr +%{_rpmlibdir}/fileattrs/elf.attr +%{_rpmlibdir}/fileattrs/font.attr +%{_rpmlibdir}/fileattrs/libtool.attr +%{_rpmlibdir}/fileattrs/metainfo.attr +%{_rpmlibdir}/fileattrs/ocaml.attr +%{_rpmlibdir}/fileattrs/perl.attr +%{_rpmlibdir}/fileattrs/perllib.attr +%{_rpmlibdir}/fileattrs/php.attr +%{_rpmlibdir}/fileattrs/pkgconfig.attr +%{_rpmlibdir}/fileattrs/python.attr +%{_rpmlibdir}/fileattrs/pythondist.attr +%{_rpmlibdir}/fileattrs/script.attr %attr(755,root,root) %{_bindir}/gendiff %attr(755,root,root) %{_bindir}/rpmbuild - -#%dir %{_rpmlibdir}/helpers -#%attr(755,root,root) %{_rpmlibdir}/helpers/makeshlibs +%attr(755,root,root) %{_bindir}/rpmspec %{_mandir}/man1/gendiff.1* +%lang(pl) %{_mandir}/pl/man1/gendiff.1* %{_mandir}/man8/rpmbuild.8* %lang(ja) %{_mandir}/ja/man8/rpmbuild.8* -%lang(pl) %{_mandir}/pl/man1/gendiff.1* %lang(pl) %{_mandir}/pl/man8/rpmbuild.8* +%{_mandir}/man8/rpmspec.8* %files javaprov %defattr(644,root,root,755) @@ -1248,30 +1136,84 @@ 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}/osgideps.pl -#%attr(755,root,root) %{_rpmlibdir}/perldeps.pl %files pythonprov %defattr(644,root,root,755) -#%attr(755,root,root) %{_rpmlibdir}/pythoneggs.py %attr(755,root,root) %{_rpmlibdir}/pythondeps.sh +%attr(755,root,root) %{_rpmlibdir}/pythondistdeps.py %files php-pearprov %defattr(644,root,root,755) -#%attr(755,root,root) %{_rpmlibdir}/php.prov -#%attr(755,root,root) %{_rpmlibdir}/php.req +%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} +%if %{with python2} %files -n python-rpm %defattr(644,root,root,755) -#%dir %{py_sitedir}/rpm -#%attr(755,root,root) %{py_sitedir}/rpm/*.so -#%{py_sitedir}/rpm/*.py[co] +%dir %{py_sitedir}/rpm +%attr(755,root,root) %{py_sitedir}/rpm/*.so +%{py_sitedir}/rpm/*.py[co] +%{py_sitedir}/rpm-%{version}-py*.egg-info +%endif + +%if %{with python3} +%files -n python3-rpm +%defattr(644,root,root,755) +%dir %{py3_sitedir}/rpm +%attr(755,root,root) %{py3_sitedir}/rpm/*.so +%{py3_sitedir}/rpm/*.py +%{py3_sitedir}/rpm-%{version}-py*.egg-info +%{py3_sitedir}/rpm/__pycache__ %endif %if %{with apidocs} %files apidocs %defattr(644,root,root,755) -#%doc apidocs +%doc doc/librpm/html/* +%endif + + +%if 0 +%attr(755,root,root) %{_bindir}/rpmdb +%attr(755,root,root) %{_bindir}/rpmgraph +%attr(755,root,root) %{_bindir}/rpmkeys +%attr(755,root,root) %{_bindir}/rpmquery +%attr(755,root,root) %{_bindir}/rpmsign +%attr(755,root,root) %{_bindir}/rpmverify +%attr(755,root,root) %{_rpmlibdir}/check-buildroot +%attr(755,root,root) %{_rpmlibdir}/check-prereqs +%attr(755,root,root) %{_rpmlibdir}/check-rpaths +%attr(755,root,root) %{_rpmlibdir}/check-rpaths-worker +%attr(755,root,root) %{_rpmlibdir}/config.guess +%attr(755,root,root) %{_rpmlibdir}/config.sub +%attr(755,root,root) %{_rpmlibdir}/debuginfo.prov +%attr(755,root,root) %{_rpmlibdir}/desktop-file.prov +%attr(755,root,root) %{_rpmlibdir}/find-provides +%attr(755,root,root) %{_rpmlibdir}/find-requires +%attr(755,root,root) %{_rpmlibdir}/metainfo.prov +%attr(755,root,root) %{_rpmlibdir}/ocaml-find-provides.sh +%attr(755,root,root) %{_rpmlibdir}/ocaml-find-requires.sh +# valgrind suppression file for rpm +%{_rpmlibdir}/rpm.supp +%{_rpmlibdir}/rpmrc +%attr(755,root,root) %{_rpmlibdir}/script.req +%attr(755,root,root) %{_rpmlibdir}/sepdebugcrcfix + + +%attr(755,root,root) %{_libdir}/rpm-plugins/audit.so +%attr(755,root,root) %{_libdir}/rpm-plugins/ima.so +%attr(755,root,root) %{_libdir}/rpm-plugins/prioreset.so +%attr(755,root,root) %{_libdir}/rpm-plugins/selinux.so +%attr(755,root,root) %{_libdir}/rpm-plugins/syslog.so +%attr(755,root,root) %{_libdir}/rpm-plugins/systemd_inhibit.so +%{_mandir}/man8/rpm-plugin-systemd-inhibit.8* + +%{_mandir}/man8/rpm-misc.8* +%{_mandir}/man8/rpmdb.8* +%{_mandir}/man8/rpmkeys.8* +%{_mandir}/man8/rpmsign.8* +%{_mandir}/man8/rpmgraph.8* +%lang(ja) %{_mandir}/ja/man8/rpmgraph.8* +%lang(pl) %{_mandir}/pl/man8/rpmgraph.8* %endif