rpms/digikam/EL-5 .cvsignore, 1.8, 1.9 digikam.spec, 1.31, 1.32 sources, 1.8, 1.9
Marcin Garski (mgarski)
fedora-extras-commits at redhat.com
Fri Dec 14 13:14:04 UTC 2007
Author: mgarski
Update of /cvs/pkgs/rpms/digikam/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28813
Modified Files:
.cvsignore digikam.spec sources
Log Message:
- Update to 0.9.2-final
- License: GPLv2+
- lcms patch (kde bug #148930)
- Update description
- preserve upstream .desktop vendor
- cleanup/simplify BR's,Requires,d-f-i usage
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 9 Mar 2007 16:01:34 -0000 1.8
+++ .cvsignore 14 Dec 2007 13:13:25 -0000 1.9
@@ -1 +1 @@
-digikam-0.9.1.tar.bz2
+digikam-0.9.2-final.tar.bz2
Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/EL-5/digikam.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- digikam.spec 29 Jun 2007 22:30:49 -0000 1.31
+++ digikam.spec 14 Dec 2007 13:13:25 -0000 1.32
@@ -1,18 +1,27 @@
+%define alphatag final
+
Name: digikam
-Version: 0.9.1
-Release: 3%{?dist}
+Version: 0.9.2
+Release: 1%{?dist}
Summary: A digital camera accessing & photo management application
Group: Applications/Multimedia
-License: GPL
+License: GPLv2+
URL: http://www.digikam.org/
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{alphatag}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: qt-devel kdelibs-devel arts-devel gphoto2-devel >= 2.0.0
-BuildRequires: exiv2-devel >= 0.12 libkexiv2-devel >= 0.1 libkipi-devel >= 0.1
+Patch0: digikam-0.9.2-beta3-desktop-utf8-fix.patch
+# http://bugs.kde.org/148930
+Patch148930: digikam-0.9.2-kde#148930.patch
+
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+BuildRequires: kdelibs-devel
+BuildRequires: gphoto2-devel >= 2.0.0
+BuildRequires: libkexiv2-devel >= 0.1.5 libkdcraw-devel >= 0.1.1 libkipi-devel
BuildRequires: lcms-devel libtiff-devel libpng-devel >= 1.2.7 jasper-devel
-BuildRequires: sqlite-devel >= 3.0.0 gettext pkgconfig desktop-file-utils
+BuildRequires: sqlite-devel >= 3.0.0
%if 0%{?fedora} > 4 || 0%{?rhel} > 4
BuildRequires: libtool-ltdl-devel
%endif
@@ -20,13 +29,14 @@
%description
digiKam is an easy to use and powerful digital photo management application,
which makes importing, organizing and manipulating digital photos a "snap".
-The photos can be organized in albums which are automatically sorted
-chronologically. An easy to use interface is provided to connect to your
-digital camera, preview the images and download and/or delete them.
-
-digiKam buildin image editor makes the common photo correction a simple task.
-The image editor is extensible via plugins, install the digikamimageplugins
-and/or kipi-plugins packages to use them.
+An easy to use interface is provided to connect to your digital camera,
+preview the images and download and/or delete them.
+
+digiKam built-in image editor makes the common photo correction a simple task.
+The image editor is extensible via plugins, can also make use of the KIPI image
+handling plugins to extend its capabilities even further for photo
+manipulations, import and export, etc. Install the kipi-plugins packages
+to use them.
%package devel
Summary: Development files for %{name}
@@ -38,16 +48,10 @@
needed to develop applications using %{name}.
%prep
-%setup -q
+%setup -q -n %{name}-%{version}-%{alphatag}
-# Fix .desktop encoding
-pushd digikam/utilities/hotplug/
-for i in *.desktop.in
-do
- iconv -f ISO-8859-1 -t UTF-8 < ${i} > ${i}.tmp
- mv -f ${i}.tmp ${i}
-done
-popd
+%patch0 -p1
+%patch148930 -p1 -b .kde#148930
%build
unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
@@ -65,12 +69,12 @@
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-desktop-file-install --vendor fedora --delete-original \
+desktop-file-install --vendor="" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
--add-category Photography \
$RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
-desktop-file-install --vendor fedora --delete-original \
+desktop-file-install --vendor="" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
--add-category Photography \
$RPM_BUILD_ROOT%{_datadir}/applications/kde/showfoto.desktop
@@ -105,15 +109,15 @@
%doc AUTHORS ChangeLog COPYING HACKING NEWS README TODO
%{_bindir}/*
%{_libdir}/libdigikam.so.*
-%{_libdir}/kde3/digikamimageplugin_core.la
-%{_libdir}/kde3/digikamimageplugin_core.so
+%{_libdir}/kde3/digikamimageplugin_*.la
+%{_libdir}/kde3/digikamimageplugin_*.so
%{_libdir}/kde3/kio_digikam*.la
%{_libdir}/kde3/kio_digikam*.so
%{_datadir}/applications/kde/*.desktop
%{_datadir}/apps/digikam/
%{_datadir}/apps/konqueror/servicemenus/*.desktop
%{_datadir}/apps/showfoto/
-%{_datadir}/icons/hicolor/*/apps/*.png
+%{_datadir}/icons/hicolor/*/*/*
%{_mandir}/man1/*.1*
%{_datadir}/services/digikam*
%{_datadir}/servicetypes/digikamimageplugin.desktop
@@ -125,6 +129,14 @@
%{_libdir}/libdigikam.so
%changelog
+* Fri Dec 14 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.2-1
+- Update to 0.9.2-final
+- License: GPLv2+
+- lcms patch (kde bug #148930)
+- Update description
+- preserve upstream .desktop vendor
+- cleanup/simplify BR's,Requires,d-f-i usage
+
* Sat Jun 30 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.1-3
- Delete original .desktop
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 9 Mar 2007 16:01:34 -0000 1.8
+++ sources 14 Dec 2007 13:13:25 -0000 1.9
@@ -1 +1 @@
-41e673dac4d0bb6203a6ec615d44b893 digikam-0.9.1.tar.bz2
+0f67edf65c394c96cb60d48e4e2bfebd digikam-0.9.2-final.tar.bz2
More information about the scm-commits
mailing list