[konversation] 1.4-beta1 pkgconfig-style deps

[Rex Dieter]

commit 00fd7854bcff5db55acdb6e4ad21ec257688b59b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Nov 1 15:11:39 2011 -0500

    1.4-beta1
    pkgconfig-style deps

 .gitignore                                     |    1 +
 konversation-1.3.1-fix_scroll_background.patch |   41 ---
 konversation.spec                              |   29 +-
 konverstation-1.3.1-kdebug210106.patch         |  418 ------------------------
 sources                                        |    2 +-
 5 files changed, 15 insertions(+), 476 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c49b5a3..3bf7ed0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 konversation-1.3.1.tar.bz2
+/konversation-1.4-beta1.tar.xz
diff --git a/konversation.spec b/konversation.spec
index b0e3a30..9f8a325 100644
--- a/konversation.spec
+++ b/konversation.spec
@@ -1,31 +1,27 @@
 
+%define pre beta1
+
 Name:           konversation
-Version:        1.3.1
-Release:        6%{?dist}
+Version:        1.4
+Release:        0.1.%{pre}%{?dist}
 Summary:        A user friendly IRC client
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://konversation.kde.org/
-Source0:        ftp://ftp.kde.org/pub/kde/%{?pre:un}stable/konversation/%{version}%{?pre:-%{pre}}/src/konversation-%{version}%{?pre:-%{pre}}.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/%{?pre:un}stable/konversation/%{version}%{?pre:-%{pre}}/src/konversation-%{version}%{?pre:-%{pre}}.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#Upstream patches
-Patch100: konversation-1.3.1-fix_scroll_background.patch
-# Crash in marker cleanup code [QList::*, IRCView::cullMarkedLine]
-# http://bugs.kde.org/210106
-Patch101: konverstation-1.3.1-kdebug210106.patch
-
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  kdelibs4-devel
 BuildRequires:  kdepimlibs-devel
-BuildRequires:  libXScrnSaver-devel
-BuildRequires:  phonon-devel
-BuildRequires:  qca2-devel
+BuildRequires:  pkgconfig(xscrnsaver) 
+BuildRequires:  pkgconfig(phonon)
+BuildRequires:  pkgconfig(qca2)
 
 %{?_kde4_version:Requires: kdelibs4%{?_isa} >= %{_kde4_version}}
-%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
+%{?_qt4:Requires: qt4%{?_isa} >= %{_qt4_version}}
 Requires:       qca-ossl%{?_isa}
 
 %description
@@ -39,9 +35,6 @@ to chat windows; configurable background colors and much more
 %prep
 %setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
-%patch100 -p1 -b .fix_scroll_background
-%patch101 -p1 -b .kdebug210106
-
 
 %build
 mkdir -p %{_target_platform}
@@ -93,6 +86,10 @@ fi
 
 
 %changelog
+* Tue Nov 01 2011 Rex Dieter <rdieter at fedoraproject.org> 1.4-0.1.beta1
+- 1.4-beta1
+- pkgconfig-style deps
+
 * Wed Oct 26 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-6
 - Rebuilt for glibc bug#747377
 
diff --git a/sources b/sources
index f6c4642..194ffd7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f43ac55e4925e9578e87b13fde173671  konversation-1.3.1.tar.bz2
+57efdbd9f50fe7fa9dfde914cc4e9461  konversation-1.4-beta1.tar.xz