update: akonadi, clucene-core, strigi, soprano

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4825 ec354946-7b23-47d6-9f5a-488ba84defc7

a/akonadi/akonadi-vl.spec

@@ -9,8 +9,8 @@
 Name:    akonadi
 Summary: PIM Storage Service
 Summary(ja): PIM ストレージサービス
-Version: 1.6.0
-Release: 2%{?_dist_release}
+Version: 1.6.1
+Release: 1%{?_dist_release}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -167,6 +167,9 @@ fi
 
 
 %changelog
+* Sun Sep 25 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.6.1-1
+- new upstream release
+
 * Sat Aug 20 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.6.0-2
 - rebuilt with soprano-2.7.0-2
 

c/clucene-core/clucene-core-vl.spec

@@ -1,20 +1,26 @@
-Summary: A C++ port of Lucene
 Name: clucene-core
-Version: 0.9.21b
-Release: 2%{?_dist_release}
-License: LGPL
+Summary: A C++ port of Lucene
+Version: 2.3.3.4
+Release: 1%{?_dist_release}
+
+License: LGPLv2+ or ASL 2.0
 Group: System Environment/Libraries
-Source: %{name}-%{version}.tar.bz2
 URL: http://sourceforge.net/projects/clucene
 
+Source: %{name}-%{version}.tar.gz
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: doxygen
+BuildRequires: cmake
+BuildRequires: gawk
+BuildRequires: libboost-devel
+BuildRequires: zlib-devel
 
 %description
-CLucene is a C++ port of Lucene.
-It is a high-performance, full-featured text search
-engine written in C++. CLucene is faster than lucene
-as it is written in C++.
+CLucene is a C++ port of the popular Apache Lucene search engine
+(http://lucene.apache.org/java). 
+CLucene aims to be a high-speed alternative to Java Lucene, its API is very
+similar to that of the Java version. CLucene has recently been brought up to
+date with Lucene 2.3.2. It contains most of the same functionality as the Java version.
 
 %package devel
 Summary: Headers for developing programs that will use %{name}
@@ -22,46 +28,71 @@ Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description devel
-This package contains header files needed for developing with clucene
+This package contains the static libraries and header files needed for
+developing with clucene
 
 %prep
 %setup -q 
 
 %build
-%configure --disable-static
-make
-make doxygen
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+export CFLAGS="%{optflags}"
+export CXXFLAGS="%{optflags}"
+export FFLAGS="%{optflags}"
+%ifarch x86_64 ppc64
+%define lib_suffix 64
+%else
+%define lib_suffix %{nil}
+%endif
+%cmake \
+    -DCMAKE_INSTALL_PREFIX=%{_prefix}				\
+    -DLIB_DESTINATION=%{_libdir}  -DLIB_SUFFIX=%{lib_suffix}	\
+    -DLUCENE_SYS_INCLUDES=%{_libdir}				\
+    ..
+popd
+
+make VERBOSE=1 %{?_smp_mflags} -C %{_target_platform}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT install -C %{_target_platform}
 
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -rf $RPM_BUILD_ROOT%{_libdir}/CLuceneConfig.cmake
+#rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
+
+#check
+#cd %{_target_platform}
+#make cl_test
+#make test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%check
-make check
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog README
-%{_libdir}/*.so.*
+%doc APACHE.license AUTHORS ChangeLog COPYING LGPL.license README
+%{_libdir}/libclucene*.so.*
 
 %files devel
 %defattr(-,root,root)
-%doc doc/html/*
+%dir %{_includedir}/CLucene
+%dir %{_libdir}/CLucene
+%{_includedir}/CLucene/*
 %{_includedir}/CLucene.h
-%{_includedir}/CLucene
+%{_libdir}/libclucene*.so
 %{_libdir}/CLucene/clucene-config.h
-%{_libdir}/*.so
+%{_libdir}/CLucene/CLuceneConfig.cmake
+%{_libdir}/pkgconfig/libclucene-core.pc
 
 %changelog
+* Sat Sep 24 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.3.3.4-1
+- new upstream release
+
 * Mon Oct 19 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.9.21b-2
 - run make check at %%check
 

s/soprano/soprano-vl.spec

@@ -1,8 +1,8 @@
 Name:      soprano
 Summary:   the Qt/C++ RDF framework
 Summary(ja): Qt/C++ RDF フレームワーク
-Version:   2.7.0
-Release:   2%{?_dist_release}
+Version:   2.7.1
+Release:   1%{?_dist_release}
 
 License:   LGPLv2+
 Group:     System Environment/Libraries
@@ -14,7 +14,7 @@ Source:    %{name}-%{version}.tar.bz2
 Patch50: soprano-2.5.63-rpath.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: clucene-core-devel >= 0.9.20
+BuildRequires: clucene-core-devel >= 2.3.3.4
 BuildRequires: cmake
 # for backends/virtuoso
 BuildRequires: libiodbc-devel
@@ -108,6 +108,10 @@ make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
 
 %changelog
+* Sun Sep 25 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.7.1-1
+- new upstream release
+- built with clucne-core-2.3.3.4
+
 * Fri Aug 19 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.7.0-2
 - rebuilt with new raptor2, rasqal and redland
 

s/strigi/strigi-vl.spec

@@ -1,30 +1,35 @@
 Name:		strigi
-Summary:	A desktop search program for KDE
-Summary(ja):	KDE 用のデスクトップ検索プログラム
-Version:	0.7.2
-Release:	5%{?_dist_release}
+Summary:	A desktop search program
+Summary(ja):	デスクトップ検索プログラム
+Version:	0.7.5
+Release:	1%{?_dist_release}
 
 Group:		Applications/Productivity
-License:	LGPL
-URL:		http://strigi.sourceforge.net/
+License:	LGPLv2+
+#URL:		http://strigi.sourceforge.net/
+URL:            http://www.vandenoever.info/software/strigi/
 
-Source0:	strigi-%{version}.tar.bz2
+Source0:	http://www.vandenoever.info/software/strigi/strigi-%{version}.tar.bz2
 Source1:	strigiclient.desktop
 Source2:	strigi-daemon.desktop
-Patch0:		strigi-0.6.2-multilib.patch
+
+## upstreamable patches
+# exlicitly mark convenience libs static
+Patch50: 	strigi-0.7.5-static_convenience_libs.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
-BuildRequires:	cmake >= 2.4.5
-BuildRequires:	exiv2-devel >= 0.12
-BuildRequires:	clucene-core-devel
-BuildRequires:	qt4-devel
-BuildRequires:	dbus-devel
-BuildRequires:	expat-devel
-BuildRequires:	libxml2-devel
+BuildRequires:	bison
 BuildRequires:	bzip2-devel
-BuildRequires:	zlib-devel
-BuildRequires:	gamin-devel
+BuildRequires:	cmake >= 2.6.0
+#BuildRequires:	clucene-core-devel
+BuildRequires:	cppunit-devel
+BuildRequires:	dbus-devel dbus-x11
 BuildRequires:	desktop-file-utils
+BuildRequires:	exiv2-devel
+BuildRequires:	gamin-devel
+BuildRequires:	libxml2-devel
+BuildRequires:	qt4-devel
+BuildRequires:	zlib-devel
 
 %description
 Strigi is a fast and light desktop search engine. It can handle a large range
@@ -59,7 +64,7 @@ Development files for the strigi desktop search engine
 
 %prep
 %setup -q
-%patch0 -p1 -b .multilibs
+%patch50 -p1 -b .static_convenience_libs
 
 %build
 mkdir build
@@ -76,31 +81,31 @@ cmake \
     -DCMAKE_INSTALL_PREFIX=%{_prefix} \
     -DLIB_DESTINATION=%{_libdir} \
     -DLIB_SUFFIX=%{lib_suffix} \
-    -DENABLE_EXPAT:BOOL=ON \
-    -DENABLE_INOTIFY:BOOL=ON \
+    -DENABLE_CLUCENE:BOOL=OFF \
+    -DENABLE_CLUCENE_NG:BOOL=OFF \
     -DENABLE_DBUS:BOOL=ON \
     -DENABLE_FAM:BOOL=ON \
+    -DENABLE_FFMPEG:BOOL=OFF \
+    -DENABLE_INOTIFY:BOOL=ON \
+    %{?_cmake_skip_rpath} \
     ..
 make VERBOSE=1 %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 cd build
-make DESTDIR=%{buildroot} install
+make DESTDIR=$RPM_BUILD_ROOT install
 
 desktop-file-install \
 	--vendor="" \
-	--dir=%{buildroot}%{_datadir}/applications \
+	--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
 	%{SOURCE1}
 
 # Add an autostart desktop file for the strigi daemon
-mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart
-cp -pr %{SOURCE2} %{buildroot}%{_sysconfdir}/xdg/autostart/
-
-find %{buildroot}%{_libdir} -type f -name "*.so*" -exec chmod 755 {} ';'
+install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/strigi-daemon.desktop
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %post libs -p /sbin/ldconfig
 
@@ -108,27 +113,36 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README TODO
+%doc AUTHORS COPYING ChangeLog
+%{_sysconfdir}/xdg/autostart/strigi-daemon.desktop
 %{_bindir}/*
 %{_datadir}/applications/strigiclient.desktop
-%{_sysconfdir}/xdg/autostart/strigi-daemon.desktop
-%{_datadir}/strigi
 %{_datadir}/dbus-1/services/*
+%{_datadir}/strigi
+#{_libdir}/strigi/strigiindex_clucene.so
 
 %files libs
 %defattr(-,root,root,-)
 %{_libdir}/*.so.*
 %{_libdir}/strigi
 %exclude %{_libdir}/strigi/*.cmake
+#exclude %{_libdir}/strigi/strigiindex_clucene.so
 
 %files devel
 %defattr(-,root,root,-)
+%{_includedir}/strigi
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/libstream*.pc
 %{_libdir}/strigi/*.cmake
-%{_includedir}/strigi
+%{_libdir}/libsearchclient/*.cmake
+%{_libdir}/libstreamanalyzer/*.cmake
+%{_libdir}/libstreams/*.cmake
 
 %changelog
+* Sun Sep 25 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.7.5-1
+- updated to 0.7.5
+- dropt clucene support
+
 * Sun Jul 31 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.7.2-5
 - rebuilt with exiv2-0.21.1