rpms/soprano/F-12 soprano-2.3.70-redland_version_check.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 soprano.spec, 1.38, 1.39 sources, 1.23, 1.24

Wed Feb 10 00:52:09 UTC 2010

Author: kkofler

Update of /cvs/pkgs/rpms/soprano/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19672/F-12

Modified Files:
	.cvsignore soprano.spec sources 
Added Files:
	soprano-2.3.70-redland_version_check.patch 
Log Message:
Sync from devel:

* Tue Feb 09 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.4.0-1
- soprano-2.4.0
- %%build: explictly %%{_cmake_skip_rpath}, need to poke on cmake to see why 
  %%{_libdir} is getting rpath'd here

* Sat Jan 30 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.3.73-0.1.20100130
- soprano-2.3.73 (20100130 snapshot)

* Sun Jan 03 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.3.70-3
- redland_version_check patch

* Sun Jan 03 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.3.70-2
- rebuild (redland)

* Wed Dec 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.3.70-1
- soprano-2.3.70 (#543440)

* Wed Nov 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.3.68-0.1.20091118
- soprano-2.3.68 (20091118 snapshot)

* Mon Nov 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.3.67-0.1.20091102
- soprano-2.3.67 (20091102 snapshot)
- Provides: soprano-backend-virtuoso

* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.3.65-0.2.20091020
- soprano-2.3.65 (20091020 snapshot)
- Requires: virtuoso-opensource

* Fri Oct 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.3.63-0.1.20091009
- soprano-2.3.63 (20091009 snapshot)

soprano-2.3.70-redland_version_check.patch:
 CMakeLists.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE soprano-2.3.70-redland_version_check.patch ---
diff -up soprano-2.3.70/CMakeLists.txt.redland_version soprano-2.3.70/CMakeLists.txt
--- soprano-2.3.70/CMakeLists.txt.redland_version	2009-11-29 03:04:17.000000000 -0600
+++ soprano-2.3.70/CMakeLists.txt	2010-01-03 18:54:24.514898331 -0600
@@ -99,9 +99,9 @@ endif(SOPRANO_BUILD_INDEX_LIB AND NOT SO
 if(RAPTOR_FOUND AND NOT SOPRANO_DISABLE_RAPTOR_PARSER)
   set(BUILD_RAPTOR_PARSER TRUE)
 endif(RAPTOR_FOUND AND NOT SOPRANO_DISABLE_RAPTOR_PARSER)
-if(RAPTOR_FOUND AND REDLAND_FOUND AND REDLAND_VERSION STRGREATER "1.0.5" AND NOT SOPRANO_DISABLE_RAPTOR_SERIALIZER)
+if(RAPTOR_FOUND AND REDLAND_FOUND AND NOT SOPRANO_DISABLE_RAPTOR_SERIALIZER)
   set(BUILD_RAPTOR_SERIALIZER TRUE)
-endif(RAPTOR_FOUND AND REDLAND_FOUND AND REDLAND_VERSION STRGREATER "1.0.5" AND NOT SOPRANO_DISABLE_RAPTOR_SERIALIZER)
+endif(RAPTOR_FOUND AND REDLAND_FOUND AND NOT SOPRANO_DISABLE_RAPTOR_SERIALIZER)
 if(NOT SOPRANO_DISABLE_DBUS AND QT_QTDBUS_FOUND)
   set(BUILD_DBUS_SUPPORT TRUE)
 endif(NOT SOPRANO_DISABLE_DBUS AND QT_QTDBUS_FOUND)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/F-12/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	14 Sep 2009 23:23:19 -0000	1.23
+++ .cvsignore	10 Feb 2010 00:52:09 -0000	1.24
@@ -1 +1 @@
-soprano-2.3.1.tar.bz2
+soprano-2.4.0.tar.bz2


Index: soprano.spec
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/F-12/soprano.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- soprano.spec	14 Sep 2009 23:23:20 -0000	1.38
+++ soprano.spec	10 Feb 2010 00:52:09 -0000	1.39
@@ -1,36 +1,51 @@
 
 # fedora review: http://bugzilla.redhat.com/248120
 
-# set this to 0 to disable -apidocs for a faster build
-%define apidocs 1 
+# undef or set to 0 to disable -apidocs for a faster build
+%define apidocs 1
+
+#define snap 20100130
 
 Summary: Qt wrapper API to different RDF storage solutions
 Name:    soprano
-Version: 2.3.1
+Version: 2.4.0
 Release: 1%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://sourceforge.net/projects/soprano
+%if 0%{?snap:1}
+Source0: soprano-%{snap}svn.tar.bz2
+%else
 Source0: http://downloads.sf.net/soprano/soprano-%{version}.tar.bz2
+%endif
 Source1: soprano-svn_checkout.sh 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch50: soprano-2.3.70-redland_version_check.patch
+
 BuildRequires: clucene-core-devel >= 0.9.20-2
 BuildRequires: cmake
 BuildRequires: kde-filesystem
 # for backends/virtuoso
-#BuildRequires: libiodbc-devel
+BuildRequires: libiodbc-devel
 BuildRequires: qt4-devel
 BuildRequires: redland-devel >= 1.0.6
 BuildRequires: raptor-devel >= 1.4.15
 
-%if "%{?apidocs}" == "1"
+%if 0%{?apidocs}
 BuildRequires: doxygen
 BuildRequires: graphviz
 BuildRequires: qt4-doc
 %endif
 
+## If/When backends are packaged separately
+#Requires: soprano-backend
+## otherwise,
+Provides: soprano-backend-virtuoso = %{version}-%{release}
+Requires: virtuoso-opensource
+
+
 %description
 %{summary}.
 
@@ -43,6 +58,23 @@ Requires: pkgconfig
 %description devel
 %{summary}.
 
+%package backend-redland 
+Summary: Redland backend for %{name}
+Group:   System Environment/Libraries 
+Provides: %{name}-backend = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+%description backend-redland 
+%{summary}.
+
+%package backend-virtuoso
+Summary: Virtuoso backend for %{name}
+Group:   System Environment/Libraries
+Provides: %{name}-backend = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+Requires: virtuoso-opensource
+%description backend-virtuoso 
+%{summary}.
+
 %package apidocs
 Group: Development/Documentation
 Summary: Soprano API documentation
@@ -59,7 +91,7 @@ format for easy browsing.
 
 
 %prep
-%setup -q -n soprano-%{version}
+%setup -q -n soprano%{!?snap:-%{version}}
 
 
 %build
@@ -69,7 +101,9 @@ pushd %{_target_platform}
 %{cmake} \
   -DDATA_INSTALL_DIR:PATH=%{_kde4_appsdir} \
   -DQT_DOC_DIR=`pkg-config --variable=docdir Qt` \
-  -DSOPRANO_BUILD_API_DOCS:BOOL=%{?apidocs} \
+  -DSOPRANO_BUILD_API_DOCS:BOOL=%{!?apidocs:0}%{?apidocs} \
+  -DSOPRANO_BUILD_TESTS:BOOL=%{!?tests:FALSE}%{?tests} \
+  %{?_cmake_skip_rpath} \
   .. 
 popd
 
@@ -101,9 +135,25 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libsopranoclient.so.1*
 %{_libdir}/libsopranoindex.so.1*
 %{_libdir}/libsopranoserver.so.1*
-%{_libdir}/soprano/
-%{_datadir}/soprano/
 %{_datadir}/dbus-1/interfaces/org.soprano.*.xml
+%dir %{_datadir}/soprano/
+%dir %{_datadir}/soprano/plugins
+%{_datadir}/soprano/plugins/*parser.desktop
+%{_datadir}/soprano/plugins/*serializer.desktop
+%{_datadir}/soprano/rules/
+%dir %{_libdir}/soprano/
+%{_libdir}/soprano/libsoprano_*parser.so
+%{_libdir}/soprano/libsoprano_*serializer.so
+
+#files backend-redland
+#defattr(-,root,root,-)
+%{_libdir}/soprano/libsoprano_redlandbackend.so
+%{_datadir}/soprano/plugins/redlandbackend.desktop
+
+#files backend-virtuoso
+#defattr(-,root,root,-)
+%{_libdir}/soprano/libsoprano_virtuosobackend.so
+%{_datadir}/soprano/plugins/virtuosobackend.desktop
 
 %files devel
 %defattr(-,root,root,-)
@@ -121,6 +171,37 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Feb 09 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.4.0-1
+- soprano-2.4.0
+- %%build: explictly %%{_cmake_skip_rpath}, need to poke on cmake to see why 
+  %%{_libdir} is getting rpath'd here
+
+* Sat Jan 30 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.3.73-0.1.20100130
+- soprano-2.3.73 (20100130 snapshot)
+
+* Sun Jan 03 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.3.70-3
+- redland_version_check patch
+
+* Sun Jan 03 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.3.70-2
+- rebuild (redland)
+
+* Wed Dec 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.3.70-1
+- soprano-2.3.70 (#543440)
+
+* Wed Nov 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.3.68-0.1.20091118
+- soprano-2.3.68 (20091118 snapshot)
+
+* Mon Nov 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.3.67-0.1.20091102
+- soprano-2.3.67 (20091102 snapshot)
+- Provides: soprano-backend-virtuoso
+
+* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.3.65-0.2.20091020
+- soprano-2.3.65 (20091020 snapshot)
+- Requires: virtuoso-opensource
+
+* Fri Oct 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.3.63-0.1.20091009
+- soprano-2.3.63 (20091009 snapshot)
+
 * Mon Sep 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.3.1-1
 - soprano-2.3.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/F-12/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	14 Sep 2009 23:23:20 -0000	1.23
+++ sources	10 Feb 2010 00:52:09 -0000	1.24
@@ -1 +1 @@
-c9a2c008b80cd5d76599e9d48139dfe9  soprano-2.3.1.tar.bz2
+519f1243e558262b9e8cc2827139f117  soprano-2.4.0.tar.bz2

