rpms
/
quassel
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into f19 

* master:
  update to latest upstream
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
  updated to latest upstream
  Update to latest upstream release/Fix for CVE-2013-4422 (BZ#1017437)
  update to latest upstream 0.9.0
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
  Perl 5.18 rebuild

Conflicts:
	.gitignore
	quassel.spec
	sources
This commit is contained in:
Adam Miller 2014-07-09 10:37:05 -05:00
parent 90a5297811 4fda98c51d
commit 8be1393b75
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -1,5 +1 @@
/quassel-0.7.3.tar.bz2
/quassel-0.8.0.tar.bz2
/quassel-0.9.0.tar.bz2
/quassel-0.9.1.tar.bz2
/quassel-0.9.2.tar.bz2
/quassel-0.10.0.tar.bz2

13
quassel.spec
View File

@ -1,6 +1,6 @@
Name: quassel
Summary: A modern distributed IRC system
Version: 0.9.2
Version: 0.10.0
Release: 1%{?dist}
License: GPLv2 or GPLv3
@ -15,7 +15,7 @@ buildRequires: kdebase-workspace-devel
BuildRequires: kde-filesystem
BuildRequires: openssl-devel
BuildRequires: qt4-devel
BuildRequires: qt4-webkit-devel
Provides: %{name}-gui = %{version}-%{release}
Requires: %{name}-common = %{version}-%{release}
@ -116,6 +116,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
%changelog
* Wed Jul 09 2014 Adam Miller <maxamillion@fedoraproject.org> - 0.10.0-1
- Update to latest upstream release
* Fri Jan 24 2014 Adam Miller <maxamillion@fedoraproject.org> - 0.9.2-1
- Update to latest upstream release
@ -126,6 +129,12 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
* Tue Aug 27 2013 Adam Miller <maxamillion@fedoraproject.org> - 0.9.0-1
- Update to latest upstream release
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 0.8.0-3
- Perl 5.18 rebuild
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
4ed88d288f60290f4459d3e68d61b037 quassel-0.9.2.tar.bz2
382466a7790979c172b7d7edf10a2981 quassel-0.10.0.tar.bz2