packages: soprano/soprano.spec - merged from DEVEL

[shadzik]

Author: shadzik                      Date: Tue Feb 16 15:02:40 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
packages/soprano:
   soprano.spec (1.46 -> 1.47) 

---- Diffs:

================================================================
Index: packages/soprano/soprano.spec
diff -u packages/soprano/soprano.spec:1.46 packages/soprano/soprano.spec:1.47
--- packages/soprano/soprano.spec:1.46	Thu Oct 29 00:13:38 2009
+++ packages/soprano/soprano.spec	Tue Feb 16 16:02:31 2010
@@ -7,19 +7,21 @@
 # Conditional build:
 %bcond_without	serializer		# with raptor serializer. need to figure out proper BR
 %bcond_without	sesame2			# with sesame2backend
+%bcond_without	virtuoso		# with virtuosobackend
 
-%define		qtbrver		4.6.0
-%define		svn		979183
+%define		qtbrver		4.6.1
+%define		snap		svn1042011
 
 Summary:	Soprano - Qt wrapper API to librdf
 Summary(pl.UTF-8):	Soprano - wrapper Qt do librdf
 Name:		soprano
-Version:	2.3.1
+Version:	2.4.0.1
 Release:	1
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://downloads.sourceforge.net/sourceforge/soprano/%{name}-%{version}.tar.bz2
-# Source0-md5:	c9a2c008b80cd5d76599e9d48139dfe9
+# Source0-md5:	6175a3b342a77a7adc6f157cf4968f6d
+#Source0:	%{name}-%{version}-%{snap}.tar.gz
 URL:		http://sourceforge.net/projects/soprano
 BuildRequires:	QtCore-devel >= %{qtbrver}
 BuildRequires:	QtDBus-devel >= %{qtbrver}
@@ -34,7 +36,10 @@
 BuildRequires:	rasqal-devel
 BuildRequires:	redland-devel >= 1.0.6
 BuildRequires:	rpmbuild(macros) >= 1.453
-BuildConflicts:	java-sun
+%if %{with virtuoso}
+BuildRequires:	libiodbc-devel
+Requires:	virtuoso >= 6.1.0
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -123,6 +128,7 @@
 %attr(755,root,root) %{_libdir}/soprano/libsoprano_raptorparser.so
 %{?with_sesame2:%attr(755,root,root) %{_libdir}/soprano/libsoprano_sesame2backend.so}
 %{?with_serializer:%attr(755,root,root) %{_libdir}/soprano/libsoprano_raptorserializer.so}
+%{?with_virtuoso:%attr(755,root,root) %{_libdir}/soprano/libsoprano_virtuosobackend.so}
 %{_datadir}/soprano
 %{_datadir}/dbus-1/interfaces/org.soprano.Model.xml
 %{_datadir}/dbus-1/interfaces/org.soprano.NodeIterator.xml
@@ -147,6 +153,39 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47  2010/02/16 15:02:31  shadzik
+- merged from DEVEL
+
+Revision 1.46.2.10  2010/02/12 08:02:23  arekm
+- up to 2.4.0.1
+
+Revision 1.46.2.9  2010/02/09 19:11:13  arekm
+- up to 2.4.0; require virtuoso instead of just suggesting it (virtuoso is important for kde nepomuk)
+
+Revision 1.46.2.8  2010/02/04 19:12:52  arekm
+- up to 2.3.73; drop java-sun Conflicts (no idea what it was here for)
+
+Revision 1.46.2.7  2010/02/04 14:30:06  arekm
+S lattest virtuoso
+
+Revision 1.46.2.6  2010/01/15 19:53:09  arekm
+S: virtuoso for virtuoso backend
+
+Revision 1.46.2.5  2010/01/08 09:38:07  arekm
+- revert virtuoso subpackage; libiodbc vs unixODBC conflicts solved at libiodbc side
+
+Revision 1.46.2.4  2010/01/08 09:21:34  arekm
+ move virtuoso backend to subpackage (as it requires libiodbc which conflicts with unixodbc)
+
+Revision 1.46.2.3  2009/12/01 19:08:57  shadzik
+- 2.3.70
+
+Revision 1.46.2.2  2009/10/31 10:44:58  cactus
+- virtuoso bcond (BR: libiodbc-devel)
+
+Revision 1.46.2.1  2009/10/28 23:42:17  shadzik
+- 2.3.2 snap
+
 Revision 1.46  2009/10/28 23:13:38  shadzik
 - 2.3.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/soprano/soprano.spec?r1=1.46&r2=1.47&f=u