rpms/strigi/F-7 strigi-multilib-fix.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 strigi.spec, 1.4, 1.5
Deji Akingunola (deji)
fedora-extras-commits at redhat.com
Wed Oct 31 13:45:11 UTC 2007
- Previous message (by thread): rpms/strigi/F-8 strigi-multilib-fix.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 strigi.spec, 1.10, 1.11
- Next message (by thread): rpms/selinux-policy/F-8 policy-20070703.patch, 1.118, 1.119 selinux-policy.spec, 1.564, 1.565
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: deji
Update of /cvs/pkgs/rpms/strigi/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1245
Modified Files:
.cvsignore sources strigi.spec
Added Files:
strigi-multilib-fix.patch
Log Message:
* 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)
strigi-multilib-fix.patch:
--- NEW FILE strigi-multilib-fix.patch ---
--- 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
@@ -44,104 +44,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 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
#cmakedefine ENABLE_NEWXESAM
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 12 Sep 2007 12:01:13 -0000 1.3
+++ .cvsignore 31 Oct 2007 13:44:36 -0000 1.4
@@ -1 +1 @@
-strigi-0.5.5.tar.bz2
+strigi-0.5.7.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 12 Sep 2007 12:01:13 -0000 1.3
+++ sources 31 Oct 2007 13:44:36 -0000 1.4
@@ -1 +1 @@
-bf61ec453f5e0063ea70ace783df3a14 strigi-0.5.5.tar.bz2
+01015166eb49a523219d3b1d7e46b672 strigi-0.5.7.tar.bz2
Index: strigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-7/strigi.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- strigi.spec 12 Sep 2007 12:01:13 -0000 1.4
+++ strigi.spec 31 Oct 2007 13:44:36 -0000 1.5
@@ -1,5 +1,5 @@
Name: strigi
-Version: 0.5.5
+Version: 0.5.7
Release: 1%{?dist}
Summary: A desktop search program for KDE
Group: Applications/Productivity
@@ -8,12 +8,14 @@
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)
BuildRequires: cmake >= 2.4.5
BuildRequires: clucene-core-devel qt4-devel dbus-devel
-BuildRequires: libxml2-devel bzip2-devel zlib-devel
-BuildRequires: cppunit-devel
+BuildRequires: libxml2-devel expat-devel bzip2-devel zlib-devel
+BuildRequires: cppunit-devel exiv2-devel
+BuildRequires: bison
BuildRequires: desktop-file-utils
%description
@@ -47,6 +49,7 @@
%prep
%setup -q
+%patch0 -p0 -b .multilibs
%build
mkdir fedora
@@ -84,9 +87,9 @@
%clean
rm -rf %{buildroot}
-%post -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
@@ -109,6 +112,10 @@
%{_libdir}/strigi/
%changelog
+* 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)
+
* Wed Sep 12 2007 Deji Akingunola <dakingun at gmail.com> - 0.5.5-1
- Update to 0.5.5 release
- Previous message (by thread): rpms/strigi/F-8 strigi-multilib-fix.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 strigi.spec, 1.10, 1.11
- Next message (by thread): rpms/selinux-policy/F-8 policy-20070703.patch, 1.118, 1.119 selinux-policy.spec, 1.564, 1.565
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list