rpms/digikam/devel .cvsignore, 1.32, 1.33 digikam.spec, 1.88, 1.89 sources, 1.32, 1.33

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/digikam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32207

Modified Files:
	.cvsignore digikam.spec sources 
Log Message:
* Fri Jun 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-0.1.beta1
- digikam-1.0.0-beta1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/.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	16 Jun 2009 12:50:50 -0000	1.33
@@ -1 +1 @@
-digikam-0.10.0.tar.bz2
+digikam-1.0.0-beta1.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- digikam.spec	17 Mar 2009 15:20:10 -0000	1.88
+++ digikam.spec	16 Jun 2009 12:50:50 -0000	1.89
@@ -1,7 +1,9 @@
 
+%define pre beta1
+
 Name:	 digikam
-Version: 0.10.0
-Release: 1%{?dist}
+Version: 1.0.0
+Release: 0.1.%{pre}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 Group:	 Applications/Multimedia
@@ -94,13 +96,6 @@ make install/fast DESTDIR=%{buildroot} -
 
 %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
@@ -108,12 +103,19 @@ desktop-file-validate %{buildroot}%{_dat
 
 
 %post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+
 
 %post libs -p /sbin/ldconfig
 
@@ -136,8 +138,8 @@ 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,-)
@@ -151,6 +153,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* 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/devel/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	16 Jun 2009 12:50:50 -0000	1.33
@@ -1 +1 @@
-6c6daf958ff4fe93974f1074ba967cd9  digikam-0.10.0.tar.bz2
+6c0fd6fe7bb4d8a5f00c9a165c7b9309  digikam-1.0.0-beta1.tar.bz2