- cleanups, add am.patch, ghost soname library, verbose files; rel 2

Changed files:
    digikam.spec -> 1.79.2.3.2.2
    kde-am.patch -> 1.1.2.1

diff --git a/digikam.spec b/digikam.spec
index bb1c9051eb5027035a6f3d831b2d6522a27bcdd4..f5cec32e93f2d130202cc08087d3e38701c0fce9 100644 (file)
--- a/digikam.spec
+++ b/digikam.spec
@@ -1,14 +1,14 @@
-
 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
@@ -30,6 +30,9 @@ Obsoletes:    digikamimageplugins
 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.
@@ -55,14 +58,11 @@ Interfejs KDE do gphoto2 - pliki nagłówkowe.
 %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
@@ -74,8 +74,7 @@ cp -f /usr/share/automake/config.sub admin
 %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
@@ -101,8 +100,12 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -115,12 +118,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_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

diff --git a/kde-am.patch b/kde-am.patch
new file mode 100644 (file)
index 0000000..5a23f3a
--- /dev/null
+++ b/kde-am.patch
@@ -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
+     ;;