rpms/strigi/F-8 strigi-gcc43.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 strigi.spec, 1.12, 1.13 strigi-0.5.5-fix-sonames.diff, 1.1, NONE

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/strigi/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22958/F-8

Modified Files:
	.cvsignore sources strigi.spec 
Added Files:
	strigi-gcc43.patch 
Removed Files:
	strigi-0.5.5-fix-sonames.diff 
Log Message:
Sync from devel:

* Thu Feb 21 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.5.8-1
- Update to 0.5.8
- Fix LIB_DESTINATION (#433627)

* Sat Feb 09 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.5.7-4
- Rebuild for GCC 4.3

* Fri Jan 11 2008 Deji Akingunola <dakingun at gmail.com> - 0.5.7-3
- Fix build failure with gcc-4.3

* Tue Nov 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.5.7-2
- Rebuild for new exiv2

strigi-gcc43.patch:

--- NEW FILE strigi-gcc43.patch ---
--- src/daemon/eventlistener/inotifylistener.cpp	2007-10-26 08:25:43.000000000 -0400
+++ src/daemon/eventlistener/inotifylistener.cpp.new	2008-01-11 07:52:20.000000000 -0500
@@ -28,6 +28,8 @@
 #include "../strigilogging.h"
 
 #include <cerrno>
+#include <string.h>
+#include <algorithm>
 #include <sys/resource.h>
 #include <sys/select.h>
 #include <sys/types.h>
--- tests/test_runner.cpp	2007-10-26 08:25:47.000000000 -0400
+++ tests/test_runner.cpp.new	2008-01-11 07:32:21.000000000 -0500
@@ -27,6 +27,7 @@
 #include "config.h"
 
 #include <iostream>
+#include <stdlib.h>
 using namespace std;
 
 int main() {
--- src/luceneindexer/luceneindexer.cpp	2007-10-26 08:25:39.000000000 -0400
+++ src/luceneindexer/luceneindexer.cpp.new	2008-01-11 08:18:47.000000000 -0500
@@ -25,6 +25,7 @@
 #include <sys/types.h>
 #include <stgdirent.h>
 #include <string.h>
+#include <stdlib.h>
 
 using namespace std;
 
--- tests/streamanalyzer/xesam/xesam2strigitest.cpp	2007-10-26 08:25:47.000000000 -0400
+++ tests/streamanalyzer/xesam/xesam2strigitest.cpp.new	2008-01-11 08:46:22.000000000 -0500
@@ -24,6 +24,7 @@
 #include <errno.h>
 #include <fstream>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 using namespace std;
--- tests/indextesters/indextest.cpp	2007-10-26 08:25:47.000000000 -0400
+++ tests/indextesters/indextest.cpp.new	2008-01-11 08:53:19.000000000 -0500
@@ -20,6 +20,7 @@
 #include "indextest.h"
 #include "indexmanager.h"
 #include "indexpluginloader.h"
+#include <stdlib.h>
 
 using namespace std;
 using namespace Strigi;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-8/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	31 Oct 2007 13:22:24 -0000	1.6
+++ .cvsignore	21 Feb 2008 10:41:48 -0000	1.7
@@ -1 +1 @@
-strigi-0.5.7.tar.bz2
+strigi-0.5.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-8/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Oct 2007 13:22:24 -0000	1.6
+++ sources	21 Feb 2008 10:41:48 -0000	1.7
@@ -1 +1 @@
-01015166eb49a523219d3b1d7e46b672  strigi-0.5.7.tar.bz2
+2e8034ab85b91bd7fbc1b0aa296135a9  strigi-0.5.8.tar.bz2


Index: strigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-8/strigi.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- strigi.spec	20 Feb 2008 14:09:04 -0000	1.12
+++ strigi.spec	21 Feb 2008 10:41:48 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		strigi
-Version:	0.5.7
-Release:	2%{?dist}
+Version:	0.5.8
+Release:	1%{?dist}
 Summary:	A desktop search program for KDE
 Group:		Applications/Productivity
 License:	LGPLv2+
@@ -9,13 +9,14 @@
 Source1:	strigiclient.desktop
 Source2:	strigi-daemon.desktop
 Patch0:		strigi-multilib-fix.patch
+Patch1:		strigi-gcc43.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake >= 2.4.5
 BuildRequires:	clucene-core-devel qt4-devel dbus-devel
 BuildRequires:	libxml2-devel expat-devel bzip2-devel zlib-devel
 BuildRequires:	cppunit-devel exiv2-devel
-BuildRequires:	bison
+BuildRequires:  bison
 BuildRequires:	desktop-file-utils
 
 %description
@@ -50,6 +51,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .multilibs
+%patch1 -p0 -b .gcc43
 
 %build
 mkdir fedora
@@ -63,7 +65,7 @@
 %define lib_suffix %{nil}
 %endif
 cmake	-DCMAKE_INSTALL_PREFIX=%{_prefix}	\
-	-DLIB_DESTINATION=lib%{lib_suffix}	\
+	-DLIB_DESTINATION=%{_libdir}		\
 	-DLIB_SUFFIX=%{lib_suffix}		\
 	-DENABLE_INOTIFY:BOOL=ON -DENABLE_DBUS:BOOL=ON ..
 make VERBOSE=1 %{?_smp_mflags}
@@ -112,19 +114,22 @@
 %{_libdir}/strigi/
 
 %changelog
-* Wed Feb 20 2008 Deji Akingunola <dakingun at gmail.com> - 0.5.7-2
-- Rebuild for current clucene
+* Thu Feb 21 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.5.8-1
+- Update to 0.5.8
+- Fix LIB_DESTINATION (#433627)
 
-* Tue Oct 30 2007 Deji Akingunola <dakingun at gmail.com> - 0.5.7-1
-- Update to 0.5.7 release
-- Fix multilibs conflict (Bug #343221, patch by Kevin Kofler)
+* Sat Feb 09 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.5.7-4
+- Rebuild for GCC 4.3
+
+* Fri Jan 11 2008 Deji Akingunola <dakingun at gmail.com> - 0.5.7-3
+- Fix build failure with gcc-4.3
 
-* Mon Oct 29 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.5.5-2.1
-- Apply plugin soname patch to actually fix dangling symlink issue
-- Move ldconfig calls to -libs subpackage
+* Tue Nov 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.5.7-2
+- Rebuild for new exiv2
 
-* Mon Oct 29 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.5.5-2.1
-- Rebuild in an attempt to fix dangling symlinks
+* Tue Oct 30 2007 Deji Akingunola <dakingun at gmail.com> - 0.5.7-1
+- Update to 0.5.7 release
+- Fix multilibs conflict (Bug #343221, patch by Kevin Kofler) 
 
 * Sun Sep 09 2007 Deji Akingunola <dakingun at gmail.com> - 0.5.5-2
 - Rebuild for BuildID changes


--- strigi-0.5.5-fix-sonames.diff DELETED ---