[digikam/f15/master] Revert "1.9.0"

[Rex Dieter]

commit 0c194ab6ddb54f0363630082fbc23ad0bacc6d20
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 17 12:24:08 2011 -0500

    Revert "1.9.0"
    
    This reverts commit 117a6a08bb8ba4a87088e17f8cbe2e3d04792bb6.

 .gitignore                |    2 +-
 digikam-1.8.0-gcc46.patch |   16 ++++++++++++++++
 digikam.spec              |   10 +++++-----
 sources                   |    2 +-
 4 files changed, 23 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f5f70b9..9b94286 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/digikam-1.9.0.tar.bz2
+/digikam-1.8.0.tar.bz2
diff --git a/digikam-1.8.0-gcc46.patch b/digikam-1.8.0-gcc46.patch
new file mode 100644
index 0000000..5de5746
--- /dev/null
+++ b/digikam-1.8.0-gcc46.patch
@@ -0,0 +1,16 @@
+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 19fa5db..edbc969 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -1,7 +1,7 @@
 
 Name:	 digikam
-Version: 1.9.0
-Release: 1%{?dist}
+Version: 1.8.0
+Release: 2%{?dist}
 Summary: A digital camera accessing & photo management application
 
 Group:	 Applications/Multimedia
@@ -20,6 +20,8 @@ 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
 
@@ -88,6 +90,7 @@ needed to develop applications using %{name}.
 
 %patch50 -p1 -b .marble_plugin_rpath
 %patch52 -p1 -b .libjpeg_version
+%patch53 -p1 -b .gcc46
 
 
 %build
@@ -171,9 +174,6 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Thu Mar 17 2011 Rex Dieter <rdieter at fedoraproject.org> 1.9.0-1
-- 1.9.0
-
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 3d33109..6862d23 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-08934e97b63e8b1981f4087ec1a3372e  digikam-1.9.0.tar.bz2
+54aa6150183621cabd5ea222d55685a4  digikam-1.8.0.tar.bz2