From a266e0629afd231a35c73a65a82a4b7fa000e9f5 Mon Sep 17 00:00:00 2001
From: "Steven M. Parrish" <tuxbrewr@fedoraproject.org>
Date: Mon, 3 May 2010 14:30:03 +0000
Subject: [PATCH] New upstream release

---
 quassel.spec | 109 ++++++++++++++++++++++++++++-----------------------
 sources      |   2 +-
 2 files changed, 62 insertions(+), 49 deletions(-)

diff --git a/quassel.spec b/quassel.spec
index 737a1d2..54e7c8e 100755
--- a/quassel.spec
+++ b/quassel.spec
@@ -1,22 +1,24 @@
 Name:    quassel
 Summary: A modern distrubuted IRC system
-Version: 0.5.2
+Version: 0.6.1
 Release: 1%{?dist}
 
 License: GPLv2 or GPLv3
 Group:	 Applications/Internet
 URL:     http://quassel-irc.org/
-Source0: http://quassel-irc.org/system/files/quassel-%{version}.tar.bz2
-Source1: %{name}.desktop
-Source2: %{name}core.desktop
-Source3: %{name}client.desktop
-Source4: %{name}.png
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Source0: http://quassel-irc.org/pub/quassel-%{version}.tar.bz2
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-Requires: qt-sqlite, openssl
-BuildRequires: qt-devel, openssl-devel, kdebase-workspace-devel
-BuildRequires: cmake, kde-filesystem
+Buildrequires: cmake
 BuildRequires: desktop-file-utils
+buildRequires: kdebase-workspace-devel
+BuildRequires: kde-filesystem
+BuildRequires: openssl-devel
+BuildRequires: qt4-devel
+
+Provides: %{name}-gui = %{version}-%{release}
+
+Requires: %{name}-common = %{version}-%{release}
 
 %description
 Quassel IRC is a modern, distributed IRC client, 
@@ -25,6 +27,20 @@ to and detach from a central core --
 much like the popular combination of screen and a 
 text-based IRC client such as WeeChat, but graphical
 
+%package common
+Summary: Quassel common/shared files
+Group: Applications/Internet
+# not strictly required, but helps this get pulled out when
+# someone removes %%name or %%name-client
+Requires: %{name}-gui = %{version}-%{release}
+# put here for convenience, instead of all subpkgs which
+# provide %%{name}-gui
+%{?_kde4_version:Requires: kdelibs4 >= %{_kde4_version}}
+%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
+BuildArch: noarch
+%description common
+%{summary}.
+
 %package core
 Summary: Quassel core component
 Group: Applications/Internet
@@ -35,79 +51,76 @@ server, and allows for multiple clients to connect
 %package client
 Summary: Quassel client
 Group: Applications/Internet
+Provides: %{name}-gui = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
 %description client
 Quassel client 
 
+
 %prep
 %setup -q -n %{name}-%{version}
 
 %build
-
 mkdir build
-cd build
+pushd build
 %{cmake_kde4} .. -DWANT_MONO=1 -DWITH_KDE=1 
-make 
+popd
+
+make %{?_smp_mflags} -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+make install/fast DESTDIR=${RPM_BUILD_ROOT} -C build
 
-cd build
-make install DESTDIR=${RPM_BUILD_ROOT} 
+# unpackaged files
+rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/quassel.png
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+%post common
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
-%postun
+%postun common
 if [ $1 -eq 0 ] ; then
-  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
-  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 fi
 
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-
-%post client
-touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-
-%postun client
-if [ $1 -eq 0 ] ; then
-  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
-  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-fi
-
-%posttrans client
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-
+%posttrans common
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 %files 
 %defattr(-,root,root,-)
-%attr(755,root,root) %{_bindir}/quassel
-%doc COPYING gpl-2.0.txt gpl-3.0.txt README
-%{_kde4_appsdir}/quassel/
-/usr/share/icons/hicolor/48x48/apps/quassel.png
-# pixmaps dir is deprecated, not needed anymore -- Rex
-/usr/share/pixmaps/quassel.png
+%{_kde4_bindir}/quassel
 %{_kde4_datadir}/applications/kde4/quassel.desktop
 
+%files common
+%defattr(-,root,root,-)
+%doc COPYING README
+%doc gpl-2.0.txt gpl-3.0.txt
+%{_kde4_appsdir}/quassel/
+%{_kde4_iconsdir}/hicolor/*/*/*
+
 %files core
 %defattr(-,root,root,-)
-%attr(755,root,root) %{_bindir}/quasselcore
-%doc COPYING gpl-2.0.txt gpl-3.0.txt README
+%doc COPYING README
+%doc gpl-2.0.txt gpl-3.0.txt
+%{_kde4_bindir}/quasselcore
 
 %files client 
 %defattr(-,root,root,-)
-%attr(755,root,root) %{_bindir}/quasselclient
-%doc COPYING gpl-2.0.txt gpl-3.0.txt README
-%{_kde4_appsdir}/quassel/
-/usr/share/icons/hicolor/48x48/apps/quassel.png
-/usr/share/pixmaps/quassel.png
+%{_kde4_bindir}/quasselclient
 %{_kde4_datadir}/applications/kde4/quasselclient.desktop
 
+
 %changelog
+* Sat May 01 2010 Rex Dieter <rdieter@fedoraproject.org> - 0.6.1-1
+- quassel-0.6.1
+- -common subpkg
+- add minimal qt4/kdelibs4 deps
+
 * Mon Feb 15 2010 Steven Parrish <smparrish@gmail.com> - 0.5.2-1
 - New bugfix release
 
diff --git a/sources b/sources
index 60c1535..4f8303f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b94cbd1f63db8e22f53360b32bb955b7  quassel-0.5.2.tar.bz2
+569d310d06f124952009704d55a98100  quassel-0.6.1.tar.bz2