SPECS: rpm.spec - merged pear macros from AC-branch - macros 1.241

[qboosh]

Author: qboosh                       Date: Fri Oct  7 09:02:34 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged pear macros from AC-branch
- macros 1.241

---- Files affected:
SPECS:
   rpm.spec (1.699 -> 1.700) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.699 SPECS/rpm.spec:1.700
--- SPECS/rpm.spec:1.699	Thu Oct  6 19:25:30 2005
+++ SPECS/rpm.spec	Fri Oct  7 11:02:29 2005
@@ -10,7 +10,7 @@
 %bcond_with	autoreqdep	# autogenerate package name deps in addition to sonames/perl(X)
 %bcond_without	python		# don't build python bindings
 %bcond_without	selinux		# build without selinux support
-%bcond_without	system_libmagic # don't use system libmagic
+%bcond_without	system_libmagic	# don't use system libmagic
 %bcond_with	neon		# build with HTTP/WebDAV support (neon library)
 # force_cc		- force using __cc other than "%{_target_cpu}-pld-linux-gcc"
 # force_cxx		- force using __cxx other than "%{_target_cpu}-pld-linux-g++"
@@ -20,7 +20,7 @@
 %define	reqdb_ver	4.3.27-1
 %define	reqpopt_ver	1.10.2
 %define	beecrypt_ver	2:4.1.2-4
-%define	rpm_macros_rev	1.238
+%define	rpm_macros_rev	1.241
 Summary:	RPM Package Manager
 Summary(de):	RPM Packet-Manager
 Summary(es):	Gestor de paquetes RPM
@@ -55,6 +55,7 @@
 Source32:	pldnotify.awk
 # http://svn.pld-linux.org/banner.sh/
 Source33:	banner.sh
+Source34:	php-pear-build-macros
 Patch0:		%{name}-pl.po.patch
 Patch1:		%{name}-rpmrc.patch
 Patch2:		%{name}-arch.patch
@@ -114,7 +115,7 @@
 BuildRequires:	elfutils-devel >= 0.108
 BuildRequires:	findutils
 BuildRequires:	gettext-devel >= 0.11.4-2
-%{?with_system_libmagic:BuildRequires: libmagic-devel}
+%{?with_system_libmagic:BuildRequires:	libmagic-devel}
 %{?with_selinux:BuildRequires:	libselinux-devel >= 1.18}
 # needed only for AM_PROG_CXX used for CXX substitution in rpm.macros
 BuildRequires:	libstdc++-devel
@@ -138,7 +139,7 @@
 BuildRequires:	db-static >= %{reqdb_ver}
 BuildRequires:	glibc-static >= 2.2.94
 BuildRequires:	elfutils-static
-%{with_system_libmagic:BuildRequires:  libmagic-static}
+%{with_system_libmagic:BuildRequires:	libmagic-static}
 %{?with_selinux:BuildRequires:	libselinux-static >= 1.18}
 BuildRequires:	popt-static >= %{reqpopt_ver}
 BuildRequires:	zlib-static
@@ -223,7 +224,7 @@
 Requires:	beecrypt >= %{beecrypt_ver}
 Requires:	db >= %{reqdb_ver}
 %{?with_selinux:Requires:	libselinux >= 1.18}
-%{?with_system_libmagic:Requires:      libmagic >= 1.15-2}
+%{?with_system_libmagic:Requires:	libmagic >= 1.15-2}
 Requires:	popt >= %{reqpopt_ver}
 Obsoletes:	rpm-libs
 # avoid SEGV caused by mixed db versions
@@ -250,7 +251,7 @@
 Requires:	db-devel >= %{reqdb_ver}
 Requires:	elfutils-devel
 %{?with_selinux:Requires:	libselinux-devel}
-%{?with_system_libmagic:Requires:       libmagic-devel}
+%{?with_system_libmagic:Requires:	libmagic-devel}
 Requires:	popt-devel >= %{reqpopt_ver}
 Requires:	zlib-devel
 
@@ -312,7 +313,7 @@
 Requires:	bzip2-static
 Requires:	db-static >= %{reqdb_ver}
 Requires:	elfutils-static
-%{?with_system_libmagic:Requires:       libmagic-static}
+%{?with_system_libmagic:Requires:	libmagic-static}
 Requires:	popt-static >= %{reqpopt_ver}
 Requires:	zlib-static
 
@@ -528,15 +529,24 @@
 Summary(pl):	Dodatkowe narzędzia do sprawdzania zależności skryptów php w rpm
 Group:		Applications/File
 Requires:	%{name} = %{version}-%{release}
+Requires:	php-pear-PEAR >= 1:1.4.0-0.b1.3
+Requires:	php-zlib
+Requires:	sed >= 4.0
 
 %description php-pearprov
 Additional utilities for checking php pear provides/requires in rpm
 packages.
 
+This package provides rpm macros and dependencies to help building
+PEAR packages.
+
 %description php-pearprov -l pl
 Dodatkowe narzędzia do sprawdzenia zależności skryptów php pear w
 pakietach rpm.
 
+Ten pakiet dostarcza makra rpm-a i zależności pomagające przy
+budowaniu pakietów PEAR-a.
+
 %package -n python-rpm
 Summary:	Python interface to RPM library
 Summary(pl):	Pythonowy interfejs do biblioteki RPM-a
@@ -608,8 +618,7 @@
 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
+install %{SOURCE34} 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 %{SOURCE5} scripts/find-lang.sh
@@ -1114,6 +1123,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.700  2005/10/07 09:02:29  qboosh
+- merged pear macros from AC-branch
+- macros 1.241
+
 Revision 1.699  2005/10/06 17:25:30  paszczus
 - reverted
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.699&r2=1.700&f=u