[soprano] - Requires: qt4 ... - tighten subpkg pkg deps with %{?_isa}

[Rex Dieter]

commit fe54eb3a8c95940da893dba9f38a470f69822023
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Aug 23 11:21:21 2010 -0500

    - Requires: qt4 ...
    - tighten subpkg pkg deps with %{?_isa}

 soprano.spec |   27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)
---
diff --git a/soprano.spec b/soprano.spec
index 2ea4477..b76a4cf 100644
--- a/soprano.spec
+++ b/soprano.spec
@@ -8,7 +8,7 @@
 Summary: Qt wrapper API to different RDF storage solutions
 Name:    soprano
 Version: 2.5.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -40,16 +40,17 @@ BuildRequires: graphviz
 BuildRequires: qt4-doc
 %endif
 
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
+%if 0%{?fedora} > 13
+## redland plugins split in f14+, though not entirely sure if this is 
+## really needed -- Rex
+Requires: redland-virtuoso
+%endif
 ## If/When backends are packaged separately
 #Requires: soprano-backend
 ## otherwise,
 Provides: soprano-backend-virtuoso = %{version}-%{release}
 Requires: virtuoso-opensource
-%if 0%{?fedora} > 13
-# redland plugins split in f14+, though not entirely sure if this is 
-# really needed -- Rex
-Requires: redland-virtuoso
-%endif
 
 
 %description
@@ -58,7 +59,7 @@ Requires: redland-virtuoso
 %package devel
 Summary: Developer files for %{name}
 Group:   Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: qt4-devel
 Requires: pkgconfig
 %description devel
@@ -68,7 +69,7 @@ Requires: pkgconfig
 Summary: Redland backend for %{name}
 Group:   System Environment/Libraries 
 Provides: %{name}-backend = %{version}-%{release}
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 %description backend-redland 
 %{summary}.
 
@@ -76,7 +77,7 @@ Requires: %{name} = %{version}-%{release}
 Summary: Virtuoso backend for %{name}
 Group:   System Environment/Libraries
 Provides: %{name}-backend = %{version}-%{release}
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: virtuoso-opensource
 %if 0%{?fedora} > 13
 # redland plugins split in f14+, though not entirely sure if this is 
@@ -131,8 +132,8 @@ make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 %if 0%{?apidocs}
 mkdir -p %{buildroot}%{_kde4_docdir}/HTML/en
 cp -a %{_target_platform}/docs/html %{buildroot}%{_kde4_docdir}/HTML/en/soprano-apidocs
-# spurious executable, pulls in perl dep(s)
-rm -v %{buildroot}%{_kde4_docdir}/HTML/en/soprano-apidocs/installdox
+# spurious executables, pull in perl dep(s)
+find %{buildroot}%{_kde4_docdir}/HTML/en/ -name 'installdox' -exec rm -fv {} ';'
 %endif
 
 
@@ -215,6 +216,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 23 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.5.0-2
+- Requires: qt4 ...
+- tighten subpkg pkg deps with %%{?_isa}
+
 * Sat Aug 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.5.0-1
 - soprano-2.5.0