Merge branch 'master' into f22

* master:
  Fix date
  Remove the AppData file as the desktop file is no longer valid
  update to latest upstream - 0.12.2
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
  Rebuilt for GCC 5 C++11 ABI change
  trivial: Fix a typo in the last commit
  Add an AppData file for the software center
  Fix BZ1205130 - CTCP DoS

.gitignore

@@ -5,3 +5,4 @@
 /quassel-0.9.2.tar.bz2
 /quassel-0.10.0.tar.bz2
 /quassel-0.11.0.tar.bz2
+/quassel-0.12.2.tar.bz2

quassel.spec

@@ -1,6 +1,6 @@
 Name:    quassel
 Summary: A modern distributed IRC system
-Version: 0.11.0
+Version: 0.12.2
 Release: 2%{?dist}
 
 License: GPLv2 or GPLv3
@@ -22,7 +22,7 @@ Requires: %{name}-common = %{version}-%{release}
 
 # BZ1205130 - CTCP query Denial of Service
 ## Upstream patch git commit id b5e38970ffd55e2dd9f706ce75af9a8d7730b1b8
-Patch0: quassel-0.11.0-CTCP-query-crash.patch
+#Patch0: quassel-0.11.0-CTCP-query-crash.patch
 
 %description
 Quassel IRC is a modern, distributed IRC client, 
@@ -64,7 +64,7 @@ Quassel client
 %prep
 %setup -q -n %{name}-%{version}
 
-%patch0 -p1
+#%patch0 -p1
 
 %build
 mkdir build
@@ -122,6 +122,21 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 
 %changelog
+* Wed Sep 16 2015 Richard Hughes <rhughes@redhat.com> - 0.12.2-2
+- Remove the AppData file as the desktop file is no longer valid.
+
+* Mon Aug 03 2015 Adam Miller <maxamillion@fedoraproject.org> - 0.12.2-1
+- Update to latest upstream release.
+
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 0.11.0-4
+- Rebuilt for GCC 5 C++11 ABI change
+
+* Thu Mar 26 2015 Richard Hughes <rhughes@redhat.com> - 0.11.0-3
+- Add an AppData file for the software center
+
 * Tue Mar 24 2015 Adam Miller <maxamillion@fedoraproject.org> - 0.11.0-2
 - BZ1205130 - patch for CTCP Denial of Service
 

sources

@@ -1 +1 @@
-b6a89db333eb225760f95becd3680ca8  quassel-0.11.0.tar.bz2
+f5473a9c5927a0e8cb3a204ced887aa8  quassel-0.12.2.tar.bz2