rpms/soprano/devel soprano-2.3.70-redland_version_check.patch, NONE, 1.1 soprano.spec, 1.45, 1.46

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/soprano/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25274

Modified Files:
	soprano.spec 
Added Files:
	soprano-2.3.70-redland_version_check.patch 
Log Message:
* Sun Jan 03 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.3.70-3
- redland_version_check patch


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: soprano.spec
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/devel/soprano.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- soprano.spec	4 Jan 2010 00:31:20 -0000	1.45
+++ soprano.spec	4 Jan 2010 00:57:53 -0000	1.46
@@ -1,15 +1,15 @@
 
 # fedora review: http://bugzilla.redhat.com/248120
 
-# undef or set to 0 to disable -apidocs for a faster build
-%define apidocs 1 
+# undef or set to FALSE to disable -apidocs for a faster build
+%define apidocs TRUE 
 
 #define snap 20091118
 
 Summary: Qt wrapper API to different RDF storage solutions
 Name:    soprano
 Version: 2.3.70
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -19,6 +19,8 @@ Source0: http://downloads.sf.net/soprano
 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
@@ -88,6 +90,8 @@ format for easy browsing.
 %prep
 %setup -q -n soprano%{!?snap:-%{version}}
 
+%patch50 -p1 -b .redland_version_check
+
 
 %build
 
@@ -96,11 +100,13 @@ pushd %{_target_platform}
 %{cmake} \
   -DDATA_INSTALL_DIR:PATH=%{_kde4_appsdir} \
   -DQT_DOC_DIR=`pkg-config --variable=docdir Qt` \
-  -DSOPRANO_BUILD_API_DOCS:BOOL=%{!?apidocs:0}%{?apidocs} \
-  -DSOPRANO_BUILD_TESTS:BOOL=0%{?tests} \
+  -DSOPRANO_BUILD_API_DOCS:BOOL=%{!?apidocs:FALSE}%{?apidocs} \
+  -DSOPRANO_BUILD_TESTS:BOOL=%{!?tests:FALSE}%{?tests} \
   .. 
 popd
 
+#   -DBUILD_RAPTOR_SERIALIZER:BOOL=TRUE \
+
 make %{?_smp_mflags} -C %{_target_platform}
 
 
@@ -165,6 +171,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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)