rpms/strigi/devel .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 strigi-multilib-fix.patch, 1.3, 1.4 strigi.spec, 1.27, 1.28
Kevin Kofler
kkofler at fedoraproject.org
Sun Nov 23 02:49:49 UTC 2008
Author: kkofler
Update of /cvs/pkgs/rpms/strigi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22288/devel
Modified Files:
.cvsignore sources strigi-multilib-fix.patch strigi.spec
Log Message:
Revert strigi to stable version from F-10. The 0.6.0 snapshots have never actually been built for dist-f11, turn out not to be needed to build 4.2, and we don't know when 0.6 will be released.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 21 Nov 2008 19:33:27 -0000 1.11
+++ .cvsignore 23 Nov 2008 02:49:19 -0000 1.12
@@ -1 +1 @@
-strigi-0.6.0.20081121svn887038.tar.bz2
+strigi-0.5.11.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 21 Nov 2008 19:33:27 -0000 1.11
+++ sources 23 Nov 2008 02:49:19 -0000 1.12
@@ -1 +1 @@
-87777d2c46606bea9e2bab4233dc937f strigi-0.6.0.20081121svn887038.tar.bz2
+f1fa3488a9c2fe1e8128f4d44088c4ad strigi-0.5.11.tar.bz2
strigi-multilib-fix.patch:
Index: strigi-multilib-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/devel/strigi-multilib-fix.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- strigi-multilib-fix.patch 17 Oct 2008 20:38:17 -0000 1.3
+++ strigi-multilib-fix.patch 23 Nov 2008 02:49:19 -0000 1.4
@@ -1,7 +1,6 @@
-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 @@
+--- 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
@@ -9,7 +8,7 @@
-#if !@HAVE_INT8_T@
- #define HAVE_INT8_T 1
- #if ${SIZEOF_CHAR}==1 //is char one byte?
-- typedef signed char int8_t;
+- typedef char int8_t;
- #else
- #error Could not determine type for int8_t!
- #endif
@@ -105,4 +104,4 @@
-
#cmakedefine __STRIGI_HAVE_GCC_VISIBILITY
- /**
+ #cmakedefine ENABLE_NEWXESAM
Index: strigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/devel/strigi.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- strigi.spec 21 Nov 2008 19:33:27 -0000 1.27
+++ strigi.spec 23 Nov 2008 02:49:19 -0000 1.28
@@ -1,31 +1,19 @@
-%define alphatag .20081121svn887038
+%define _default_patch_fuzz 2
Name: strigi
-Version: 0.6.0
-Release: 0.3%{?alphatag}%{?dist}
+Version: 0.5.11
+Release: 1%{?dist}
Summary: A desktop search program for KDE
Group: Applications/Productivity
License: LGPLv2+
URL: http://www.vandenoever.info/software/strigi
-
-### SNAPSHOT
-#Source0:VAR svnrel echo $(date +%Y%m%d)svn$(svn info svn://anonsvn.kde.org/home/kde/trunk/kdesupport/strigi | grep 'Rev:' | cut -d" " -f4)
-#Source0:CMD svn export svn://anonsvn.kde.org/home/kde/trunk/kdesupport/strigi strigi-%{version}.%{svnrel}
-#Source0:CMD tar cjf %{_sourcedir}/strigi-%{version}.%{svnrel}.tar.bz2 strigi-%{version}.%{svnrel}
-#Source0:CMD rm -rf strigi-%{version}.%{svnrel}
-Source0: strigi-%{version}%{?alphatag}.tar.bz2
-### Official sources
-#Source0: http://www.vandenoever.info/software/strigi/strigi-%{version}.tar.bz2
+Source0: http://www.vandenoever.info/software/strigi/strigi-%{version}.tar.bz2
Source1: strigiclient.desktop
Source2: strigi-daemon.desktop
-# This patch fixes a multilib conflict by removing some portability code
-# unneeded in Fedora. It is extremely unlikely to get merged upstream in that
-# form. Don't believe "patch" when it claims the patch was already applied.
Patch0: strigi-multilib-fix.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: cmake >= 2.6.0
+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
@@ -62,12 +50,12 @@
Strigi search engine libraries
%prep
-%setup -q -n strigi-%{version}%{?alphatag}
-%patch0 -p1 -b .multilibs
+%setup -q
+%patch0 -p0 -b .multilibs
%build
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
+mkdir fedora
+cd fedora
export CFLAGS="%{optflags}"
export CXXFLAGS="%{optflags}"
export FFLAGS="%{optflags}"
@@ -79,12 +67,12 @@
cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DLIB_DESTINATION=%{_libdir} \
-DLIB_SUFFIX=%{lib_suffix} ..
-popd
-make VERBOSE=1 %{?_smp_mflags} -C %{_target_platform}
+make VERBOSE=1 %{?_smp_mflags}
%install
rm -rf %{buildroot}
-make -C %{_target_platform} DESTDIR=%{buildroot} install/fast
+cd fedora
+make DESTDIR=%{buildroot} install
desktop-file-install \
--vendor="fedora" \
@@ -129,20 +117,6 @@
%{_libdir}/strigi/
%changelog
-* Fri Nov 21 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 0.6.0-0.3.20081121svn887038
-- New snapshot
-- Strigi from trunk/ now requires cmake >= 2.6.0
-
-* 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)
-- Revert cmake BR to >= 2.4.5 as that's all CMakeLists.txt asks for
-
-* 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)
-- BR cmake >= 2.6
-- Use make install/fast
-
* 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)
@@ -172,7 +146,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
More information about the scm-commits
mailing list