X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=02dfc7577f9f043cb3cd8d807cadda76049c3652;hb=1ab4add4313976fd250d47b024ff7bfcc9c43ddc;hp=16f360382494b6894363192ae3c7fd515283deba;hpb=6fce50075952edfa510790ca6be81e6d3fb9e214;p=packages%2Frpm.git

diff --git a/rpm.spec b/rpm.spec
index 16f3603..02dfc75 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -26,19 +26,19 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.16.0
-Release:	0.4
+Release:	0.10
 Epoch:		1
 License:	GPL v2 / LGPL v2.1
 Group:		Base
 Source0:	http://ftp.rpm.org/releases/rpm-4.16.x/%{name}-%{version}.tar.bz2
 # Source0-md5:	434e166a812e35ef181f6dd176326920
+Source1:	ftp://ftp.pld-linux.org/dists/th/TLD-Linux.asc
 Source2:	macros.local
 Source3:	macros.lang
 Source4:	%{name}.sysconfig
 Source5:	%{name}.groups
 Source6:	%{name}-groups-po.awk
 Source7:	%{name}-install-tree
-Source8:	%{name}-hrmib-cache
 Source9:	%{name}-user_group.sh
 # http://svn.pld-linux.org/banner.sh/
 Source10:	banner.sh
@@ -67,11 +67,18 @@ Patch14:	%{name}-ignore-missing-macro-files.patch
 Patch15:	x32.patch
 Patch16:	rpm5-db-compat.patch
 Patch17:	python-internal-build.patch
-Patch18:	rpmversion.patch
+Patch18:	missing-macros.patch
 Patch19:	pkgconfig.patch
 Patch20:	uname-deps.patch
 Patch21:	aarch64.patch
 Patch22:	ix86-platforms.patch
+Patch23:	shortcircuited-deps.patch
+Patch24:	cpuinfo-deps.patch
+Patch25:	rpmio-read-proc-files.patch
+Patch26:	allow-at-in-ver-rel.patch
+Patch27:	no-exeonly-for-elf-reqprov.patch
+Patch28:	default-patch-flags.patch
+Patch100:	build-id-links.patch
 URL:		https://rpm.org/
 BuildRequires:	acl-devel
 BuildRequires:	db-devel >= %{db_ver}
@@ -560,6 +567,13 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch100 -p1
 
 install %{SOURCE15} scripts/perl.prov.in
 
@@ -598,6 +612,7 @@ sed -i \
 	--disable-silent-rules \
 	--enable-shared \
 	--enable-bdb \
+	--enable-bdb-ro \
 	--enable-ndb \
 	--enable-sqlite \
 	--enable-zstd \
@@ -633,7 +648,9 @@ cd python
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/bin,/%{_lib},/etc/sysconfig,%{_sysconfdir}/{rpm,pki/rpm-gpg}} \
-	$RPM_BUILD_ROOT{/var/lib/{banner,rpm},/var/cache/hrmib}
+	$RPM_BUILD_ROOT/var/lib/{banner,rpm}
+
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/TLD-Linux.asc
 
 %{__make} install \
 	pkgconfigdir=%{_pkgconfigdir} \
@@ -672,8 +689,11 @@ rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/ppc*series-linux/macros
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/aarch64-linux/macros
 %endif
 
-rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/alpha*-linux/macros
+%ifnarch %{arm}
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/arm*-linux/macros
+%endif
+
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/alpha*-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/riscv64-linux/macros
@@ -695,7 +715,6 @@ install -d $RPM_BUILD_ROOT%{_rpmlibdir}/tld
 
 cp -p %{SOURCE7} $RPM_BUILD_ROOT%{_rpmlibdir}/install-build-tree
 cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_rpmlibdir}/user_group.sh
-cp -p %{SOURCE8} $RPM_BUILD_ROOT%{_rpmlibdir}/hrmib-cache
 cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/rpm
 
 cp -p %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/banner.sh
@@ -759,9 +778,6 @@ if [ -e /var/lib/rpm/Packages ] && \
 	%{_rpmlibdir}/dbupgrade.sh
 fi
 
-%triggerpostun -- %{name} < 4.4.9-44
-%{_rpmlibdir}/hrmib-cache
-
 %post	lib -p /sbin/ldconfig
 %postun lib -p /sbin/ldconfig
 
@@ -772,6 +788,9 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %defattr(644,root,root,755)
 %doc ChangeLog CREDITS README
 
+%dir /etc/pki/rpm-gpg
+/etc/pki/rpm-gpg/TLD-Linux.asc
+
 %attr(755,root,root) /bin/rpm
 %attr(755,root,root) %{_bindir}/rpmdb
 %attr(755,root,root) %{_bindir}/rpmkeys
@@ -797,10 +816,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 
 %dir /var/lib/rpm
 
-# exported package NVRA (stamped with install tid)
-# net-snmp hrSWInstalledName queries, bash-completions
-%dir /var/cache/hrmib
-
 %{_rpmlibdir}/rpmpopt*
 %{_rpmlibdir}/rpmrc
 %{_rpmlibdir}/macros
@@ -825,6 +840,9 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %ifarch aarch64
 %{_rpmlibdir}/platform/aarch64*
 %endif
+%ifarch %{arm}
+%{_rpmlibdir}/platform/arm*
+%endif
 %ifarch ia64
 %{_rpmlibdir}/platform/ia64*
 %endif
@@ -840,8 +858,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 
 %dir %{_rpmlibdir}/tld
 
-%attr(755,root,root) %{_rpmlibdir}/hrmib-cache
-
 %attr(755,root,root) %{_rpmlibdir}/dbupgrade.sh
 %attr(755,root,root) %{_rpmlibdir}/rpmdb_checkversion
 %attr(755,root,root) %{_rpmlibdir}/rpmdb_reset