- properly commented out macros

[packages/digikam.git] / digikam.spec

diff --git a/digikam.spec b/digikam.spec
index 38c7fad1ee5234f035afb4c08a680505f66706cd..21a31f02c7e3dd468baab2ae32461e36f4f564b2 100644 (file)
--- a/digikam.spec
+++ b/digikam.spec
@@ -1,22 +1,24 @@
+
 Summary:       A KDE frontend for gphoto2
 Summary(pl):   Interfejs KDE do gphoto2
 Name:          digikam
-Version:       0.6
-Release:       2
+Version:       0.6.2
+Release:       0.1
 License:       GPL
 Group:         X11/Applications
-Source0:       http://dl.sourceforge.net/digikam/%{name}-%{version}.tar.bz2
-# Source0-md5: c841d1bbd51d0105f545f106451d5ae5
+Source0:       http://digikam.free.fr/Tarballs/%{name}-%{version}.tar.bz2
+# Source0-md5: 842fd284823b48392a659936246da685
+Patch0:                %{name}-desktop.patch
 URL:           http://digikam.sourceforge.net/
+BuildRequires: automake
 BuildRequires: kdelibs-devel
-BuildRequires: libexif-devel >= 0.5.7
+BuildRequires: kdesdk-po2xml
+BuildRequires: libexif-devel >= 1:0.5.7
 BuildRequires: libgphoto2-devel
 BuildRequires: lockdev-devel
 BuildRequires: imlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define         _htmldir        /usr/share/doc/kde/HTML
-
 %description
 Designed to be a standalone application to preview and download images
 from a digital camera on a Linux machine.
@@ -30,6 +32,8 @@ Summary:      A KDE frontend for gphoto2 - header files
 Summary(pl):   Interfejs KDE do gphoto2 - pliki nag³ówkowe
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      kdelibs-devel
+Requires:      libgphoto2-devel
 
 %description devel
 A KDE frontend for gphoto2 - header files.
@@ -38,20 +42,20 @@ A KDE frontend for gphoto2 - header files.
 Interfejs KDE do gphoto2 - pliki nag³ówkowe.
 
 %prep
-%setup -q 
+%setup -q -n %{name}3
+%patch0 -p1
 
 %build
-kde_appsdir="%{_applnkdir}"; export kde_appsdir
-kde_htmldir="%{_htmldir}"; export kde_htmldir
+cp -f /usr/share/automake/config.sub admin
 
-#%{__make} -f admin/Makefile.common configure.in
+#%%{__make} -f admin/Makefile.common configure.in
 #cp admin/acinclude.m4.in ./acinclude.m4
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%{__perl} -w admin/am_edit
+#%%{__libtoolize}
+#%%{__aclocal}
+#%%{__autoconf}
+#%%{__autoheader}
+#%%{__automake}
+#%%{__perl} -w admin/am_edit
 
 %configure \
        --disable-rpath
@@ -62,7 +66,11 @@ kde_htmldir="%{_htmldir}"; export kde_htmldir
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT \
+       'kde_htmldir=%{_kdedocdir}'
+install -d $RPM_BUILD_ROOT%{_desktopdir}/kde
+mv $RPM_BUILD_ROOT/usr/share/applnk/Graphics/*.desktop $RPM_BUILD_ROOT%{_desktopdir}/kde
+install -d $RPM_BUILD_ROOT%{_desktopdir}/kde
 
 %find_lang %{name} --with-kde
 
@@ -79,11 +87,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/*.so.*.*.*
 %attr(755,root,root) %{_libdir}/kde3/*.so
 %{_libdir}/kde3/*.la
-%{_applnkdir}/Graphics/*
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
 %{_datadir}/apps/digikam
 %{_datadir}/apps/digikamcameraclient
+%{_desktopdir}/kde/*.desktop
 %{_iconsdir}/[!l]*/*/*/*
 %{_mandir}/man1/*