X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=fd83ca0b92e04aee2b064c8b1b1a53c1daa907ab;hb=c0903074896dc23621a849bf1f42990ebd440206;hp=cd3128a5e3c6071e56ee69861d6aa3cec6ae8fb9;hpb=9b6be9fedd25dcf3877affe8f1babf19d8319f71;p=packages%2Frpm.git

diff --git a/rpm.spec b/rpm.spec
index cd3128a..fd83ca0 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -18,13 +18,13 @@
 # Conditional build:
 %bcond_with	static		# build static rpm+rpmi
 %bcond_without	apidocs		# don't generate documentation with doxygen
-%bcond_with		internal_db		# internal db (db 4.5.20)
+%bcond_with	internal_db	# internal db (db 4.5.20)
 %if "%{pld_release}" == "ac"
 %bcond_without	autoreqdep	# autogenerate package name deps in addition to sonames/perl(X)
-%bcond_with		nptl			# internal db: don't use process-shared POSIX mutexes (NPTL provides full interface)
+%bcond_with	nptl		# internal db: don't use process-shared POSIX mutexes (NPTL provides full interface)
 %else
-%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)
+%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)
 %endif
 %bcond_without	python		# don't build python bindings
 %bcond_without	selinux		# build without selinux support
@@ -57,7 +57,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.5
-Release:	45
+Release:	55
 License:	LGPL
 Group:		Base
 Source0:	%{name}-%{version}.tar.gz
@@ -84,6 +84,7 @@ Source17:	%{name}-java-requires
 # http://svn.pld-linux.org/banner.sh/
 Source18:	banner.sh
 Source19:	%{name}-macros.gstreamer
+Source20:	macros.php
 Patch1000:	%{name}-new-debuginfo.patch
 Patch1067:	%{name}-disable-features.patch
 Patch1070:	%{name}-rpmrc-ac.patch
@@ -181,6 +182,7 @@ Patch100:	%{name}-rpm5-debugedit.patch
 Patch101:	%{name}-builddir-readlink.patch
 Patch102:	pythondeps-speedup.patch
 Patch103:	%{name}-lua-exit-chroot-correctly.patch
+Patch104:	%{name}-glob.patch
 URL:		http://rpm5.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake >= 1.4
@@ -199,7 +201,7 @@ BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	libxml2-devel
 BuildRequires:	neon-devel >= 0.25.5
 %endif
-BuildRequires:	ossp-uuid-devel >= 1.6.2-6
+BuildRequires:	ossp-uuid-devel >= 1.6.2-8
 BuildRequires:	patch >= 2.2
 BuildRequires:	popt-devel >= %{reqpopt_ver}
 %{?with_python:BuildRequires:	python-devel >= 1:2.3}
@@ -371,6 +373,7 @@ Requires:	elfutils-devel
 Requires:	keyutils-devel
 %{?with_system_libmagic:Requires:	libmagic-devel}
 %{?with_selinux:Requires:	libselinux-devel}
+Requires:	ossp-uuid-devel >= 1.6.2-6
 Requires:	popt-devel >= %{reqpopt_ver}
 Requires:	zlib-devel >= 1.2.3.3
 
@@ -551,13 +554,13 @@ Requires:	gcc >= 5:3.4
 Requires:	glibc-devel
 Requires:	grep
 Requires:	gzip
-Requires:	xz
 Requires:	make
 Requires:	patch
 Requires:	sed
 Requires:	sh-utils
 Requires:	tar
 Requires:	textutils
+Requires:	xz
 Provides:	rpmbuild(monoautodeps)
 Provides:	rpmbuild(noauto) = 3
 %ifarch %{x8664}
@@ -723,8 +726,7 @@ sed -e 's/^/@pld@/' %{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	__php_provides	/usr/lib/rpm/php.prov' > macros.php
-echo '%%define	__php_requires	/usr/lib/rpm/php.req' >> macros.php
+cp -p %{SOURCE20} 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 %{SOURCE10} scripts/php.prov
@@ -811,6 +813,7 @@ install %{SOURCE13} scripts/perl.prov
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
+%patch104 -p1
 
 mv -f po/{sr,sr@Latn}.po
 rm -rf sqlite zlib popt
@@ -884,7 +887,7 @@ sed -i \
 
 # pass CC and CXX too in case of building with some older configure macro
 # disable perl-RPM2 build, we have it in separate spec
-CPPFLAGS=-I/usr/include/oosp-uuid
+CPPFLAGS="%{rpmcppflags} -I/usr/include/ossp-uuid"
 %configure \
 	CC="%{__newcc}" \
 	CXX="%{__newcxx}" \