diff --git a/.gitignore b/.gitignore index 9b94286..f5f70b9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/digikam-1.8.0.tar.bz2 +/digikam-1.9.0.tar.bz2 diff --git a/digikam-1.8.0-gcc46.patch b/digikam-1.8.0-gcc46.patch deleted file mode 100644 index 5de5746..0000000 --- a/digikam-1.8.0-gcc46.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up digikam-1.8.0/libs/threads/dynamicthread.cpp.gcc46 digikam-1.8.0/libs/threads/dynamicthread.cpp ---- digikam-1.8.0/libs/threads/dynamicthread.cpp.gcc46 2011-01-23 13:27:56.000000000 -0600 -+++ digikam-1.8.0/libs/threads/dynamicthread.cpp 2011-02-04 10:05:11.969447213 -0600 -@@ -257,6 +257,12 @@ bool DynamicThread::DynamicThreadPriv::t - kDebug() << "Transition to Running: Invalid Inactive state" << q; - return false; - } -+ // fix gcc-4.6 failure -- error: control reaches end of non-void function [-Werror=return-type] -+ default: -+ { -+ kDebug() << "libs/threads/dynanamicthread.cpp : Should never reach here: assert?" << q; -+ return false; -+ } - } - } - diff --git a/digikam.spec b/digikam.spec index edbc969..19fa5db 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,7 +1,7 @@ Name: digikam -Version: 1.8.0 -Release: 2%{?dist} +Version: 1.9.0 +Release: 1%{?dist} Summary: A digital camera accessing & photo management application Group: Applications/Multimedia @@ -20,8 +20,6 @@ Patch50: digikam-1.4.0_marble_plugin_rpath.patch Patch51: digikam-1.8.0-libjpeg_version.patch # a more minimal, upstreamable version Patch52: digikam-1.8.0-libjpeg_version-3.patch -# gcc-4.6-ism , error: control reaches end of non-void function [-Werror=return-type] -Patch53: digikam-1.8.0-gcc46.patch ## upstream patches @@ -90,7 +88,6 @@ needed to develop applications using %{name}. %patch50 -p1 -b .marble_plugin_rpath %patch52 -p1 -b .libjpeg_version -%patch53 -p1 -b .gcc46 %build @@ -174,6 +171,9 @@ rm -rf %{buildroot} %changelog +* Thu Mar 17 2011 Rex Dieter 1.9.0-1 +- 1.9.0 + * Tue Feb 08 2011 Fedora Release Engineering - 1.8.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 6862d23..3d33109 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -54aa6150183621cabd5ea222d55685a4 digikam-1.8.0.tar.bz2 +08934e97b63e8b1981f4087ec1a3372e digikam-1.9.0.tar.bz2