SPECS: strigi.spec - merged from DEVEL

[shadzik]

Author: shadzik                      Date: Mon Feb  2 06:40:19 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   strigi.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: SPECS/strigi.spec
diff -u SPECS/strigi.spec:1.25 SPECS/strigi.spec:1.26
--- SPECS/strigi.spec:1.25	Mon Sep 29 23:05:28 2008
+++ SPECS/strigi.spec	Mon Feb  2 07:40:14 2009
@@ -9,28 +9,30 @@
 # - Could not find CLucene. Please install CLucene = 0.9.16a (http://clucene.sf.net)
 # - Cannot find Exiv2 library!
 #
+%define		qtver	4.4.3
+#%define		_svnver	850421
+
 Summary:	Strigi desktop search
 Summary(pl.UTF-8):	System wyszukiwania Strigi
 Name:		strigi
-Version:	0.5.11
+Version:	0.6.4
 Release:	1
 License:	GPL
 Group:		X11/Applications
 Source0:	http://www.vandenoever.info/software/strigi/%{name}-%{version}.tar.bz2
-# Source0-md5:	f1fa3488a9c2fe1e8128f4d44088c4ad
+# Source0-md5:	324fd9606ac77765501717ff92c04f9a
 URL:		http://strigi.sourceforge.net/
-BuildRequires:	QtDBus-devel >= 4.3.0
-BuildRequires:	QtGui-devel >= 4.3.0
-BuildRequires:	QtTest-devel >= 4.3.0
+BuildRequires:	QtDBus-devel >= %{qtver}
+BuildRequires:	QtGui-devel >= %{qtver}
 BuildRequires:	bzip2-devel
 BuildRequires:	clucene-core-devel
-BuildRequires:	cmake
+BuildRequires:	cmake >= 2.6.2
 BuildRequires:	cppunit-devel
 %{?with_dbus:BuildRequires:	dbus-devel >= 1.0}
 BuildRequires:	expat-devel
 BuildRequires:	libxml2-devel
-BuildRequires:	qt4-build >= 4.3.3-3
-BuildRequires:	qt4-qmake >= 4.3.3-3
+BuildRequires:	qt4-build >= %{qtver}
+BuildRequires:	qt4-qmake >= %{qtver}
 BuildRequires:	rpmbuild(macros) >= 1.293
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -84,9 +86,11 @@
 %build
 install -d build
 cd build
+# add this to get verbose output
+#-DCMAKE_VERBOSE_MAKEFILE=1 \
 %cmake \
 	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-	-DCMAKE_VERBOSE_MAKEFILE=ON \
+	-DCMAKE_AR=/usr/bin/ar \
 %if "%{_lib}" == "lib64"
 	-DLIB_SUFFIX=64 \
 %endif
@@ -145,11 +149,23 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.25  2008/09/29 21:05:28  qboosh
-- unified cmake -D options
+Revision 1.26  2009/02/02 06:40:14  shadzik
+- merged from DEVEL
+
+Revision 1.23.2.5  2009/02/02 06:39:18  shadzik
+- 0.6.4
+
+Revision 1.23.2.4  2009/01/12 22:36:39  shadzik
+- 0.6.3
+
+Revision 1.23.2.3  2009/01/03 15:25:34  rotom
+- up to 0.6.2
+
+Revision 1.23.2.2  2008/08/21 15:30:39  paszczus
+- updated to snap 850421
 
-Revision 1.24  2008/08/26 14:02:49  pluto
-- BR: QtTest-devel.
+Revision 1.23.2.1  2008/08/09 15:28:44  shadzik
+- 0.5.12 svn rev 844382
 
 Revision 1.23  2008/08/05 23:27:25  shadzik
 - 0.5.11
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/strigi.spec?r1=1.25&r2=1.26&f=u