php-pecl-xmldiff: minor cleanups

1 files changed, 13 insertions, 4 deletions

diff --git a/php-pecl-xmldiff.spec b/php-pecl-xmldiff.spec
index 84c8792..187bb51 100644
--- a/php-pecl-xmldiff.spec
+++ b/php-pecl-xmldiff.spec
@@ -57,16 +57,17 @@ Provides:       %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}
 Provides:       %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
 Provides:       %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
 
-%if 0%{!?scl:1}
+%if "%{?vendor}" == "Remi Collet"
 # Other third party repo stuff
-%if "%{php_version}" > "5.4"
 Obsoletes:     php53-pecl-%{pecl_name}
 Obsoletes:     php53u-pecl-%{pecl_name}
 Obsoletes:     php54-pecl-%{pecl_name}
-%endif
 %if "%{php_version}" > "5.5"
 Obsoletes:     php55u-pecl-%{pecl_name}
 %endif
+%if "%{php_version}" > "5.6"
+Obsoletes:     php56u-pecl-%{pecl_name}
+%endif
 %endif
 
 %if 0%{?fedora} < 20 && 0%{?rhel} < 7
@@ -75,6 +76,7 @@ Obsoletes:     php55u-pecl-%{pecl_name}
 %{?filter_setup}
 %endif
 
+
 %description
 The extension is able to produce diffs of two XML documents and then to apply
 the difference to the source document. The diff is a XML document containing
@@ -95,6 +97,11 @@ These are the files needed to compile programs using %{name}.
 
 %prep
 %setup -q -c
+
+sed -e '/name="diffmark/d' \
+    -e '/testdata/s/role="data"/role="test"/' \
+    -i package.xml
+
 mv %{pecl_name}-%{version} NTS
 
 cd NTS
@@ -126,6 +133,7 @@ cd NTS
 %{_bindir}/phpize
 %configure \
     --with-libdiffmark \
+    --with-libdir=%{_lib} \
     --with-php-config=%{_bindir}/php-config
 make %{?_smp_mflags}
 
@@ -134,6 +142,7 @@ cd ../ZTS
 %{_bindir}/zts-phpize
 %configure \
     --with-libdiffmark \
+    --with-libdir=%{_lib} \
     --with-php-config=%{_bindir}/zts-php-config
 make %{?_smp_mflags}
 %endif
@@ -157,7 +166,7 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
 %endif
 
 # Test & Documentation
-for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//' | grep -v ^diffmark)
+for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//')
 do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
 done
 for i in $(grep 'role="test"' package.xml | sed -e 's/^.*name="//;s/".*$//')