rpms/digikam/F-10 .cvsignore, 1.31, 1.32 digikam.spec, 1.78, 1.79 sources, 1.31, 1.32

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore digikam.spec sources 
Log Message:
* Tue Mar 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-1
- digikam-0.10.0 (final)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-10/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	17 Feb 2009 21:12:14 -0000	1.31
+++ .cvsignore	17 Mar 2009 18:00:24 -0000	1.32
@@ -1 +1 @@
-digikam-0.10.0-rc2.tar.bz2
+digikam-0.10.0.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-10/digikam.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- digikam.spec	17 Feb 2009 21:12:14 -0000	1.78
+++ digikam.spec	17 Mar 2009 18:00:24 -0000	1.79
@@ -1,8 +1,7 @@
-%define pre rc2
 
 Name:	 digikam
 Version: 0.10.0
-Release: 0.17.%{pre}%{?dist}
+Release: 1%{?dist}
 Summary: A digital camera accessing & photo management application
 
 Group:	 Applications/Multimedia
@@ -93,25 +92,19 @@
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-desktop-file-install --vendor="" \
-  --dir=%{buildroot}%{_datadir}/applications/kde4 \
-  --add-category="Photography" \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde4/digikam.desktop
-
-desktop-file-install --vendor="" \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde4 \
- --add-category="Photography" \
- %{buildroot}%{_datadir}/applications/kde4/showfoto.desktop
-
-%find_lang %{name} || touch %{name}.lang
-
-# omit conflicts with oxygen-icon-theme
-rm -vf %{buildroot}%{_kde4_iconsdir}/oxygen/*/apps/digikam.*
-#if "%{kdelibs4_version}" >= "4.1.80"
-rm -vf %{buildroot}%{_kde4_iconsdir}/oxygen/*/actions/transform-crop-and-resize.png
-rm -vf %{buildroot}%{_kde4_iconsdir}/oxygen/*/actions/view-object-histogram-logarithmic.png
-rm -vf %{buildroot}%{_kde4_iconsdir}/oxygen/*/actions/view-object-histogram-linear.png
-#endif
+%find_lang digikam 
+
+# 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
+
+
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/kde4/digikam.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/kde4/showfoto.desktop
 
 
 %post
@@ -131,7 +124,7 @@
 rm -rf %{buildroot}
 
 
-%files -f %{name}.lang
+%files -f digikam.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING HACKING NEWS README TODO
 %{_kde4_bindir}/*
@@ -140,11 +133,11 @@
 %{_kde4_appsdir}/showfoto/
 %{_kde4_appsdir}/solid/actions/*.desktop
 %{_kde4_datadir}/applications/kde4/*.desktop
-%{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_iconsdir}/oxygen/*/*/*
-%{_mandir}/man1/*.1*
-%{_kde4_datadir}/kde4/services/*
-%{_kde4_datadir}/kde4/servicetypes/*
+%{_kde4_datadir}/kde4/services/*.desktop
+%{_kde4_datadir}/kde4/services/*.protocol
+%{_kde4_datadir}/kde4/servicetypes/*.desktop
+%{_mandir}/man1/digitaglinktree.1*
+%{_datadir}/icons/hicolor/*/*/*
 
 %files libs
 %defattr(-,root,root,-)
@@ -158,6 +151,12 @@
 
 
 %changelog
+* Tue Mar 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-1
+- digikam-0.10.0 (final)
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.0-0.18.rc2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Feb 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-0.17.rc2
 - digikam-0.10.0-rc2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-10/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	17 Feb 2009 21:12:14 -0000	1.31
+++ sources	17 Mar 2009 18:00:24 -0000	1.32
@@ -1 +1 @@
-7e149f44b3ba743ee6f8880ba748c282  digikam-0.10.0-rc2.tar.bz2
+6c6daf958ff4fe93974f1074ba967cd9  digikam-0.10.0.tar.bz2