rpms/soprano/devel .cvsignore, 1.32, 1.33 soprano.spec, 1.55, 1.56 sources, 1.33, 1.34 soprano-2.4.1-fix_version.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore soprano.spec sources 
Removed Files:
	soprano-2.4.1-fix_version.patch 
Log Message:
* Sat Apr 27 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.4.2-1
- soprano-2.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	6 Mar 2010 01:31:11 -0000	1.32
+++ .cvsignore	18 Apr 2010 16:33:34 -0000	1.33
@@ -1 +1 @@
-soprano-2.4.1.tar.bz2
+soprano-2.4.2.tar.bz2


Index: soprano.spec
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/devel/soprano.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- soprano.spec	23 Mar 2010 20:33:17 -0000	1.55
+++ soprano.spec	18 Apr 2010 16:33:34 -0000	1.56
@@ -2,14 +2,13 @@
 # fedora review: http://bugzilla.redhat.com/248120
 
 # undef or set to 0 to disable -apidocs for a faster build
-%define apidocs 1
-
-#define snap 20100130
+#define apidocs 1
+%define tests 1
 
 Summary: Qt wrapper API to different RDF storage solutions
 Name:    soprano
-Version: 2.4.1
-Release: 3%{?dist}
+Version: 2.4.2
+Release: 1%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -20,12 +19,11 @@ Source0: soprano-%{snap}svn.tar.bz2
 Source0: http://downloads.sf.net/soprano/soprano-%{version}.tar.bz2
 %endif
 Source1: soprano-svn_checkout.sh
-# fix missing #include which breaks QT_NO_DEBUG_OUTPUT build
-Patch0:  soprano-2.4.1-missing-qdebug-header.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstreamable patches
-Patch50: soprano-2.4.1-fix_version.patch
+# fix missing #include which breaks QT_NO_DEBUG_OUTPUT build
+Patch50:  soprano-2.4.1-missing-qdebug-header.patch
 
 BuildRequires: clucene-core-devel >= 0.9.20-2
 BuildRequires: cmake
@@ -35,6 +33,9 @@ BuildRequires: libiodbc-devel
 BuildRequires: qt4-devel
 BuildRequires: redland-devel >= 1.0.6
 BuildRequires: raptor-devel >= 1.4.15
+%if 0%{?tests}
+BuildRequires: virtuoso-opensource
+%endif
 
 %if 0%{?apidocs}
 BuildRequires: doxygen
@@ -95,16 +96,17 @@ format for easy browsing.
 
 %prep
 %setup -q -n soprano%{!?snap:-%{version}}
-%patch0 -p1 -b .missing-qdebug-header
 
-%patch50 -p1 -b .fix_version
+%patch50 -p1 -b .missing-qdebug-header
 
 
 %build
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
+%if 0%{?fedora} && 0%{?fedora} < 14
 export CXXFLAGS="%optflags -DQT_NO_DEBUG_OUTPUT"
+%endif
 %{cmake} \
   -DDATA_INSTALL_DIR:PATH=%{_kde4_appsdir} \
   -DQT_DOC_DIR=`pkg-config --variable=docdir Qt` \
@@ -123,6 +125,20 @@ rm -rf $RPM_BUILD_ROOT
 make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
 
+%check
+%if 0%{?tests:1}
+## expected:
+#The following tests FAILED:
+#         17 - sopranodclienttest (Failed)
+#         18 - localsocketmultithreadtest (Failed)
+#         19 - sopranodsocketclienttest (Failed)
+#         20 - sopranodbusclienttest (Failed)
+#         21 - sopranodbusmultithreadtest (SEGFAULT)
+#         23 - virtuosobackendtest (Failed)
+#         24 - graphtest (Failed)
+make -C %{_target_platform}/test test ||:
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -181,6 +197,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Apr 27 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.4.2-1
+- soprano-2.4.2
+
 * Tue Mar 23 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.4.1-3
 - disable debugging output (-DQT_NO_DEBUG_OUTPUT)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	6 Mar 2010 01:31:11 -0000	1.33
+++ sources	18 Apr 2010 16:33:34 -0000	1.34
@@ -1 +1 @@
-4892c800853cc340b63d0ab6fcf405af  soprano-2.4.1.tar.bz2
+4b40be000f23a7c5f1ef530303268d36  soprano-2.4.2.tar.bz2


--- soprano-2.4.1-fix_version.patch DELETED ---