rpms/strigi/F-9 strigi-0.5.11-to-0.5.11.1.diff, NONE, 1.1 strigi-multilib-fix.patch, 1.1, 1.2 strigi.spec, 1.17, 1.18

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/strigi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15994/F-9

Modified Files:
	strigi-multilib-fix.patch strigi.spec 
Added Files:
	strigi-0.5.11-to-0.5.11.1.diff 
Log Message:
Sync from devel:

* Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.5.11.1-2 
- respin (exiv2)

* Thu Nov 27 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 0.5.11.1-1
- drop _default_patch_fuzz
- rebase strigi-multilib patch
- No official 0.5.11.1 tarballs were released but we need 0.5.11.1, apply a
  diff between 0.5.11 and 0.5.11.1 svn tags

strigi-0.5.11-to-0.5.11.1.diff:

--- NEW FILE strigi-0.5.11-to-0.5.11.1.diff ---
Index: src/streamanalyzer/CMakeLists.txt
===================================================================
--- src/streamanalyzer/CMakeLists.txt	(.../0.5.11)	(revision 889853)
+++ src/streamanalyzer/CMakeLists.txt	(.../0.5.11.1)	(revision 889853)
@@ -98,6 +98,7 @@
 	indexreader.h
 	indexmanager.h
 	indexplugin.h
+	indexpluginloader.h
 	indexwriter.h
 	variant.h
 	query.h

strigi-multilib-fix.patch:

Index: strigi-multilib-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-9/strigi-multilib-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- strigi-multilib-fix.patch	30 Oct 2007 17:24:34 -0000	1.1
+++ strigi-multilib-fix.patch	1 Jan 2009 22:46:02 -0000	1.2
@@ -1,5 +1,6 @@
---- src/streams/strigi/strigiconfig.h.cmake	2007-10-26 08:25:47.000000000 -0400
-+++ src/streams/strigi/strigiconfig.h.cmake.new	2007-10-30 09:10:38.000000000 -0400
+diff -Naur strigi-0.5.11/src/streams/strigi/strigiconfig.h.cmake strigi-0.5.11.multilib-fix/src/streams/strigi/strigiconfig.h.cmake
+--- strigi-0.5.11/src/streams/strigi/strigiconfig.h.cmake	2008-07-20 16:54:29.000000000 +0200
++++ strigi-0.5.11.multilib-fix/src/streams/strigi/strigiconfig.h.cmake	2008-11-27 22:45:05.000000000 +0100
 @@ -44,104 +44,6 @@
  #  include <stddef.h>
  #endif
@@ -104,4 +105,4 @@
 -
  #cmakedefine __STRIGI_HAVE_GCC_VISIBILITY
  
- #cmakedefine ENABLE_NEWXESAM
+ /**


Index: strigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-9/strigi.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- strigi.spec	20 Jul 2008 18:15:03 -0000	1.17
+++ strigi.spec	1 Jan 2009 22:46:02 -0000	1.18
@@ -1,16 +1,15 @@
-%define _default_patch_fuzz 2
-
 Name:		strigi
-Version:	0.5.11
-Release:	1%{?dist}
+Version:	0.5.11.1
+Release:	2%{?dist}
 Summary:	A desktop search program for KDE
 Group:		Applications/Productivity
 License:	LGPLv2+
 URL:		http://www.vandenoever.info/software/strigi
-Source0:	http://www.vandenoever.info/software/strigi/strigi-%{version}.tar.bz2
+Source0:	http://www.vandenoever.info/software/strigi/strigi-0.5.11.tar.bz2
 Source1:	strigiclient.desktop
 Source2:	strigi-daemon.desktop
 Patch0:		strigi-multilib-fix.patch
+Patch1:     strigi-0.5.11-to-0.5.11.1.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake >= 2.4.5
@@ -50,8 +49,9 @@
 Strigi search engine libraries
 
 %prep
-%setup -q
-%patch0 -p0 -b .multilibs
+%setup -q -n strigi-0.5.11
+%patch0 -p1 -b .multilibs
+%patch1 -p0 -b .0.5.11-to-0.5.11.1
 
 %build
 mkdir fedora
@@ -117,6 +117,15 @@
 %{_libdir}/strigi/
 
 %changelog
+* Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.5.11.1-2 
+- respin (exiv2)
+
+* Thu Nov 27 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 0.5.11.1-1
+- drop _default_patch_fuzz
+- rebase strigi-multilib patch
+- No official 0.5.11.1 tarballs were released but we need 0.5.11.1, apply a
+  diff between 0.5.11 and 0.5.11.1 svn tags
+
 * Sun Jul 20 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.5.11-1
 - Update to 0.5.11
 - Drop compile-fix and lucenetest_fix patches (fixed upstream)
@@ -146,7 +155,7 @@
 
 * 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) 
+- 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