rpms/strigi/devel strigi.spec,1.20,1.21

[Lorenzo Villani]

Author: arbiter

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

Modified Files:
	strigi.spec 
Log Message:
revert to the latest stable specfile


Index: strigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/devel/strigi.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- strigi.spec	17 Oct 2008 18:51:02 -0000	1.20
+++ strigi.spec	17 Oct 2008 19:17:51 -0000	1.21
@@ -1,26 +1,19 @@
-%define alphatag .20081017svn870916
+%define _default_patch_fuzz 2
 
 Name:		strigi
-Version:	0.6.0
-Release:	0.1%{?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:CMD svn export svn://anonsvn.kde.org/home/kde/trunk/kdesupport/strigi strigi-%{version}.`date +%Y%m%d`svn`svn info svn://anonsvn.kde.org/home/kde/trunk/kdesupport/strigi | grep 'Rev:' | cut -d" " -f4`
-#Source0:CMD tar cjf sources/strigi-%{version}.`date +%Y%m%d`svn`svn info svn://anonsvn.kde.org/home/kde/trunk/kdesupport/strigi | grep 'Rev:' | cut -d" " -f4`.tar.bz2 strigi-%{version}.`date +%Y%m%d`svn`svn info svn://anonsvn.kde.org/home/kde/trunk/kdesupport/strigi | grep 'Rev:' | cut -d" " -f4`
-#Source0:CMD rm -rf strigi-%{version}.`date +%Y%m%d`svn`svn info svn://anonsvn.kde.org/home/kde/trunk/kdesupport/strigi | grep 'Rev:' | cut -d" " -f4`
-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
-
+Patch0:		strigi-multilib-fix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	cmake >= 2.6
+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
@@ -57,11 +50,12 @@
 Strigi search engine libraries
 
 %prep
-%setup -q -n strigi-%{version}%{?alphatag}
+%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}"
@@ -73,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"				\
@@ -123,10 +117,6 @@
 %{_libdir}/strigi/
 
 %changelog
-* 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)
-
 * 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)
@@ -156,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