This commit was manufactured by cvs2git to create branch 'DIGIKAM_0_9'.

Sprout from master 2006-09-09 10:49:22 UTC Arkadiusz Miśkiewicz <arekm@maven.pl> '- fix problems with autoconf 2.60 which creates configure that runs in POSIX mode'
Cherrypick from unlabeled-1.79.2 2008-07-25 07:15:41 UTC Arkadiusz Miśkiewicz <arekm@maven.pl> '- up to 0.9.4':
    digikam.spec -> 1.79.2.3

diff --git a/digikam.spec b/digikam.spec
index c71f693da226f4b5b293d29b4d06c729e094e674..2a0f063cadbb2080acf01cd478a75026965d41d8 100644 (file)
--- a/digikam.spec
+++ b/digikam.spec
@@ -1,40 +1,46 @@
+
 Summary:       A KDE frontend for gphoto2
-Summary(pl):   Interfejs KDE do gphoto2
+Summary(pl.UTF-8):     Interfejs KDE do gphoto2
 Name:          digikam
-Version:       0.8.2
+Version:       0.9.4
 Release:       1
 License:       GPL
-Group:         X11/Applications
+Group:         X11/Applications/Graphics
 Source0:       http://dl.sourceforge.net/digikam/%{name}-%{version}.tar.bz2
-# Source0-md5: fd57b7bfe4577dc2e2efd6d33122a46b
+# Source0-md5: b0f3fa00bd054b0497146e6ce24dab7c
+Patch0:                kde-ac260-lt.patch
 URL:           http://digikam.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: gdbm-devel
-BuildRequires: imlib2-devel
+BuildRequires: exiv2-devel >= 0.14
+BuildRequires: jasper-devel >= 1.7.0
 BuildRequires: kdelibs-devel
-BuildRequires: kdesdk-po2xml
 BuildRequires: libgphoto2-devel
-BuildRequires: libkexif-devel >= 0.2
+BuildRequires: libkdcraw-devel >= 0.1.2
+BuildRequires: libkexiv2-devel >= 0.1.5
 BuildRequires: libkipi-devel >= 0.1
+BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel
 BuildRequires: pkgconfig >= 1:0.9.0
 BuildRequires: rpmbuild(macros) >= 1.129
 BuildRequires: sed >= 4.0
 BuildRequires: sqlite3-devel
+Obsoletes:     digikamimageplugins
+# sr@Latn vs. sr@latin
+Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Designed to be a standalone application to preview and download images
 from a digital camera on a Linux machine.
 
-%description -l pl
-Samodzielna aplikacja do ogl±dania i ¶ci±gania obrazków z aparatów
+%description -l pl.UTF-8
+Samodzielna aplikacja do oglądania i ściągania obrazków z aparatów
 cyfrowych pod Linuksem.
 
 %package devel
 Summary:       A KDE frontend for gphoto2 - header files
-Summary(pl):   Interfejs KDE do gphoto2 - pliki nag³ówkowe
+Summary(pl.UTF-8):     Interfejs KDE do gphoto2 - pliki nagłówkowe
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      kdelibs-devel
@@ -43,11 +49,13 @@ Requires:   libgphoto2-devel
 %description devel
 A KDE frontend for gphoto2 - header files.
 
-%description devel -l pl
-Interfejs KDE do gphoto2 - pliki nag³ówkowe.
+%description devel -l pl.UTF-8
+Interfejs KDE do gphoto2 - pliki nagłówkowe.
 
 %prep
 %setup -q
+%patch0 -p1
+
 %{__sed} -i -e "s,Categories.*,Categories=Qt;KDE;Graphics;Photograph;," \
        ./digikam/digikam/digikam.desktop \
        ./digikam/showfoto/showfoto.desktop
@@ -61,6 +69,10 @@ cp -f /usr/share/automake/config.sub admin
 %{__make} -f admin/Makefile.common cvs
 
 %configure \
+%if "%{_lib}" == "lib64"
+       --enable-libsuffix=64 \
+%endif
+       --%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
        --disable-rpath \
        --with-qt-libraries=%{_libdir} \
        --with-imlib2-config=%{_bindir}
@@ -74,10 +86,11 @@ rm -rf $RPM_BUILD_ROOT
        kde_htmldir=%{_kdedocdir} \
        kde_libs_htmldir=%{_kdedocdir}
 
-%find_lang %{name} --with-kde --all-name
+rm $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
 
-# conflict with kdelibs
-rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/image/x-raw.desktop
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr@latin ] || \
+       mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
+%find_lang %{name} --with-kde --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -91,13 +104,24 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/*.so.*.*.*
 %attr(755,root,root) %{_libdir}/kde3/*.so
-%{_libdir}/kde3/*.la
+%attr(755,root,root) %{_datadir}/apps/digikam/utils/digikam-camera
+%dir %{_datadir}/apps/digikam
+%dir %{_datadir}/apps/digikam/utils
+%{_datadir}/apps/digikam/icons
+%{_datadir}/apps/digikam/themes
+%{_datadir}/apps/digikam/about
+%{_datadir}/apps/digikam/data
+%{_datadir}/apps/digikam/profiles
+%{_datadir}/apps/digikam/tips
+%{_datadir}/apps/digikam/digikam-splash.png
+%{_datadir}/apps/digikam/*.rc
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
-%{_datadir}/apps/digikam
 %{_datadir}/apps/showfoto
+%{_datadir}/apps/konqueror/servicemenus/digikam-*.desktop
 %{_desktopdir}/kde/*.desktop
 %{_iconsdir}/[!l]*/*/*/*
+%{_mandir}/man1/digitaglinktree.1*
 
 %files devel
 %defattr(644,root,root,755)