packages (DIGIKAM_0_9): digikam/digikam.spec, digikam/kde-am.patch (NEW) - ...

[glen]

Author: glen                         Date: Wed Jan 20 08:31:40 2010 GMT
Module: packages                      Tag: DIGIKAM_0_9
---- Log message:
- cleanups, add am.patch, ghost soname library, verbose files; rel 2

---- Files affected:
packages/digikam:
   digikam.spec (1.79.2.3.2.1 -> 1.79.2.3.2.2) , kde-am.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: packages/digikam/digikam.spec
diff -u packages/digikam/digikam.spec:1.79.2.3.2.1 packages/digikam/digikam.spec:1.79.2.3.2.2
--- packages/digikam/digikam.spec:1.79.2.3.2.1	Tue Nov 11 13:07:23 2008
+++ packages/digikam/digikam.spec	Wed Jan 20 09:31:34 2010
@@ -1,15 +1,15 @@
 # $Revision$, $Date$
-
 Summary:	A KDE frontend for gphoto2
 Summary(pl.UTF-8):	Interfejs KDE do gphoto2
 Name:		digikam
 Version:	0.9.4
-Release:	2
+Release:	3
 License:	GPL
 Group:		X11/Applications/Graphics
-Source0:	http://dl.sourceforge.net/digikam/%{name}-%{version}.tar.bz2
+Source0:	http://downloads.sourceforge.net/digikam/%{name}-%{version}.tar.bz2
 # Source0-md5:	b0f3fa00bd054b0497146e6ce24dab7c
 Patch0:		kde-ac260-lt.patch
+Patch1:		kde-am.patch
 URL:		http://digikam.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -31,6 +31,9 @@
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# build broken with spaces in CC
+%undefine	with_ccache
+
 %description
 Designed to be a standalone application to preview and download images
 from a digital camera on a Linux machine.
@@ -56,14 +59,11 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %{__sed} -i -e "s,Categories.*,Categories=Qt;KDE;Graphics;Photograph;," \
 	./digikam/digikam/digikam.desktop \
 	./digikam/showfoto/showfoto.desktop
-echo "# vi: encoding=utf-8" >> ./digikam/digikam/digikam.desktop
-echo "# vi: encoding=utf-8" >> ./digikam/showfoto/showfoto.desktop
-echo "# vi: encoding=utf-8" >> ./digikam/imageplugins/digikamimageplugin_core.desktop
-echo "# vi: encoding=utf-8" >> ./digikam/utilities/imageeditor/digikamimageplugin.desktop
 
 %build
 cp -f /usr/share/automake/config.sub admin
@@ -75,8 +75,7 @@
 %endif
 	--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
 	--disable-rpath \
-	--with-qt-libraries=%{_libdir} \
-	--with-imlib2-config=%{_bindir}
+	--with-qt-libraries=%{_libdir}
 %{__make}
 
 %install
@@ -102,8 +101,12 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/*.so.*.*.*
+%attr(755,root,root) %{_bindir}/digikam
+%attr(755,root,root) %{_bindir}/digikamthemedesigner
+%attr(755,root,root) %{_bindir}/digitaglinktree
+%attr(755,root,root) %{_bindir}/showfoto
+%attr(755,root,root) %{_libdir}/libdigikam.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdigikam.so.0
 %attr(755,root,root) %{_libdir}/kde3/*.so
 %attr(755,root,root) %{_datadir}/apps/digikam/utils/digikam-camera
 %dir %{_datadir}/apps/digikam
@@ -116,12 +119,13 @@
 %{_datadir}/apps/digikam/tips
 %{_datadir}/apps/digikam/digikam-splash.png
 %{_datadir}/apps/digikam/*.rc
-%{_datadir}/services/*
-%{_datadir}/servicetypes/*
+%{_datadir}/services/*.protocol
+%{_datadir}/services/*.desktop
+%{_datadir}/servicetypes/*.desktop
 %{_datadir}/apps/showfoto
 %{_datadir}/apps/konqueror/servicemenus/digikam-*.desktop
 %{_desktopdir}/kde/*.desktop
-%{_iconsdir}/[!l]*/*/*/*
+%{_iconsdir}/*/*/*/*.png
 %{_mandir}/man1/digitaglinktree.1*
 
 %files devel
@@ -137,6 +141,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.79.2.3.2.2  2010/01/20 08:31:34  glen
+- cleanups, add am.patch, ghost soname library, verbose files; rel 2
+
 Revision 1.79.2.3.2.1  2008/11/11 12:07:23  arekm
 - rel 2
 

================================================================
Index: packages/digikam/kde-am.patch
diff -u /dev/null packages/digikam/kde-am.patch:1.1.2.1
--- /dev/null	Wed Jan 20 09:31:40 2010
+++ packages/digikam/kde-am.patch	Wed Jan 20 09:31:34 2010
@@ -0,0 +1,11 @@
+--- kdelibs-3.5.10/admin/cvs.sh~	2008-08-19 23:28:39.000000000 +0300
++++ kdelibs-3.5.10/admin/cvs.sh	2009-05-19 13:34:47.966210297 +0300
+@@ -68,7 +68,7 @@
+     echo "*** KDE requires automake $required_automake_version"
+     exit 1
+     ;;
+-  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
++  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11*)
+     echo "*** $AUTOMAKE_STRING found."
+     UNSERMAKE=no
+     ;;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/digikam/digikam.spec?r1=1.79.2.3.2.1&r2=1.79.2.3.2.2&f=u