rpms/strigi/F-9 strigi-0.6.2-multilib.patch, NONE, 1.1 sources, 1.9, 1.10 strigi.spec, 1.18, 1.19 strigi-0.5.11-to-0.5.11.1.diff, 1.1, NONE strigi-multilib-fix.patch, 1.2, NONE

Mon Jan 26 11:24:35 UTC 2009

Author: ltinkl

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

Modified Files:
	sources strigi.spec 
Added Files:
	strigi-0.6.2-multilib.patch 
Removed Files:
	strigi-0.5.11-to-0.5.11.1.diff strigi-multilib-fix.patch 
Log Message:
KDE 4.2.0


strigi-0.6.2-multilib.patch:

--- NEW FILE strigi-0.6.2-multilib.patch ---
diff -up strigi-0.6.2/src/streams/strigi/strigiconfig.h.cmake.multilib strigi-0.6.2/src/streams/strigi/strigiconfig.h.cmake
--- strigi-0.6.2/src/streams/strigi/strigiconfig.h.cmake.multilib	2009-01-03 04:06:13.000000000 -0600
+++ strigi-0.6.2/src/streams/strigi/strigiconfig.h.cmake	2009-01-09 07:06:12.000000000 -0600
@@ -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: sources
===================================================================
RCS file: /cvs/extras/rpms/strigi/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	20 Jul 2008 18:15:03 -0000	1.9
+++ sources	26 Jan 2009 11:24:03 -0000	1.10
@@ -1 +1 @@
-f1fa3488a9c2fe1e8128f4d44088c4ad  strigi-0.5.11.tar.bz2
+52787a80278d24b0ee552b81bbf547aa  strigi-0.6.3.tar.bz2


Index: strigi.spec
===================================================================
RCS file: /cvs/extras/rpms/strigi/F-9/strigi.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- strigi.spec	1 Jan 2009 22:46:02 -0000	1.18
+++ strigi.spec	26 Jan 2009 11:24:04 -0000	1.19
@@ -1,15 +1,14 @@
 Name:		strigi
-Version:	0.5.11.1
-Release:	2%{?dist}
+Version:	0.6.3
+Release:	1%{?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-0.5.11.tar.bz2
+Source0:	http://www.vandenoever.info/software/strigi/strigi-%{version}.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
+Patch0:		strigi-0.6.2-multilib.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake >= 2.4.5
@@ -19,6 +18,8 @@
 BuildRequires:  bison
 BuildRequires:	desktop-file-utils
 
+Requires: %{name}-libs = %{version}-%{release}
+
 %description
 Strigi is a fast and light desktop search engine. It can handle a large range
 of file formats such as emails, office documents, media files, and file
@@ -35,7 +36,7 @@
 %package	devel
 Summary:	Development files for the strigi desktop search engine
 Group:		Development/Libraries
-Requires:	%name-libs = %version-%release
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	pkgconfig
 
 %description	devel
@@ -49,30 +50,22 @@
 Strigi search engine libraries
 
 %prep
-%setup -q -n strigi-0.5.11
-%patch0 -p1 -b .multilibs
-%patch1 -p0 -b .0.5.11-to-0.5.11.1
+%setup -q 
+%patch0 -p1 -b .multilib
 
 %build
-mkdir fedora
-cd fedora
-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} ..
-make VERBOSE=1 %{?_smp_mflags}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%cmake \
+  -DLIB_DESTINATION=%{_libdir} \
+  ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 %install
 rm -rf %{buildroot}
-cd fedora
-make DESTDIR=%{buildroot} install
+make install/fast -C %{_target_platform}  DESTDIR=%{buildroot}
 
 desktop-file-install					\
 	--vendor="fedora"				\
@@ -80,14 +73,11 @@
 	%{SOURCE1}
 
 # Add an autostart desktop file for the strigi daemon
-mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart
-cp -pr %{SOURCE2} %{buildroot}%{_sysconfdir}/xdg/autostart/
+install -p -m644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xdg/autostart/strigi-daemon.desktop
 
-#%check
-#cd fedora
-#make test
 
-find %{buildroot}%{_libdir} -type f -name "*.so*" -exec chmod 755 {} ';'
+#check
+#make -C %{_target_platform}/tests
 
 %clean
 rm -rf %{buildroot}
@@ -117,6 +107,13 @@
 %{_libdir}/strigi/
 
 %changelog
+* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.6.3-1
+- strigi-0.6.3
+
+* Tue Jan 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.6.2-1
+- strigi-0.6.2
+- use %%cmake macro
+
 * Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.5.11.1-2 
 - respin (exiv2)
 


--- strigi-0.5.11-to-0.5.11.1.diff DELETED ---


--- strigi-multilib-fix.patch DELETED ---


