diff --git a/.cvsignore b/.cvsignore index 51807ed..573b993 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ digikam-0.9.2-final.tar.bz2 +digikam-0.9.3-beta2.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 67f0f64..8b9e191 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,8 +1,8 @@ -%define alphatag final +%define alphatag beta2 Name: digikam -Version: 0.9.2 -Release: 5%{?dist} +Version: 0.9.3 +Release: 0.1.%{alphatag}%{?dist} Summary: A digital camera accessing & photo management application Group: Applications/Multimedia @@ -11,10 +11,6 @@ URL: http://www.digikam.org/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{alphatag}.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 @@ -53,8 +49,6 @@ needed to develop applications using %{name}. %prep %setup -q -n %{name}-%{version}-%{alphatag} -%patch0 -p1 -%patch148930 -p1 -b .kde#148930 %build unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh @@ -141,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libdigikam.so %changelog +* Tue Nov 13 2007 Rex Dieter 0.9.3-0.1.beta2 +- digikam-0.9.3-beta2 + * Tue Sep 18 2007 Marcin Garski 0.9.2-5 - Rebuild diff --git a/sources b/sources index e8209ce..d355a19 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0f67edf65c394c96cb60d48e4e2bfebd digikam-0.9.2-final.tar.bz2 +7277c393c1171a53b80dfd576670f251 digikam-0.9.3-beta2.tar.bz2