- properly commented out macros

[packages/digikam.git] / digikam.spec

diff --git a/digikam.spec b/digikam.spec
index a5c1d1f86481bfe80c744badd93acea37c5f381f..21a31f02c7e3dd468baab2ae32461e36f4f564b2 100644 (file)
--- a/digikam.spec
+++ b/digikam.spec
@@ -1,20 +1,24 @@
+
 Summary:       A KDE frontend for gphoto2
 Summary(pl):   Interfejs KDE do gphoto2
 Name:          digikam
-Version:       0.6
-Release:       1.1
+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: kdesdk-po2xml
+BuildRequires: libexif-devel >= 1:0.5.7
 BuildRequires: libgphoto2-devel
-BuildRequires: libexif-devel >= 0.5.7
+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.
@@ -27,31 +31,31 @@ cyfrowych pod Linuksem.
 Summary:       A KDE frontend for gphoto2 - header files
 Summary(pl):   Interfejs KDE do gphoto2 - pliki nag³ówkowe
 Group:         Development/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
+Requires:      kdelibs-devel
+Requires:      libgphoto2-devel
 
 %description devel
-A KDE frontend for gphoto2 - header files
+A KDE frontend for gphoto2 - header files.
 
 %description -l pl
-Interfejs KDE do gphoto2 - pliki nag³ówkowe
+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
-kde_icondir="%{_pixmapsdir}"; export kde_icondir
+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
-rm -f missing
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-/usr/bin/perl -w admin/am_edit
+#%%{__libtoolize}
+#%%{__aclocal}
+#%%{__autoconf}
+#%%{__autoheader}
+#%%{__automake}
+#%%{__perl} -w admin/am_edit
 
 %configure \
        --disable-rpath
@@ -62,31 +66,37 @@ rm -f missing
 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
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post   -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README
 %attr(755,root,root) %{_bindir}/*
-%{_libdir}/*.*.*.*
-%{_libdir}/kde3/*
-%{_applnkdir}/Graphics/*
+%attr(755,root,root) %{_libdir}/*.so.*.*.*
+%attr(755,root,root) %{_libdir}/kde3/*.so
+%{_libdir}/kde3/*.la
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
 %{_datadir}/apps/digikam
 %{_datadir}/apps/digikamcameraclient
-%{_pixmapsdir}/[!l]*/*/*/*
+%{_desktopdir}/kde/*.desktop
+%{_iconsdir}/[!l]*/*/*/*
 %{_mandir}/man1/*
 
 %files devel
-%{_includedir}/digikam
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/*.so
 %{_libdir}/*.la
-%{_libdir}/*.so
+%{_includedir}/digikam