rpms/soprano/devel soprano-2.2.69-cmake_DATA_INSTALL_DIR.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 soprano.spec, 1.34, 1.35 sources, 1.20, 1.21

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore soprano.spec sources 
Added Files:
	soprano-2.2.69-cmake_DATA_INSTALL_DIR.patch 
Log Message:
* Fri Jun 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.2.69-1
- soprano-2.2.69


soprano-2.2.69-cmake_DATA_INSTALL_DIR.patch:

--- 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
 )


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	9 Jun 2009 12:01:37 -0000	1.20
+++ .cvsignore	26 Jun 2009 14:40:56 -0000	1.21
@@ -1 +1 @@
-soprano-2.2.67.tar.bz2
+soprano-2.2.69.tar.bz2


Index: soprano.spec
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/devel/soprano.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- soprano.spec	9 Jun 2009 12:01:37 -0000	1.34
+++ soprano.spec	26 Jun 2009 14:40:57 -0000	1.35
@@ -4,28 +4,28 @@
 # set this to 0 to disable -apidocs for a faster build
 %define apidocs 1 
 
-#define snap 20090603svn
-
 Summary: Qt wrapper API to different RDF storage solutions
 Name:    soprano
-Version: 2.2.67
-Release: 2%{?dist}
+Version: 2.2.69
+Release: 1%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://sourceforge.net/projects/soprano
-Source0:  ftp://ftp.kde.org/pub/kde/unstable/4.2.90/src/soprano-%{version}.tar.bz2
-#Source0: http://downloads.sf.net/soprano/soprano-%{version}.tar.bz2
-#Source0: soprano-%{snap}.tar.bz2
+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
+BuildRequires: libiodbc-devel
+BuildRequires: qt4-devel
 BuildRequires: redland-devel >= 1.0.6
 BuildRequires: raptor-devel >= 1.4.15
-BuildRequires: qt4-devel
-BuildRequires: clucene-core-devel >= 0.9.20-2
-BuildRequires: libiodbc-devel
 
 %if "%{?apidocs}" == "1"
 BuildRequires: doxygen
@@ -63,6 +63,8 @@ format for easy browsing.
 %prep
 %setup -q -n soprano-%{version}
 
+%patch50 -p1 -b .cmake_DATA_INSTALL_DIR
+
 
 %build
 
@@ -70,6 +72,7 @@ format for easy browsing.
 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} \
   .. 
@@ -109,6 +112,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/
@@ -122,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	9 Jun 2009 12:01:37 -0000	1.20
+++ sources	26 Jun 2009 14:40:57 -0000	1.21
@@ -1 +1 @@
-c8b1cc90517c7f6c6abff4ae1536e18c  soprano-2.2.67.tar.bz2
+52b6e853cc09aeb0ac775ee08000fd45  soprano-2.2.69.tar.bz2