rpms/digikam/F-12 .cvsignore, 1.40, 1.41 digikam.spec, 1.106, 1.107 sources, 1.41, 1.42

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore digikam.spec sources 
Log Message:
* Mon Feb 01 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.1.0-1
- digikam-1.1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-12/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	21 Dec 2009 15:08:02 -0000	1.40
+++ .cvsignore	5 Feb 2010 16:50:37 -0000	1.41
@@ -1 +1 @@
-digikam-1.0.0.tar.bz2
+digikam-1.1.0.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-12/digikam.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- digikam.spec	21 Dec 2009 15:08:02 -0000	1.106
+++ digikam.spec	5 Feb 2010 16:50:37 -0000	1.107
@@ -1,6 +1,6 @@
 
 Name:	 digikam
-Version: 1.0.0
+Version: 1.1.0
 Release: 1%{?dist}
 Summary: A digital camera accessing & photo management application
 
@@ -29,11 +29,10 @@ BuildRequires: jasper-devel
 BuildRequires: kdeedu-devel >= %{marble_version} 
 
 BuildRequires: kdelibs4-devel
-%global kde4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.2.0") | grep ^KDE | cut -d' ' -f2)
 
 # trash protocol support needed
 # FIXME: should probably be handled lower in the stack
-Requires: kdebase-runtime >= %{kde4_version}
+Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
 
 BuildRequires: kdepimlibs-devel
 BuildRequires: lcms-devel
@@ -63,7 +62,7 @@ to use them.
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: kdelibs4%{?_isa} >= %{kde4_version}
+%{?_kde4_version:Requires: kdelibs4%{?_isa} >= %{_kde4_version}}
 Requires: kdeedu-marble-libs%{?_isa} >= %{marble_version}
 %description libs
 %{summary}.
@@ -96,8 +95,7 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-desktop-file-install \
-  --vendor="" \
+desktop-file-install --vendor="" \
   --dir=%{buildroot}%{_datadir}/applications/kde4 \
   %{SOURCE1}
 
@@ -162,6 +160,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Feb 01 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.1.0-1
+- digikam-1.1.0
+
+* Thu Jan 28 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-2
+- use %%{_kde4_version}
+
 * Mon Dec 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-1
 - digikam-1.0.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-12/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	21 Dec 2009 15:08:02 -0000	1.41
+++ sources	5 Feb 2010 16:50:37 -0000	1.42
@@ -1 +1 @@
-6169deb68a3d712a0c6539b09c5f8c0c  digikam-1.0.0.tar.bz2
+94a536e7387325c7b73ab2ac7b0a9a62  digikam-1.1.0.tar.bz2