rpms/digikam/F-11 digikam-import.desktop, NONE, 1.1 .cvsignore, 1.32, 1.33 digikam.spec, 1.90, 1.91 sources, 1.32, 1.33

Rex Dieter rdieter at fedoraproject.org
Wed Dec 23 01:13:48 UTC 2009 

Author: rdieter

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

Modified Files:
	.cvsignore digikam.spec sources 
Added Files:
	digikam-import.desktop 
Log Message:
sync w/devel for 1.0.0 goodness



--- NEW FILE digikam-import.desktop ---
[Desktop Entry]
Categories=Qt;KDE;Graphics;Photography;
Encoding=UTF-8
Exec=digikam --download-from %f
GenericName=Photo Management Program
Icon=digikam
MimeType=x-content/image-dcf;x-content/image-picturecd;
Name=digiKam
NoDisplay=true
Terminal=false
Type=Application


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-11/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- .cvsignore	17 Mar 2009 15:20:10 -0000	1.32
+++ .cvsignore	23 Dec 2009 01:13:48 -0000	1.33
@@ -1 +1 @@
-digikam-0.10.0.tar.bz2
+digikam-1.0.0.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-11/digikam.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- digikam.spec	29 Sep 2009 20:37:37 -0000	1.90
+++ digikam.spec	23 Dec 2009 01:13:48 -0000	1.91
@@ -1,7 +1,7 @@
 
 Name:	 digikam
-Version: 0.10.0
-Release: 3%{?dist}
+Version: 1.0.0
+Release: 1%{?dist}
 Summary: A digital camera accessing & photo management application
 
 Group:	 Applications/Multimedia
@@ -10,13 +10,18 @@ URL:	 http://www.digikam.org/
 Source0: http://downloads.sourceforge.net/digikam/digikam-%{version}%{?pre:-%{pre}}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# digiKam not listed as a media handler for pictures in Nautilus (#516447)
+Source1: digikam-import.desktop
+
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
+BuildRequires: glib2-devel
 BuildRequires: gphoto2-devel
 BuildRequires: libkdcraw-devel >= 0.4.0-2
 BuildRequires: libkexiv2-devel >= 0.5.0
 BuildRequires: libkipi-devel >= 0.3.0
+BuildRequires: liblqr-1-devel
 BuildRequires: jasper-devel
 
 # marble integration, http://bugzilla.redhat.com/470578 
@@ -24,7 +29,6 @@ BuildRequires: jasper-devel
 BuildRequires: kdeedu-devel >= %{marble_version} 
 
 BuildRequires: kdelibs4-devel
-# min kdelibs Req
 %global kde4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.2.0") | grep ^KDE | cut -d' ' -f2)
 
 # trash protocol support needed
@@ -36,6 +40,7 @@ BuildRequires: lcms-devel
 BuildRequires: lensfun-devel
 BuildRequires: libtiff-devel
 BuildRequires: libpng-devel >= 1.2.7
+BuildRequires: soprano-devel
 BuildRequires: sqlite-devel
 
 Obsoletes: digikamimageplugins < 0.9.1-2
@@ -59,7 +64,7 @@ Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: kdelibs4%{?_isa} >= %{kde4_version}
-Requires: kdeedu-marble >= %{marble_version} 
+Requires: kdeedu-marble-libs%{?_isa} >= %{marble_version}
 %description libs
 %{summary}.
 
@@ -91,14 +96,12 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang digikam 
+desktop-file-install \
+  --vendor="" \
+  --dir=%{buildroot}%{_datadir}/applications/kde4 \
+  %{SOURCE1}
 
-# hack in hicolor icons
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
-pushd %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
-ln -s %{_kde4_appsdir}/digikam/icons/oxygen/48x48/apps/digikam.png  .
-ln -s %{_kde4_appsdir}/digikam/icons/oxygen/48x48/apps/showfoto.png .
-popd
+%find_lang digikam --with-kde
 
 
 %check
@@ -120,6 +123,7 @@ fi
 update-desktop-database -q &> /dev/null
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
+
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
@@ -141,13 +145,14 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_datadir}/kde4/services/*.protocol
 %{_kde4_datadir}/kde4/servicetypes/*.desktop
-%{_mandir}/man1/digitaglinktree.1*
-%{_datadir}/icons/hicolor/*/*/*
+%{_mandir}/man1/*
+%{_kde4_iconsdir}/hicolor/*/*/*
 
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/libdigikamcore.so.1*
 %{_kde4_libdir}/libdigikamdatabase.so.1*
+%{_kde4_libdir}/kde4/plugins/marble/ExternalDraw.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -157,14 +162,45 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-3
-- fix marble deps
+* Mon Dec 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-1
+- digikam-1.0.0
+
+* Mon Nov 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.11.rc
+- digikam-1.0.0-rc
+
+* Wed Nov 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.10.beta6
+- rebuild (kdegraphics)
+
+* Sat Nov 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.9.beta6
+- digiKam not listed as a media handler for pictures in Nautilus (#516447)
+
+* Mon Nov 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.8.beta6
+- digikam-1.0.0-beta6
 
-* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-2
-- rebuild against kde-4.3
-- optimize scriptlets
+* Tue Oct 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.7.beta5
+- digikam-1.0.0-beta5
+- tweak marble deps (again)
+
+* Tue Sep 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.6.beta4
+- fix marble dep(s)
+
+* Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.5.beta4
+- digikam-1.0.0-beta4
+- BR: liblqr-1-devel
+
+* Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.4.beta3
+- drop xdg-utils references 
 - tighten -libs related deps via %%{?_isa}
 
+* Fri Jul 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.3.beta3
+- digikam-1.0.0-beta3
+
+* Mon Jul 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.2.beta2
+- digikam-1.0.0-beta2
+
+* Fri Jun 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.1.beta1
+- digikam-1.0.0-beta1
+
 * Tue Mar 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-1
 - digikam-0.10.0 (final)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-11/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- sources	17 Mar 2009 15:20:11 -0000	1.32
+++ sources	23 Dec 2009 01:13:48 -0000	1.33
@@ -1 +1 @@
-6c6daf958ff4fe93974f1074ba967cd9  digikam-0.10.0.tar.bz2
+6169deb68a3d712a0c6539b09c5f8c0c  digikam-1.0.0.tar.bz2

More information about the scm-commits mailing list