X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=0ba234f9368b9f927686c04a9c850c46262c3559;hb=9316bfb9ee5924edddf48d3a64b6832faf08d79d;hp=dc7d79af8b4e015ef17908af9244fb255cc3c9df;hpb=84075475222d896bc30bf83aaa7caeee19bedaea;p=packages%2Frpm.git

diff --git a/rpm.spec b/rpm.spec
index dc7d79a..0ba234f 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -16,7 +16,7 @@
 #
 # Conditional build:
 %bcond_with	static		# build static rpm+rpmi
-%bcond_without	apidocs		# don't generate documentation with doxygen
+%bcond_with	apidocs		# don't generate documentation with doxygen
 %bcond_with	internal_db	# internal db (db 4.5.20)
 %bcond_with	autoreqdep	# autogenerate package name deps in addition to sonames/perl(X)
 %bcond_without	nptl		# internal db: don't use process-shared POSIX mutexes (NPTL provides full interface)
@@ -25,17 +25,10 @@
 %bcond_without	system_libmagic	# don't use system libmagic
 %bcond_without	suggest_tags	# build without Suggest tag (bootstrapping)
 %bcond_with	neon		# build with HTTP/WebDAV support (neon library). NOTE: neon libs are in /usr!
-# force_cc		- force using __cc other than "%{_target_cpu}-tld-linux-gcc"
-# force_cxx		- force using __cxx other than "%{_target_cpu}-tld-linux-g++"
-# force_cpp		- force using __cpp other than "%{_target_cpu}-tld-linux-gcc -E"
-
-#%%define	force_cc "%{_target_cpu}-tld-linux-gcc"
-#%%define	force_cxx "%{_target_cpu}-tld-linux-g++"
-#%%define	force_cpp '%{_target_cpu}-tld-linux-gcc -E'
 
 # versions of required libraries
-%define	reqdb_pkg	db4.5
-%define	reqdb_ver	4.5.20
+%define	reqdb_pkg	db4.7
+%define	reqdb_ver	4.7.25
 %define	reqpopt_ver	1.10.8
 %define	beecrypt_ver	2:4.1.2-4
 %define	sover		4.5
@@ -49,7 +42,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.5
-Release:	62
+Release:	80.1
 License:	LGPL
 Group:		Base
 Source0:	%{name}-%{version}.tar.gz
@@ -75,8 +68,6 @@ Source19:	%{name}-macros.gstreamer
 Source20:	macros.php
 Source21:	%{name}-php-requires.php
 Patch1000:	%{name}-new-debuginfo.patch
-#Patch1067:	%{name}-disable-features.patch
-#Patch1070:	%{name}-rpmrc-ac.patch
 #Patch0:	%{name}-pl.po.patch
 Patch1:		%{name}-rpmrc.patch
 Patch2:		%{name}-arch.patch
@@ -175,12 +166,16 @@ Patch105:	%{name}-am.patch
 Patch106:	%{name}-automake_1.12.patch
 Patch107:	%{name}-debugedit-dwarf4.patch
 Patch108:	%{name}-changelog_order_check_nonfatal.patch
+Patch109:	%{name}-installplatform.patch
+Patch110:	%{name}-xz.patch
+Patch111:	%{name}-shrink.patch
+Patch112:	notrans.patch
 URL:		http://rpm5.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake >= 1.4
 BuildRequires:	beecrypt-devel >= %{beecrypt_ver}
 BuildRequires:	bzip2-devel >= 1.0.2-17
-%{!?with_internal_db:BuildRequires:	db-devel >= %{reqdb_ver}}
+%{!?with_internal_db:BuildRequires:	%{reqdb_pkg}-devel >= %{reqdb_ver}}
 BuildRequires:	elfutils-devel >= 0.108
 BuildRequires:	gettext-devel >= 0.11.4-2
 BuildRequires:	keyutils-devel
@@ -218,6 +213,7 @@ BuildRequires:	elfutils-static
 BuildRequires:	glibc-static >= 2.2.94
 %{?with_system_libmagic:BuildRequires:	libmagic-static}
 %{?with_selinux:BuildRequires:	libselinux-static >= 1.18}
+BuildRequires:	ossp-uuid-static >= 1.6.2-8
 BuildRequires:	popt-static >= %{reqpopt_ver}
 BuildRequires:	zlib-static >= 1.2.3.3
 %endif
@@ -252,10 +248,6 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		specflags	-fno-strict-aliasing
 
-#%%define		_host_alias            %{_target_cpu}-tld-linux%{nil}
-#%%define		_host_vendor           tld
-#%%define		_vendor                tld
-
 %description
 RPM is a powerful package manager, which can be used to build,
 install, query, verify, update, and uninstall individual software
@@ -521,7 +513,7 @@ Summary(ru.UTF-8):	Скрипты и утилиты, необходимые дл
 Summary(uk.UTF-8):	Скрипти та утиліти, необхідні для побудови пакетів
 Group:		Applications/File
 Requires(pretrans):	findutils
-Requires:	%{name}-build-macros >= 1.636
+Requires:	%{name}-build-macros >= 1.656
 Requires:	%{name}-utils = %{version}-%{release}
 Requires:	/bin/id
 Requires:	awk
@@ -533,8 +525,8 @@ Requires:	elfutils
 Requires:	file >= 4.17
 Requires:	fileutils
 Requires:	findutils
-# rpmrc patch adds flags specific to gcc >= 3.4
-Requires:	gcc >= 5:3.4
+# rpmrc patch adds flags specific to gcc >= 4.7
+Requires:	gcc >= 6:4.7.0
 Requires:	glibc-devel
 Requires:	grep
 Requires:	gzip
@@ -689,10 +681,11 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 
 %prep
 %setup -q
+cp -p %{SOURCE15} .
 %patch1000 -p1
 #%patch0 -p1
-%patch1 -p1
 %patch2 -p1
+%patch1 -p1
 %patch3 -p1
 %patch4 -p1
 %patch6 -p1
@@ -795,6 +788,10 @@ install %{SOURCE13} scripts/perl.prov
 %patch106 -p1
 %patch107 -p1
 %patch108 -p1
+%patch109 -p1
+%patch110 -p1
+%patch111 -p1
+%patch112 -p1
 
 mv -f po/{sr,sr@Latn}.po
 rm -rf sqlite zlib popt
@@ -1023,7 +1020,7 @@ install -p scripts/php.{prov,req}	$RPM_BUILD_ROOT%{_rpmlibdir}
 cp -p %{SOURCE21} $RPM_BUILD_ROOT%{_rpmlibdir}/php.req.php
 install -p %{SOURCE5} $RPM_BUILD_ROOT%{_rpmlibdir}/hrmib-cache
 install -p %{SOURCE18} $RPM_BUILD_ROOT%{_bindir}/banner.sh
-cp -a %{SOURCE15} $RPM_BUILD_ROOT/etc/sysconfig/rpm
+cp -p %{name}.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/rpm
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo
 touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Conflictname
@@ -1178,7 +1175,7 @@ rm -f $RPM_BUILD_ROOT%{py_sitedir}/rpm/*.{la,a,py}
 %{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
 %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/RPM.pm
 %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/RPM/.packlist
-%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/RPM/RPM.bs
+%{__rm} -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/RPM/RPM.bs
 %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/RPM/RPM.so
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man3/RPM.3pm
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/{,ja,pl}/man8/rpm{cache,graph}.8