SPECS: rpm-build-macros.spec - php epoch; rel 2

[glen]

Author: glen                         Date: Thu Dec 14 23:12:51 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- php epoch; rel 2

---- Files affected:
SPECS:
   rpm-build-macros.spec (1.98 -> 1.99) 

---- Diffs:

================================================================
Index: SPECS/rpm-build-macros.spec
diff -u SPECS/rpm-build-macros.spec:1.98 SPECS/rpm-build-macros.spec:1.99
--- SPECS/rpm-build-macros.spec:1.98	Fri Dec 15 00:05:53 2006
+++ SPECS/rpm-build-macros.spec	Fri Dec 15 00:12:46 2006
@@ -4,7 +4,7 @@
 Summary(pl):	Makra do budowania pakietów RPM dla Linuksa PLD
 Name:		rpm-build-macros
 Version:	%{rpm_macros_rev}
-Release:	1
+Release:	2
 License:	GPL
 Group:		Base
 Source0:	rpm.macros
@@ -16,8 +16,8 @@
 # for _x_libraries macro
 Conflicts:	rpm < 4.4.2-27.1
 # php-config --sysconfdir
-Conflicts:	php-devel < 4.2.0-3
-Conflicts:	php4-devel < 4.4.4-10
+Conflicts:	php-devel < 4:5.2.0-3
+Conflicts:	php4-devel < 3:4.4.4-10
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_rpmlibdir %{_prefix}/lib/rpm
@@ -57,6 +57,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.99  2006/12/14 23:12:46  glen
+- php epoch; rel 2
+
 Revision 1.98  2006/12/14 23:05:53  glen
 - 1.344: added %php_webserver_restart, %php4_webserver_restart
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/rpm-build-macros.spec?r1=1.98&r2=1.99&f=u