simplify php requires

diff --git a/graphviz.spec.in b/graphviz.spec.in
index e73dd01c5518d3387771190e8a306726300f3b85..c201a79d80683054c1ace2b9c675678279a67983 100644 (file)
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -4,9 +4,17 @@
 # Note: pre gd-2.0.34 graphviz uses its own gd tree with gif support and other fixes
 
 # What a meal PHP makes of versioning !!!
-%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
+%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php)
 %global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
 
+# Fix private-shared-object-provides
+# RPM 4.8
+%{?filter_provides_in: %filter_provides_in %{php_extdir}/.*\.so$}
+%{?filter_setup}
+# RPM 4.9
+%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{php_extdir}/.*\\.so$
+
+
 
 #-- Global graphviz rpm and src.rpm tags-------------------------------------
 Name:    graphviz
@@ -165,16 +173,6 @@ BuildRequires: libwebp-devel
 %endif
 %endif
 
-%global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
-
-%global php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
-# Fix private-shared-object-provides
-# RPM 4.8
-%{?filter_provides_in: %filter_provides_in %{php_extdir}/.*\.so$}
-%{?filter_setup}
-# RPM 4.9
-%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{php_extdir}/.*\\.so$
-
 
 #-- main graphviz rpm ------------------------------------------------
 Requires:         urw-fonts
@@ -573,8 +571,10 @@ Perl extension for graphviz.
 Group:          Applications/Multimedia
 Summary:        PHP extension for graphviz
 Requires:       %{name} = %{version}-%{release}, php
-Requires:       php(zend-abi) = %{php_zend_api}
-Requires:       php(api) = %{php_core_api}
+
+### none of this abi/api stuff works!
+#Requires:       php(zend-abi) = %{php_zend_api}
+#Requires:       php(api) = %{php_core_api}
 
 %description php
 PHP extension for graphviz.