rpms/soprano/F-11 soprano-2.2.69-cmake_DATA_INSTALL_DIR.patch, NONE, 1.1 soprano-svn_checkout.sh, NONE, 1.1 .cvsignore, 1.19, 1.20 soprano.spec, 1.32, 1.33 sources, 1.19, 1.20

[Lukas Tinkl]

Author: ltinkl

Update of /cvs/extras/rpms/soprano/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13320/F-11

Modified Files:
	.cvsignore soprano.spec sources 
Added Files:
	soprano-2.2.69-cmake_DATA_INSTALL_DIR.patch 
	soprano-svn_checkout.sh 
Log Message:
sync Soprano 2.3.0 with devel


soprano-2.2.69-cmake_DATA_INSTALL_DIR.patch:
 CMakeLists.txt |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE soprano-2.2.69-cmake_DATA_INSTALL_DIR.patch ---
diff -up soprano-2.2.69/cmake/modules/CMakeLists.txt.cmake_DATA_INSTALL_DIR soprano-2.2.69/cmake/modules/CMakeLists.txt
--- soprano-2.2.69/cmake/modules/CMakeLists.txt.cmake_DATA_INSTALL_DIR	2009-06-23 14:45:40.000000000 -0500
+++ soprano-2.2.69/cmake/modules/CMakeLists.txt	2009-06-26 09:32:48.946251752 -0500
@@ -1,5 +1,14 @@
+
+
+# Doesn't work, needs love (remove?) -- Rex
+FIND_PACKAGE(KDE4Internal)
+
+IF (NOT DATA_INSTALL_DIR)
+SET( DATA_INSTALL_DIR share/apps)
+ENDIF (NOT DATA_INSTALL_DIR)
+
 install(FILES
   SopranoAddOntology.cmake
   DESTINATION
-  share/apps/cmake/modules
+  ${DATA_INSTALL_DIR}/cmake/modules
 )


--- NEW FILE soprano-svn_checkout.sh ---
#/bin/sh

DATE=$(date +%Y%m%d)
EXPORT_DIR=soprano

set -x
rm -rf $EXPORT_DIR
# app
svn export svn://anonsvn.kde.org/home/kde/trunk/kdesupport/soprano $EXPORT_DIR/

tar cjf $EXPORT_DIR-${DATE}svn.tar.bz2 $EXPORT_DIR

# cleanup
rm -rf $EXPORT_DIR



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/soprano/F-11/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	26 Jun 2009 14:51:04 -0000	1.19
+++ .cvsignore	30 Jul 2009 20:05:57 -0000	1.20
@@ -1 +1 @@
-soprano-2.2.4.tar.bz2
+soprano-2.3.0.tar.bz2


Index: soprano.spec
===================================================================
RCS file: /cvs/extras/rpms/soprano/F-11/soprano.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- soprano.spec	26 Jun 2009 14:51:05 -0000	1.32
+++ soprano.spec	30 Jul 2009 20:05:57 -0000	1.33
@@ -2,25 +2,31 @@
 # fedora review: http://bugzilla.redhat.com/248120
 
 # set this to 0 to disable -apidocs for a faster build
-%define apidocs 1
+%define apidocs 1 
 
 Summary: Qt wrapper API to different RDF storage solutions
 Name:    soprano
-Version: 2.2.4
-Release: 1%{?dist}
+Version: 2.3.0
+Release: 2%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://sourceforge.net/projects/soprano
 Source0: http://downloads.sf.net/soprano/soprano-%{version}.tar.bz2
+Source1: soprano-svn_checkout.sh 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstreamable patches
+Patch50: soprano-2.2.69-cmake_DATA_INSTALL_DIR.patch
+
+BuildRequires: clucene-core-devel >= 0.9.20-2
 BuildRequires: cmake
+BuildRequires: kde-filesystem
+# for backends/virtuoso
+#BuildRequires: libiodbc-devel
+BuildRequires: qt4-devel
 BuildRequires: redland-devel >= 1.0.6
 BuildRequires: raptor-devel >= 1.4.15
-BuildRequires: qt4-devel
-# older packages had clucene-config.h in the wrong place
-BuildRequires: clucene-core-devel >= 0.9.20-2
 
 %if "%{?apidocs}" == "1"
 BuildRequires: doxygen
@@ -43,8 +49,10 @@ Requires: pkgconfig
 %package apidocs
 Group: Development/Documentation
 Summary: Soprano API documentation
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}
+Requires: %{name} = %{version}
 %if 0%{?fedora} > 9
+# help workaround yum bug http://bugzilla.redhat.com/502401
+Obsoletes: soprano-apidocs < 2.2.3-2 
 BuildArch: noarch
 %endif
 
@@ -56,17 +64,28 @@ format for easy browsing.
 %prep
 %setup -q -n soprano-%{version}
 
+%patch50 -p1 -b .cmake_DATA_INSTALL_DIR
+
 
 %build
 
-%cmake . -DQT_DOC_DIR=`pkg-config --variable=docdir Qt` -DSOPRANO_BUILD_API_DOCS:BOOL=%{?apidocs}
-make %{?_smp_mflags}
+
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake} \
+  -DDATA_INSTALL_DIR:PATH=%{_kde4_appsdir} \
+  -DQT_DOC_DIR=`pkg-config --variable=docdir Qt` \
+  -DSOPRANO_BUILD_API_DOCS:BOOL=%{?apidocs} \
+  .. 
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
 
 %clean
@@ -94,6 +113,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
+%{_kde4_appsdir}/cmake/modules/SopranoAddOntology.cmake
 %{_libdir}/libsoprano*.so
 %{_libdir}/pkgconfig/soprano.pc
 %{_includedir}/soprano/
@@ -102,13 +122,26 @@ rm -rf $RPM_BUILD_ROOT
 %if "%{?apidocs}" == "1"
 %files apidocs
 %defattr(-,root,root,-)
-%doc docs/html
+%doc %{_target_platform}/docs/html
 %endif
 
 
 %changelog
-* Fri Jun 26 2009 Rex Dieter <rdieter at fedoraproject.or> - 2.2.4-1
-- soprano-2.2.4
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.3.0-1
+- soprano-2.3.0
+- upstream dropped virtuoso backend  ):
+
+* Fri Jun 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.2.69-1
+- soprano-2.2.69
+
+* Tue Jun 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.2.67-2
+- upstream soprano-2.2.67 tarball
+
+* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.2.67-1
+- soprano-2.2.67, 20090603 snapshot from kdesupport 
 
 * Wed May  6 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.2.3-2
 - %%files: drop ownership of %%_datadir/dbus-1.0/interfaces (#334681)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/soprano/F-11/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	26 Jun 2009 14:51:05 -0000	1.19
+++ sources	30 Jul 2009 20:05:57 -0000	1.20
@@ -1 +1 @@
-3cb3047ff897c003c9140ed5d21c0352  soprano-2.2.4.tar.bz2
+286d5d37c1d4f070527758e79706d1a7  soprano-2.3.0.tar.bz2