summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElan Ruusamäe2008-05-29 18:59:05 (GMT)
committercvs2git2012-06-24 12:13:13 (GMT)
commit3c98fb187592ca157d82658552ffd5b500de5848 (patch)
treece511492e45da0ac0741605b0772c9b5a71ca7e5
parent939cbf7e9587c38f8604b570e2f19eb32d0c5307 (diff)
downloadphp-pear-PEAR-3c98fb187592ca157d82658552ffd5b500de5848.zip
php-pear-PEAR-3c98fb187592ca157d82658552ffd5b500de5848.tar.gz
- depend on rpm-whiteout to get proper dependency whiteout macroauto/th/php-pear-PEAR-1_7_2-5auto/ac/php-pear-PEAR-1_7_2-5
- NOTE: do not convert to R>version, as then dependency could be solved in same transaction and rpm doesn't read new macros Changed files: php-pear-PEAR.spec -> 1.146
-rw-r--r--php-pear-PEAR.spec6
1 files changed, 4 insertions, 2 deletions
diff --git a/php-pear-PEAR.spec b/php-pear-PEAR.spec
index b951b23..bc1b30a 100644
--- a/php-pear-PEAR.spec
+++ b/php-pear-PEAR.spec
@@ -16,7 +16,7 @@ Summary: PEAR Base System
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
@@ -43,13 +43,15 @@ Requires: php-pear >= 4:1.0-14
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)