rpms/digikam/devel digikam-0.9.2-beta3-desktop-utf8-fix.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 digikam.spec, 1.33, 1.34 sources, 1.9, 1.10 digi_libkexiv2.patch, 1.1, NONE
Marcin Garski (mgarski)
fedora-extras-commits at redhat.com
Tue Jun 5 21:49:43 UTC 2007
Author: mgarski
Update of /cvs/pkgs/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8874
Modified Files:
.cvsignore digikam.spec sources
Added Files:
digikam-0.9.2-beta3-desktop-utf8-fix.patch
Removed Files:
digi_libkexiv2.patch
Log Message:
- Update to version 0.9.2-beta3 (merge with digikamimageplugins)
- Update description
digikam-0.9.2-beta3-desktop-utf8-fix.patch:
--- NEW FILE digikam-0.9.2-beta3-desktop-utf8-fix.patch ---
diff -ur digikam-0.9.2-beta3.orig/digikam/utilities/hotplug/digikam-download.desktop.in digikam-0.9.2-beta3/digikam/utilities/hotplug/digikam-download.desktop.in
--- digikam-0.9.2-beta3.orig/digikam/utilities/hotplug/digikam-download.desktop.in 2007-06-03 19:24:42.000000000 +0200
+++ digikam-0.9.2-beta3/digikam/utilities/hotplug/digikam-download.desktop.in 2007-06-05 20:31:31.000000000 +0200
@@ -3,7 +3,7 @@
Icon=digikam
Name=Download Photos with digiKam
Name[de]=Bilder mit digiKam herunterladen
-Name[fr]=Télécharger les photos avec digiKam
+Name[fr]=Télécharger les photos avec digiKam
Name[tr]=digiKam ile resimleri göster
[Desktop Entry]
diff -ur digikam-0.9.2-beta3.orig/digikam/utilities/hotplug/digikam-gphoto2-camera.desktop.in digikam-0.9.2-beta3/digikam/utilities/hotplug/digikam-gphoto2-camera.desktop.in
--- digikam-0.9.2-beta3.orig/digikam/utilities/hotplug/digikam-gphoto2-camera.desktop.in 2007-06-03 19:24:42.000000000 +0200
+++ digikam-0.9.2-beta3/digikam/utilities/hotplug/digikam-gphoto2-camera.desktop.in 2007-06-05 20:31:37.000000000 +0200
@@ -3,7 +3,7 @@
Icon=digikam
Name=digiKam Detect and Download
Name[de]=Bilder mit digiKam herunterladen
-Name[fr]=Télécharger les photos avec digiKam
+Name[fr]=Télécharger les photos avec digiKam
Name[tr]=digiKam ile resimler göster
[Desktop Entry]
diff -ur digikam-0.9.2-beta3.orig/digikam/utilities/hotplug/digikam-mount-and-download.desktop.in digikam-0.9.2-beta3/digikam/utilities/hotplug/digikam-mount-and-download.desktop.in
--- digikam-0.9.2-beta3.orig/digikam/utilities/hotplug/digikam-mount-and-download.desktop.in 2007-06-03 19:24:42.000000000 +0200
+++ digikam-0.9.2-beta3/digikam/utilities/hotplug/digikam-mount-and-download.desktop.in 2007-06-05 20:31:44.000000000 +0200
@@ -3,7 +3,7 @@
Icon=digikam
Name=Download Photos with digiKam
Name[de]=Bilder mit digiKam herunterladen
-Name[fr]=Télécharger les photos avec digiKam
+Name[fr]=Télécharger les photos avec digiKam
Name[tr]=digiKam ile resimleri indir
[Desktop Entry]
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 9 Mar 2007 15:54:53 -0000 1.9
+++ .cvsignore 5 Jun 2007 21:48:40 -0000 1.10
@@ -1 +1 @@
-digikam-0.9.1.tar.bz2
+digikam-0.9.2-beta3.tar.bz2
Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- digikam.spec 14 May 2007 14:05:40 -0000 1.33
+++ digikam.spec 5 Jun 2007 21:48:41 -0000 1.34
@@ -1,38 +1,43 @@
+%define alphatag beta3
+
Name: digikam
-Version: 0.9.1
-Release: 3%{?dist}
+Version: 0.9.2
+Release: 0.1.%{alphatag}%{?dist}
Summary: A digital camera accessing & photo management application
Group: Applications/Multimedia
License: GPL
URL: http://www.digikam.org/
-Source0: http://dl.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)
-# http://www.linux.it/~anaselli/kipi-plugins/patches/digikam/digi_libkexiv2.patch.bz2
-Patch1: digi_libkexiv2.patch
+Patch0: digikam-0.9.2-beta3-desktop-utf8-fix.patch
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: kdelibs-devel
BuildRequires: gphoto2-devel >= 2.0.0
-BuildRequires: libkexiv2-devel >= 0.1.5 exiv2-devel >= 0.14 libkipi-devel
+BuildRequires: libkexiv2-devel >= 0.1.5 libkdcraw-devel >= 0.1 libkipi-devel
BuildRequires: lcms-devel libtiff-devel libpng-devel >= 1.2.7 jasper-devel
BuildRequires: sqlite-devel >= 3.0.0
%if 0%{?fedora} > 4 || 0%{?rhel} > 4
BuildRequires: libtool-ltdl-devel
%endif
+Provides: digikamimageplugins = %{version}-%{release}
+Obsoletes: digikamimageplugins < 0.9.1-2
+
%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}
@@ -44,9 +49,9 @@
needed to develop applications using %{name}.
%prep
-%setup -q
+%setup -q -n %{name}-%{version}-%{alphatag}
-%patch1 -p0 -b .exiv2
+%patch0 -p1
%build
unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
@@ -66,13 +71,11 @@
desktop-file-install --vendor="" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
--add-category Photograph \
- --add-category Graphics \
$RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
desktop-file-install --vendor="" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
--add-category Photograph \
- --add-category Graphics \
$RPM_BUILD_ROOT%{_datadir}/applications/kde/showfoto.desktop
%find_lang %{name}
@@ -105,8 +108,8 @@
%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
@@ -119,12 +122,16 @@
%{_datadir}/servicetypes/digikamimageplugin.desktop
%files devel
-%defattr(-, root, root)
+%defattr(-,root,root,-)
%{_includedir}/digikam/
%{_includedir}/digikam_export.h
%{_libdir}/libdigikam.so
%changelog
+* Tue Jun 05 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.2-0.1.beta3
+- Update to version 0.9.2-beta3 (merge with digikamimageplugins)
+- Update description
+
* Mon May 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.1-3
- respin against libkexiv2-0.1.5
- preserve upstream .desktop vendor (f7 branch at least)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 9 Mar 2007 15:54:53 -0000 1.9
+++ sources 5 Jun 2007 21:48:41 -0000 1.10
@@ -1 +1 @@
-41e673dac4d0bb6203a6ec615d44b893 digikam-0.9.1.tar.bz2
+ebc549b6bf9618d431d54d60842b1bd5 digikam-0.9.2-beta3.tar.bz2
--- digi_libkexiv2.patch DELETED ---
More information about the scm-commits
mailing list