rpms/digikam/FC-6 digikam.spec,1.29,1.30

[Marcin Garski (mgarski)]

Author: mgarski

Update of /cvs/pkgs/rpms/digikam/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29720

Modified Files:
	digikam.spec 
Log Message:
- Fix .desktop category and encoding (#240644)



Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/FC-6/digikam.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- digikam.spec	11 Mar 2007 16:50:59 -0000	1.29
+++ digikam.spec	29 Jun 2007 22:04:28 -0000	1.30
@@ -1,21 +1,21 @@
 Name:		digikam
 Version:	0.9.1
-Release:	1%{?dist}.1
+Release:	2%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.digikam.org/
-Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	qt-devel kdelibs-devel arts-devel gphoto2-devel >= 2.0.0
 BuildRequires:	exiv2-devel >= 0.12 libkexiv2-devel >= 0.1 libkipi-devel >= 0.1
 BuildRequires:	lcms-devel libtiff-devel libpng-devel >= 1.2.7 jasper-devel
 BuildRequires:	sqlite-devel >= 3.0.0 gettext pkgconfig desktop-file-utils
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
 BuildRequires:	libtool-ltdl-devel
-Requires(post):	desktop-file-utils
-Requires(postun): desktop-file-utils
+%endif
 
 %description
 digiKam is an easy to use and powerful digital photo management application,
@@ -40,13 +40,23 @@
 %prep
 %setup -q
 
+# Fix .desktop encoding
+pushd digikam/utilities/hotplug/
+for i in *.desktop.in
+do
+	iconv -f ISO-8859-1 -t UTF-8 < ${i} > ${i}.tmp
+	mv -f ${i}.tmp ${i}
+done
+popd
+
 %build
 unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure \
 	--disable-rpath \
+	--enable-new-ldflags \
 	--disable-debug \
+	--disable-warnings \
 	--disable-dependency-tracking \
 	--enable-final
 make %{?_smp_mflags}
@@ -55,20 +65,14 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor fedora --delete-original \
-	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category X-Fedora \
-	--add-category Application \
-	--add-category Photograph \
-	--add-category Graphics \
+desktop-file-install --vendor fedora \
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+	--add-category Photography \
 	$RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
 
-desktop-file-install --vendor fedora --delete-original \
-	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category X-Fedora \
-	--add-category Application \
-	--add-category Photograph \
-	--add-category Graphics \
+desktop-file-install --vendor fedora \
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+	--add-category Photography \
 	$RPM_BUILD_ROOT%{_datadir}/applications/kde/showfoto.desktop
 
 %find_lang %{name}
@@ -96,7 +100,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %name.lang
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING HACKING NEWS README TODO
 %{_bindir}/*
@@ -105,7 +109,7 @@
 %{_libdir}/kde3/digikamimageplugin_core.so
 %{_libdir}/kde3/kio_digikam*.la
 %{_libdir}/kde3/kio_digikam*.so
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/kde/*.desktop
 %{_datadir}/apps/digikam/
 %{_datadir}/apps/konqueror/servicemenus/*.desktop
 %{_datadir}/apps/showfoto/
@@ -115,12 +119,15 @@
 %{_datadir}/servicetypes/digikamimageplugin.desktop
 
 %files devel
-%defattr(-, root, root)
+%defattr(-,root,root,-)
 %{_includedir}/digikam/
 %{_includedir}/digikam_export.h
 %{_libdir}/libdigikam.so
 
 %changelog
+* Fri Jun 29 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.1-2
+- Fix .desktop category and encoding (#240644)
+
 * Sun Mar 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.1-1.1
 - respin (for jasper)