SPECS: php-pear-Console_Getopt.spec, php-pear-PEAR.spec - depend on rpm-whi...
glen
glen at pld-linux.org
Thu May 29 20:59:11 CEST 2008
Author: glen Date: Thu May 29 18:59:11 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- depend on rpm-whiteout to get proper dependency whiteout macro
- NOTE: do not convert to R>version, as then dependency could be solved in same transaction and rpm doesn't read new macros
---- Files affected:
SPECS:
php-pear-Console_Getopt.spec (1.31 -> 1.32) , php-pear-PEAR.spec (1.145 -> 1.146)
---- Diffs:
================================================================
Index: SPECS/php-pear-Console_Getopt.spec
diff -u SPECS/php-pear-Console_Getopt.spec:1.31 SPECS/php-pear-Console_Getopt.spec:1.32
--- SPECS/php-pear-Console_Getopt.spec:1.31 Thu Jan 31 13:16:05 2008
+++ SPECS/php-pear-Console_Getopt.spec Thu May 29 20:59:05 2008
@@ -8,7 +8,7 @@
Summary(pl.UTF-8): %{_pearname} - Parser opcji linii poleceń
Name: php-pear-%{_pearname}
Version: 1.2.3
-Release: 2
+Release: 3
License: PHP 2.02
Group: Development/Languages/PHP
Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz
@@ -18,6 +18,8 @@
BuildRequires: rpm-php-pearprov >= 4.4.2-11
BuildRequires: rpmbuild(macros) >= 1.300
Requires: php-pear
+Requires: rpm-whiteout
+Conflicts: rpm-whiteout < 1.1
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -56,6 +58,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.32 2008-05-29 18:59:05 glen
+- depend on rpm-whiteout to get proper dependency whiteout macro
+- NOTE: do not convert to R>version, as then dependency could be solved in same transaction and rpm doesn't read new macros
+
Revision 1.31 2008-01-31 12:16:05 glen
- rel 2
================================================================
Index: SPECS/php-pear-PEAR.spec
diff -u SPECS/php-pear-PEAR.spec:1.145 SPECS/php-pear-PEAR.spec:1.146
--- SPECS/php-pear-PEAR.spec:1.145 Mon May 19 10:09:58 2008
+++ SPECS/php-pear-PEAR.spec Thu May 29 20:59:05 2008
@@ -17,7 +17,7 @@
Summary(pl.UTF-8): Podstawowy system PEAR
Name: php-pear-%{_pearname}
Version: 1.7.2
-Release: 4
+Release: 5
Epoch: 1
License: PHP 3.0
Group: Development/Languages/PHP
@@ -44,13 +44,15 @@
Requires: php-pear-Archive_Tar >= 1.1
Requires: php-pear-Console_Getopt >= 1.2
Requires: php-pear-Structures_Graph >= 1.0.2
-#Suggests: php-pear-Net_FTP
+Requires: rpm-whiteout
+Suggests: php-pear-Net_FTP
Obsoletes: php-pear-PEAR-Command
Obsoletes: php-pear-PEAR-Frontend_CLI
Obsoletes: php-pear-PEAR-OS
Conflicts: php-pear-Archive_Tar = 1.3.0
Conflicts: php-pear-PEAR_Frontend_Gtk < 0.4.0
Conflicts: php-pear-PEAR_Frontend_Web < 0.5.0
+Conflicts: rpm-whiteout < 1.1
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -254,6 +256,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.146 2008-05-29 18:59:05 glen
+- depend on rpm-whiteout to get proper dependency whiteout macro
+- NOTE: do not convert to R>version, as then dependency could be solved in same transaction and rpm doesn't read new macros
+
Revision 1.145 2008-05-19 08:09:58 glen
- restore exec bits on scripts; rel 4
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php-pear-Console_Getopt.spec?r1=1.31&r2=1.32&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php-pear-PEAR.spec?r1=1.145&r2=1.146&f=u
More information about the pld-cvs-commit
mailing list