SPECS (DEVEL): tellico.spec - some versions corrected - bcond restored

glen glen at pld-linux.org
Wed Apr 8 08:07:59 CEST 2009


Author: glen                         Date: Wed Apr  8 06:07:59 2009 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- some versions corrected
- bcond restored

---- Files affected:
SPECS:
   tellico.spec (1.59.2.3 -> 1.59.2.4) 

---- Diffs:

================================================================
Index: SPECS/tellico.spec
diff -u SPECS/tellico.spec:1.59.2.3 SPECS/tellico.spec:1.59.2.4
--- SPECS/tellico.spec:1.59.2.3	Wed Apr  8 07:58:35 2009
+++ SPECS/tellico.spec	Wed Apr  8 08:07:53 2009
@@ -14,12 +14,14 @@
 #
 # Conditional build:
 %bcond_with	webcam	# build with webcam barcode recognition
+
+%define		kde_ver		4.2
 #
 %define		svn	950843
 Summary:	A collection manager
 Summary(pl.UTF-8):	Zarządca zbiorów wideo, audio i książek
 Name:		tellico
-Version:	2.0
+Version:	1.9
 Release:	0.%{svn}.1
 License:	GPL v2
 Group:		X11/Applications
@@ -33,10 +35,10 @@
 BuildRequires:	QtSvg-devel
 BuildRequires:	QtTest-devel
 BuildRequires:	automoc4
-BuildRequires:	cmake >= 2.6.1-2
-BuildRequires:	exempi-devel
-BuildRequires:	kde4-kdemultimedia-devel
-BuildRequires:	kde4-kdepimlibs-devel
+BuildRequires:	cmake >= 2.6.2
+BuildRequires:	exempi-devel >= 2.0
+BuildRequires:	kde4-kdemultimedia-devel >= %{kde_ver}
+BuildRequires:	kde4-kdepimlibs-devel >= %{kde_ver}
 BuildRequires:	libxml2-devel
 BuildRequires:	libxml2-progs
 BuildRequires:	libxslt-devel >= 1.0.19
@@ -73,8 +75,9 @@
 	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
 	-DCMAKE_BUILD_TYPE=%{!?debug:release}%{?debug:debug} \
 %if "%{_lib}" == "lib64"
-	-DLIB_SUFFIX=64
+	-DLIB_SUFFIX=64 \
 %endif
+	%{?with_webcam:-DENABLE_WEBCAM=ON}
 
 %{__make} -j1
 
@@ -119,6 +122,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.59.2.4  2009/04/08 06:07:53  glen
+- some versions corrected
+- bcond restored
+
 Revision 1.59.2.3  2009/04/08 05:58:35  glen
 - builds with one jobserver
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/tellico.spec?r1=1.59.2.3&r2=1.59.2.4&f=u



More information about the pld-cvs-commit mailing list