[clementine] Update to 1.2.3

[Jan Grulich]

commit 06da8791b1c0ea115abede76d4d57894e025aad5
Author: Jan Grulich <jgrulich at redhat.com>
Date:   Mon Sep 22 14:19:48 2014 +0200

    Update to 1.2.3

 .gitignore                              |    1 +
 clementine-do-not-use-system-sha2.patch |   23 +++++++++++++++++++++++
 clementine.spec                         |   15 ++++++++++-----
 sources                                 |    2 +-
 4 files changed, 35 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fd8bf2a..5f690b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /clementine-1.1.1.tar.gz
 /clementine-1.2.1.tar.gz
+/clementine-1.2.3.tar.gz
diff --git a/clementine-do-not-use-system-sha2.patch b/clementine-do-not-use-system-sha2.patch
new file mode 100644
index 0000000..110f864
--- /dev/null
+++ b/clementine-do-not-use-system-sha2.patch
@@ -0,0 +1,23 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 38c4cc1..850ad22 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -379,14 +379,10 @@ if(GMOCK_INCLUDE_DIRS)
+   endif(GTEST_INCLUDE_DIRS)
+ endif(GMOCK_INCLUDE_DIRS)
+ 
+-# Use system sha2 if it's available
+-find_path(SHA2_INCLUDE_DIRS sha2.h)
+-find_library(SHA2_LIBRARIES sha2)
+-if(NOT SHA2_INCLUDE_DIRS OR NOT SHA2_LIBRARIES)
+-  add_subdirectory(3rdparty/sha2)
+-  set(SHA2_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/sha2)
+-  set(SHA2_LIBRARIES sha2)
+-endif(NOT SHA2_INCLUDE_DIRS OR NOT SHA2_LIBRARIES)
++# Never use the system's sha2.
++add_subdirectory(3rdparty/sha2)
++set(SHA2_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/sha2)
++set(SHA2_LIBRARIES sha2)
+ 
+ # Use our 3rdparty chromaprint if a system one wasn't found
+ if(NOT CHROMAPRINT_FOUND)
diff --git a/clementine.spec b/clementine.spec
index 4225685..c2b6374 100644
--- a/clementine.spec
+++ b/clementine.spec
@@ -1,6 +1,6 @@
 Name:           clementine
-Version:        1.2.1
-Release:        5%{?dist}
+Version:        1.2.3
+Release:        1%{?dist}
 Summary:        A music player and library organizer
 
 Group:          Applications/Multimedia
@@ -15,6 +15,7 @@ Patch0:         clementine-mygpo.patch
 # * non-compliant groups, https://code.google.com/p/clementine-player/issues/detail?id=2690
 Patch3:         clementine-desktop.patch
 Patch4:         clementine-udisks-headers.patch
+Patch5:         clementine-do-not-use-system-sha2.patch
 
 BuildRequires:  boost-devel
 BuildRequires:  cmake
@@ -73,11 +74,12 @@ music.
 %patch0 -p1 -b .mygpo
 %patch3 -p1 -b .desktop
 %patch4 -p1 -b .udisks-headers
+%patch5 -p1 -b .do-not-use-system-sha2
 
 # Remove most 3rdparty libraries
-mv 3rdparty/{gmock,qocoa,qsqlite}/ .
+mv 3rdparty/{gmock,qocoa,qsqlite,sha2}/ .
 rm -fr 3rdparty/*
-mv {gmock,qocoa,qsqlite}/ 3rdparty/
+mv {gmock,qocoa,qsqlite,sha2}/ 3rdparty/
 
 # Can't run all the unit tests
 #   songloader requires internet connection
@@ -139,6 +141,9 @@ update-desktop-database &> /dev/null || :
 %{_datadir}/kde4/services/clementine-zune.protocol
 
 %changelog
+* Mon Sep 22 2014 Jan Grulich <jgrulich at redhat.com> - 1.2.3-1
+- 1.2.3
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
@@ -238,7 +243,7 @@ update-desktop-database &> /dev/null || :
 * Sun Feb 26 2012 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.0.1-3
 - Fix a possible crash when an album cover search times out RHBZ#797451
 
-* Mon Feb 07 2012 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.0.1-2
+* Tue Feb 07 2012 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.0.1-2
 - Re-add the fresh start patch. Looks like it didn't make it to 1.0.1
 - Include plasma addon only in F-17+
 
diff --git a/sources b/sources
index f8c1f0c..0ffb515 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5d079e12f5925845cc7e38ce2f4a1e20  clementine-1.2.1.tar.gz
+e97ed3e76187d599f39f1d3b7b8b5187  clementine-1.2.3.tar.gz