rpms/digikam/F-9 digikam.spec,1.56,1.57

Rex Dieter rdieter at fedoraproject.org
Mon Oct 13 15:35:10 UTC 2008


Author: rdieter

Update of /cvs/pkgs/rpms/digikam/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11925/F-9

Modified Files:
	digikam.spec 
Log Message:
cleanup EL-5 branch support



Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-9/digikam.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- digikam.spec	18 Jul 2008 18:11:57 -0000	1.56
+++ digikam.spec	13 Oct 2008 15:34:39 -0000	1.57
@@ -1,7 +1,16 @@
 
+%if 0%{?fedora} > 6
+%define kdelibs3 kdelibs3
+%else
+%define kdelibs3 kdelibs
+BuildRequires: libutempter-devel
+%define _without_included_sqlite3 --without-included-sqlite3
+BuildRequires:  sqlite-devel
+%endif
+
 Name:		digikam
 Version:	0.9.4
-Release: 	2%{?dist}
+Release: 	2%{?dist}.1
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -12,7 +21,8 @@
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  kdelibs3-devel
+BuildRequires:  %{kdelibs3}-devel
+BuildRequires:  kdelibs-devel
 %if 0%{?fedora} > 9
 BuildRequires:  libgphoto2-devel
 %else
@@ -28,7 +38,6 @@
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
 BuildRequires:	libtool-ltdl-devel
 %endif
-BuildRequires:  sqlite-devel
 
 Provides:	digikamimageplugins = %{version}-%{release}
 Obsoletes:	digikamimageplugins < 0.9.1-2
@@ -69,7 +78,7 @@
 	--disable-warnings \
 	--disable-dependency-tracking \
 	--enable-final \
-	--without-included-sqlite3
+        %{?_without_included_sqlite3} 
 
 make %{?_smp_mflags}
 




More information about the scm-commits mailing list