[psi] - new upstream (beta) release - drop all patches (all upstream now)

[Sven Lankes]

commit 30175e49efc4dbe6929d0c3eacf50468056d2ccb
Author: Sven Lankes <sven at lank.es>
Date:   Wed Aug 22 06:15:28 2012 +0200

    - new upstream (beta) release
    - drop all patches (all upstream now)

 .gitignore |    1 +
 psi.spec   |   31 ++++++++-----------------------
 sources    |    2 +-
 3 files changed, 10 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 20e89d2..0058426 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ emoticons-0.10.tar.gz
 psi-lang-packs-0.13-1.tar.gz
 rostericons-0.10.tar.gz
 psi-0.14.tar.bz2
+/psi-0.15-beta2.tar.bz2
diff --git a/psi.spec b/psi.spec
index dfdcdf7..a38aa99 100644
--- a/psi.spec
+++ b/psi.spec
@@ -1,22 +1,11 @@
 Name:       psi
-Version:    0.14
-Release:    9%{?dist}
+Version:    0.15
+Release:    0.1beta2%{?dist}
 Summary:    Jabber client based on Qt
 License:    GPLv2+
 Group:      Applications/Internet
 URL:        http://psi-im.org
-Source0:    http://dl.sf.net/psi/psi-%{version}.tar.bz2
-Patch0:     psi-0.12-qca.patch
-# The following two patches are from the git version - they can 
-# be dropped on the next upstream release
-Patch1:     psi-0.14-configureroomcrash.patch
-Patch2:     psi-0.14-affiliationlistconfigmuc.patch
-# Fix QLabel CVE - rhbz 746877
-Patch3:     psi-0.14-input-validation.patch
-# Fix build with gcc 4.7 - patch is already in upstream git
-Patch4:     psi-0.14-gcc-47.patch
-
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:    http://dl.sf.net/psi/psi-%{version}-beta2.tar.bz2
 
 BuildRequires:  qt4-devel, zlib-devel, desktop-file-utils
 BuildRequires:  qca2-devel, glib2-devel
@@ -39,8 +28,6 @@ Source11:   emoticons-0.10.tar.gz
 Source12:   rostericons-0.10.tar.gz
 #Source13:   systemicons-0.9.3.tar.gz
 
-
-
 %description
 Psi is the premiere Instant Messaging application designed for Microsoft
 Windows, Apple Mac OS X and GNU/Linux. Built upon an open protocol named
@@ -76,12 +63,7 @@ More icons can be found on http://jisp.netflint.net
 
 
 %prep
-%setup -q
-%patch0 -p1 -b .qca
-%patch1 -p1 -b .configureroom
-%patch2 -p1 -b .affiliationlistmuc
-%patch3 -p0 -b .qlabelcve
-%patch4 -p0 -b .gccbuild
+%setup -q -n psi-0.15-beta2
 
 %build
 unset QTDIR
@@ -90,7 +72,6 @@ unset QTDIR
         --bindir=%{_bindir}        \
         --libdir=%{_libdir}        \
         --datadir=%{_datadir}      \
-        --disable-bundled-qca      \
         --disable-aspell           \
         --debug                    \
         --no-separate-debug-info
@@ -170,6 +151,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %changelog
+* Wed Aug 22 2012 Sven Lankes <sven at lank.es>  0.15-0.1beta2
+- new upstream (beta) release
+- drop all patches (all upstream now)
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index c4b5c43..ff737ec 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 1b4b3374c676c330c87e2ef0cd9109fa  emoticons-0.10.tar.gz
 054311487f6bad8e749b6034461bb293  psi-lang-packs-0.13-1.tar.gz
 51386c12abbee7100f092455bfb88bf1  rostericons-0.10.tar.gz
-9d7dcce3bcab53b741a712199bd986be  psi-0.14.tar.bz2
+a1010047483a2b3e71b6a31b3aae0541  psi-0.15-beta2.tar.bz2