rpms/strigi/F-10 strigi-gcc44.patch, NONE, 1.1 sources, 1.12, 1.13 strigi-daemon.desktop, 1.1, 1.2 strigi.spec, 1.23, 1.24 strigiclient.desktop, 1.1, 1.2

[Lukas Tinkl]

Author: ltinkl

Update of /cvs/extras/rpms/strigi/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3886/F-10

Modified Files:
	sources strigi-daemon.desktop strigi.spec strigiclient.desktop 
Added Files:
	strigi-gcc44.patch 
Log Message:
Strigi 0.6.4 (sync with devel)


strigi-gcc44.patch:

--- NEW FILE strigi-gcc44.patch ---
--- src/luceneindexer/jsgzipcompressstream.h	2009-02-01 14:55:38.000000000 -0500
+++ src/luceneindexer/jsgzipcompressstream.h.new	2009-02-04 15:59:47.853800775 -0500
@@ -20,6 +20,7 @@
 #ifndef GZIPCOMPRESSSTREAM_H
 #define GZIPCOMPRESSSTREAM_H
 
+#include <cstdio>
 #include <strigi/strigiconfig.h>   // (u)int64_t
 #include <CLucene/util/streambase.h>
 #include <CLucene/util/bufferedstream.h>
--- src/daemon/strigithread.cpp	2009-02-01 14:56:01.000000000 -0500
+++ src/daemon/strigithread.cpp.new	2009-02-04 15:10:27.600054542 -0500
@@ -27,6 +27,7 @@
 #include <signal.h>
 #include <vector>
 #include <stdlib.h>
+#include <cstdio>
 #include <unistd.h>
 #include <sys/resource.h>
 #include <sys/syscall.h>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/strigi/F-10/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	23 Jan 2009 16:50:46 -0000	1.12
+++ sources	5 Mar 2009 12:43:05 -0000	1.13
@@ -1 +1 @@
-52787a80278d24b0ee552b81bbf547aa  strigi-0.6.3.tar.bz2
+324fd9606ac77765501717ff92c04f9a  strigi-0.6.4.tar.bz2


Index: strigi-daemon.desktop
===================================================================
RCS file: /cvs/extras/rpms/strigi/F-10/strigi-daemon.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- strigi-daemon.desktop	17 May 2007 01:54:05 -0000	1.1
+++ strigi-daemon.desktop	5 Mar 2009 12:43:05 -0000	1.2
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Strigi
 Comment=strigi search engine daemon
 Icon=
@@ -10,4 +9,4 @@
 X-KDE-autostart-after=panel
 X-KDE-StartupNotify=false
 X-KDE-UniqueApplet=true
-NoDisplay=true
+#NoDisplay=true


Index: strigi.spec
===================================================================
RCS file: /cvs/extras/rpms/strigi/F-10/strigi.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- strigi.spec	23 Jan 2009 16:50:46 -0000	1.23
+++ strigi.spec	5 Mar 2009 12:43:05 -0000	1.24
@@ -1,7 +1,7 @@
 Name:		strigi
-Version:	0.6.3
-Release:	1%{?dist}
-Summary:	A desktop search program for KDE
+Version:	0.6.4
+Release:	3%{?dist}
+Summary:	A desktop search program
 Group:		Applications/Productivity
 License:	LGPLv2+
 URL:		http://www.vandenoever.info/software/strigi
@@ -9,6 +9,7 @@
 Source1:	strigiclient.desktop
 Source2:	strigi-daemon.desktop
 Patch0:		strigi-0.6.2-multilib.patch
+Patch1:		strigi-gcc44.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake >= 2.4.5
@@ -52,6 +53,7 @@
 %prep
 %setup -q 
 %patch0 -p1 -b .multilib
+%patch1 -p0 -b .gcc44
 
 %build
 mkdir -p %{_target_platform}
@@ -93,20 +95,34 @@
 %{_datadir}/applications/*strigiclient.desktop
 %{_datadir}/dbus-1/services/*.service
 %{_sysconfdir}/xdg/autostart/strigi-daemon.desktop
-%{_datadir}/strigi/
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/*.so
+%{_libdir}/lib*.so
 %{_libdir}/pkgconfig/libstream*.pc
+%{_libdir}/strigi/*.cmake
 %{_includedir}/strigi/
 
 %files libs
 %defattr(-,root,root,-)
-%{_libdir}/*.so.*
+%{_datadir}/strigi/
+%{_libdir}/lib*.so.*
 %{_libdir}/strigi/
+%exclude %{_libdir}/strigi/*.cmake
 
 %changelog
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Feb 04 2009 Deji Akingunola <dakingun at gmail.com> - 0.6.4-2
+- Add patch to build with gcc-4.4
+
+* Mon Feb 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.6.4-1
+- strigi-0.6.4
+- Summary: s/for KDE//
+- *.desktop: validate, remove OnlyShowIn=KDE
+- -devel: move *.cmake here
+
 * Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.6.3-1
 - strigi-0.6.3
 


Index: strigiclient.desktop
===================================================================
RCS file: /cvs/extras/rpms/strigi/F-10/strigiclient.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- strigiclient.desktop	5 May 2007 16:21:53 -0000	1.1
+++ strigiclient.desktop	5 Mar 2009 12:43:05 -0000	1.2
@@ -1,9 +1,7 @@
 [Desktop Entry]
-Encoding=UTF-8
 Type=Application
 Icon=
 Exec=/usr/bin/strigiclient
 Name=strigi client
 Comment=Strigi daemon configuration tool
 Categories=Qt;KDE;Settings;
-OnlyShowIn=KDE;