rpms/soprano/devel soprano.spec,1.66,1.67

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/soprano/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20044

Modified Files:
	soprano.spec 
Log Message:
* Sat Jul 24 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.4.64-2
- -apidocs: remove spurious perl dep, move to %_kde4_docdir/HTML/en/



Index: soprano.spec
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/devel/soprano.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- soprano.spec	24 Jul 2010 12:27:15 -0000	1.66
+++ soprano.spec	24 Jul 2010 15:27:52 -0000	1.67
@@ -8,7 +8,7 @@
 Summary: Qt wrapper API to different RDF storage solutions
 Name:    soprano
 Version: 2.4.64
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -89,13 +89,12 @@ Requires: redland-virtuoso
 %package apidocs
 Group: Development/Documentation
 Summary: Soprano API documentation
-Requires: %{name} = %{version}
-%if 0%{?fedora} > 9
+Requires: kde-filesystem
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
 # help workaround yum bug http://bugzilla.redhat.com/502401
 Obsoletes: soprano-apidocs < 2.2.3-2 
 BuildArch: noarch
 %endif
-
 %description apidocs
 This package includes the Soprano API documentation in HTML
 format for easy browsing.
@@ -129,6 +128,13 @@ rm -rf $RPM_BUILD_ROOT
 
 make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
+%if 0%{?apidocs}
+mkdir -p %{buildroot}%{_kde4_docdir}/HTML/en/soprano-apidocs
+cp -a %{_target_platform}/docs/html/ %{buildroot}%{_kde4_docdir}/HTML/en/soprano-apidocs
+# spurious executable, pulls in perl dep(s)
+rm -fv %{buildroot}%{_kde4_docdir}/HTML/en/soprano-apidocs/installdox
+%endif
+
 
 %check
 # verify pkg-config version (notoriously wrong in recent soprano releases)
@@ -201,14 +207,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/soprano/
 %{_includedir}/Soprano/
 
-%if "%{?apidocs}" == "1"
+%if 0%{?apidocs}
 %files apidocs
 %defattr(-,root,root,-)
-%doc %{_target_platform}/docs/html
+%{_kde4_docdir}/HTML/en/soprano-apidocs
 %endif
 
 
 %changelog
+* Sat Jul 24 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.4.64-2
+- -apidocs: remove spurious perl dep, move to %%_kde4_docdir/HTML/en/
+
 * Sat Jul 24 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.4.64-1
 - soprano-2.4.64