rpms/soprano/F-7 .cvsignore, 1.7, 1.8 soprano.spec, 1.9, 1.10 sources, 1.7, 1.8

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/soprano/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32583/F-7

Modified Files:
	.cvsignore soprano.spec sources 
Log Message:
Sync from devel:

* Thu Mar 6 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.0.3-2
- build apidocs and put them into an -apidocs subpackage (can be turned off)
- BR doxygen and qt4-doc when building apidocs

* Tue Mar 4 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.0.3-1
- update to 2.0.3 (bugfix release)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/F-7/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	22 Feb 2008 14:48:59 -0000	1.7
+++ .cvsignore	7 Mar 2008 23:49:57 -0000	1.8
@@ -1 +1 @@
-soprano-2.0.2.tar.bz2
+soprano-2.0.3.tar.bz2


Index: soprano.spec
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/F-7/soprano.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- soprano.spec	22 Feb 2008 14:48:59 -0000	1.9
+++ soprano.spec	7 Mar 2008 23:49:57 -0000	1.10
@@ -1,12 +1,13 @@
 
 # fedora review: http://bugzilla.redhat.com/248120
 
-# TODO: package apidocs (make apidox, BR doxygen and qt4-doc)
+# set this to 0 to disable -apidocs for a faster build
+%define apidocs 1
 
 Summary: Qt wrapper API to different RDF storage solutions
 Name:    soprano
-Version: 2.0.2
-Release: 1%{?dist}
+Version: 2.0.3
+Release: 2%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -21,6 +22,11 @@
 # older packages had clucene-config.h in the wrong place
 BuildRequires: clucene-core-devel >= 0.9.20-2
 
+%if "%{?apidocs}" == "1"
+BuildRequires: doxygen
+BuildRequires: qt4-doc
+%endif
+
 %description
 %{summary}.
 
@@ -33,6 +39,15 @@
 %description devel
 %{summary}.
 
+%package apidocs
+Group: Development/Documentation
+Summary: Soprano API documentation
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}
+
+%description apidocs
+This package includes the Soprano API documentation in HTML
+format for easy browsing.
+
 
 %prep
 %setup -q -n soprano-%{version}%{?beta}
@@ -40,10 +55,14 @@
 
 %build
 
-%cmake .
+%cmake . -DQT_DOC_DIR=`pkg-config --variable=docdir Qt`
 
 make %{?_smp_mflags}
 
+%if "%{?apidocs}" == "1"
+make apidox
+%endif
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -79,8 +98,21 @@
 %{_includedir}/soprano/
 %{_includedir}/Soprano/
 
+%if "%{?apidocs}" == "1"
+%files apidocs
+%defattr(-,root,root,-)
+%doc docs/html
+%endif
+
 
 %changelog
+* Thu Mar 6 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.0.3-2
+- build apidocs and put them into an -apidocs subpackage (can be turned off)
+- BR doxygen and qt4-doc when building apidocs
+
+* Tue Mar 4 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.0.3-1
+- update to 2.0.3 (bugfix release)
+
 * Fri Feb 22 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.0.2-1
 - update to 2.0.2 (bugfix release)
 - drop glibc/open (missing mode) patch (fixed upstream)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 Feb 2008 14:48:59 -0000	1.7
+++ sources	7 Mar 2008 23:49:57 -0000	1.8
@@ -1 +1 @@
-3863508b700bd1651633fe1853d5f858  soprano-2.0.2.tar.bz2
+3f33799c6ebd03048621057d268fb62f  soprano-2.0.3.tar.bz2