Merge branch 'master' into f22

.gitignore

@@ -6,3 +6,4 @@
 /quassel-0.10.0.tar.bz2
 /quassel-0.11.0.tar.bz2
 /quassel-0.12.2.tar.bz2
+/quassel-0.12.3.tar.bz2

quassel.spec

@@ -1,7 +1,7 @@
 Name:    quassel
 Summary: A modern distributed IRC system
-Version: 0.12.2
-Release: 6%{?dist}
+Version: 0.12.3
+Release: 1%{?dist}
 
 License: GPLv2 or GPLv3
 Group:   Applications/Internet
@@ -23,9 +23,6 @@ Provides: %{name}-gui = %{version}-%{release}
 
 Requires: %{name}-common = %{version}-%{release}
 
-# Backported fix for CVE-2015-8547
-Patch0: quassel_0.11.1_CVE-2015-8547.diff
-
 %description
 Quassel IRC is a modern, distributed IRC client, 
 meaning that one (or multiple) client(s) can attach 
@@ -66,8 +63,6 @@ Quassel client
 %prep
 %setup -q -n %{name}-%{version}
 
-%patch0 -p1
-
 %build
 mkdir build
 pushd build
@@ -124,6 +119,13 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 
 %changelog
+* Tue Feb 09 2016 Ben Rosser <rosser.bjr@gmail.com> 0.12.3-1
+- Update to latest upstream quassel release
+- The CVE patch is not necessary for 0.12.3 or greater
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Tue Dec 15 2015 Christian Dersch <lupinix@mailbox.org> - 0.12.2-6
 - Added security fix for CVE-2015-8547
 

sources

@@ -1 +1,2 @@
 f5473a9c5927a0e8cb3a204ced887aa8  quassel-0.12.2.tar.bz2
+a1eec91b56df7d538dfc7cafa8dfabae  quassel-0.12.3.tar.bz2