rpms/strigi/devel strigi-multilib-fix.patch, 1.2, 1.3 strigi.spec, 1.22, 1.23

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	strigi.spec 
Added Files:
	strigi-multilib-fix.patch 
Log Message:
* Fri Oct 17 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.6.0-0.2.20081017svn870916
- Restore and update multilib patch (is still and will most likely always be needed)

strigi-multilib-fix.patch:

Index: strigi-multilib-fix.patch
===================================================================
RCS file: strigi-multilib-fix.patch
diff -N strigi-multilib-fix.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ strigi-multilib-fix.patch	17 Oct 2008 20:38:17 -0000	1.3
@@ -0,0 +1,108 @@
+diff -ur strigi-0.6.0.20081017svn870916/src/streams/strigi/strigiconfig.h.cmake strigi-0.6.0.20081017svn870916-multilib-fix/src/streams/strigi/strigiconfig.h.cmake
+--- strigi-0.6.0.20081017svn870916/src/streams/strigi/strigiconfig.h.cmake	2008-10-13 14:35:06.000000000 +0200
++++ strigi-0.6.0.20081017svn870916-multilib-fix/src/streams/strigi/strigiconfig.h.cmake	2008-10-17 22:33:58.000000000 +0200
+@@ -83,104 +83,6 @@
+ #  include <stddef.h>
+ #endif
+ 
+-// our needed types
+-#if !@HAVE_INT8_T@
+- #define HAVE_INT8_T 1
+- #if ${SIZEOF_CHAR}==1 //is char one byte?
+-  typedef signed char int8_t;
+- #else
+-  #error Could not determine type for int8_t!
+- #endif
+-#endif
+-
+-#if !@HAVE_UINT8_T@
+- #define HAVE_UINT8_T 1
+- #if ${SIZEOF_CHAR}==1 //is char one byte?
+-  typedef unsigned char uint8_t;
+- #else
+-  #error Could not determine type for uint8_t!
+- #endif
+-#endif
+-
+-#if !@HAVE_INT16_T@
+- #define HAVE_INT16_T 1
+- #if ${SIZEOF_SHORT}==2 //is short two bytes?
+-  typedef short int16_t;
+- #else
+-  #error Could not determine type for int16_t!
+- #endif
+-#endif
+-
+-#if !@HAVE_UINT16_T@
+- #define HAVE_UINT16_T 1
+- #if ${SIZEOF_SHORT}==2 //is short two bytes?
+-  typedef unsigned short uint16_t;
+- #else
+-  #error Could not determine type for uint16_t!
+- #endif
+-#endif
+-
+-#if !@HAVE_INT32_T@
+- #define HAVE_INT32_T 1
+- #if ${SIZEOF_INT}==4 //is int four bytes?
+-  typedef int int32_t;
+- #elif ${SIZEOF_LONG}==4 //is long four bytes?
+-  typedef long int32_t;
+- #else
+-  #error Could not determine type for int32_t!
+- #endif
+-#endif
+-
+-#if !@HAVE_UINT32_T@
+- #define HAVE_UINT32_T 1
+- #if ${SIZEOF_INT}==4 //is int four bytes?
+-  typedef unsigned int uint32_t;
+- #elif ${SIZEOF_LONG}==4 //is long four bytes?
+-  typedef unsigned long uint32_t;
+- #else
+-  #error Could not determine type for uint32_t!
+- #endif
+-#endif
+-
+-#if !@HAVE_INT64_T@
+- #define HAVE_INT64_T 1
+- #if ${SIZEOF_LONG}==8
+-  typedef long int64_t;
+- #elif ${SIZEOF_LONGLONG}==8
+-  typedef long long int64_t; 
+- #else
+-  #error Could not determine type for int64_t!
+- #endif
+-#endif
+-
+-#if !@HAVE_UINT64_T@
+- #define HAVE_UINT64_T 1
+- #if ${SIZEOF_LONG}==8
+-  typedef unsigned long uint64_t;
+- #elif ${SIZEOF_LONGLONG}==8
+-  typedef unsigned long long uint64_t; 
+- #elif defined(HAVE___INT64)
+-  typedef unsigned __int64 uint64_t; 
+- #else
+-  #error Could not determine type for uint64_t!
+- #endif
+-#endif
+-
+-#if !@HAVE_UINT@
+- typedef unsigned int uint;
+- #define HAVE_UINT 1
+-#endif
+-
+-#if !@HAVE_SIZE_T@
+- #ifndef _SIZE_T_DEFINED 
+-  #ifndef HAVE_SIZE_T
+-   typedef unsigned int size_t;
+-   #define HAVE_SIZE_T 1
+-  #endif
+-  #define _SIZE_T_DEFINED 1     // kdewin32 define
+- #endif
+-#endif
+-
+ #cmakedefine __STRIGI_HAVE_GCC_VISIBILITY
+ 
+ /**


Index: strigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/devel/strigi.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- strigi.spec	17 Oct 2008 19:44:31 -0000	1.22
+++ strigi.spec	17 Oct 2008 20:38:17 -0000	1.23
@@ -2,7 +2,7 @@
 
 Name:		strigi
 Version:	0.6.0
-Release:	0.1%{?alphatag}%{?dist}
+Release:	0.2%{?alphatag}%{?dist}
 Summary:	A desktop search program for KDE
 Group:		Applications/Productivity
 License:	LGPLv2+
@@ -17,6 +17,7 @@
 #Source0:	http://www.vandenoever.info/software/strigi/strigi-%{version}.tar.bz2
 Source1:	strigiclient.desktop
 Source2:	strigi-daemon.desktop
+Patch0:		strigi-multilib-fix.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -58,6 +59,7 @@
 
 %prep
 %setup -q -n strigi-%{version}%{?alphatag}
+%patch0 -p1 -b .multilibs
 
 %build
 mkdir -p %{_target_platform}
@@ -123,6 +125,9 @@
 %{_libdir}/strigi/
 
 %changelog
+* Fri Oct 17 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.6.0-0.2.20081017svn870916
+- Restore and update multilib patch (is still and will most likely always be needed)
+
 * Fri Oct 17 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 0.6.0-0.1.20081017svn870916
 - Update to subversion snapshot (this pre-release of strigi is required by KDE 4.1.6x)
 - Dropped the multilib patch (upstream seems to have it already)