diff --git a/.cvsignore b/.cvsignore index 51807ed..fe68bc3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -digikam-0.9.2-final.tar.bz2 +digikam-0.9.3.tar.bz2 diff --git a/digikam-0.9.2-beta3-desktop-utf8-fix.patch b/digikam-0.9.2-beta3-desktop-utf8-fix.patch deleted file mode 100644 index c0482b1..0000000 --- a/digikam-0.9.2-beta3-desktop-utf8-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -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] diff --git a/digikam-0.9.2-kde#148930.patch b/digikam-0.9.2-kde#148930.patch deleted file mode 100644 index 9e1dae1..0000000 --- a/digikam-0.9.2-kde#148930.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up digikam-0.9.2-final/digikam/libs/lprof/lcmsprf.h.kde#148930 digikam-0.9.2-final/digikam/libs/lprof/lcmsprf.h ---- digikam-0.9.2-final/digikam/libs/lprof/lcmsprf.h.kde#148930 2007-06-13 13:06:04.000000000 -0500 -+++ digikam-0.9.2-final/digikam/libs/lprof/lcmsprf.h 2007-08-29 07:13:38.000000000 -0500 -@@ -69,6 +69,10 @@ typedef struct { - - } MATN,FAR* LPMATN; - -+// See B.K.O #148930: compile with lcms v.1.17 -+#if (LCMS_VERSION > 116) -+typedef LCMSBOOL BOOL; -+#endif - - LPMATN cdecl MATNalloc(int Rows, int Cols); - void cdecl MATNfree (LPMATN mat); diff --git a/digikam.spec b/digikam.spec index fc9a895..e5f9044 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,25 +1,19 @@ -%define alphatag final - Name: digikam -Version: 0.9.2 -Release: 6%{?dist} +Version: 0.9.3 +Release: 1%{?dist} Summary: A digital camera accessing & photo management application Group: Applications/Multimedia License: GPLv2+ URL: http://www.digikam.org/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{alphatag}.tar.bz2 +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -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: libkexiv2-devel >= 0.1.6 libkdcraw-devel >= 0.1.2 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 @@ -51,10 +45,8 @@ This package contains the libraries, include files and other resources needed to develop applications using %{name}. %prep -%setup -q -n %{name}-%{version}-%{alphatag} +%setup -q -%patch0 -p1 -%patch148930 -p1 -b .kde#148930 %build unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh @@ -82,7 +74,7 @@ desktop-file-install --vendor="" \ --add-category Photography \ $RPM_BUILD_ROOT%{_datadir}/applications/kde/showfoto.desktop -%find_lang %{name} +%find_lang %{name} || touch %{name}.lang rm -f $RPM_BUILD_ROOT%{_libdir}/libdigikam.la @@ -141,6 +133,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libdigikam.so %changelog +* Sat Dec 22 2007 Marcin Garski 0.9.3-1 +- Update to 0.9.3 +- BR: libkexiv2-devel >= 0.1.6 libkdcraw-devel >= 0.1.2 + * Sat Dec 15 2007 Marcin Garski 0.9.2-6 - Rebuild against new libpng (#425781) diff --git a/sources b/sources index e8209ce..63707fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0f67edf65c394c96cb60d48e4e2bfebd digikam-0.9.2-final.tar.bz2 +20497c1a02394505f899ef0757ebefad digikam-0.9.3.tar.bz2