From d1d336c0230ce8437f072ecf0771514c9c995200 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Sat, 1 May 2010 19:39:16 +0000
Subject: [PATCH] - quassel-0.6.1 - -common subpkg - add minimal qt4/kdelibs4
 deps

---
 .cvsignore            |   2 +-
 quassel.desktop       |  11 -----
 quassel.png           | Bin 4739 -> 0 bytes
 quassel.spec          | 101 ++++++++++++++++++++++++------------------
 quasselclient.desktop |   9 ----
 quasselcore.desktop   |  11 -----
 sources               |   2 +-
 7 files changed, 59 insertions(+), 77 deletions(-)
 delete mode 100644 quassel.desktop
 delete mode 100644 quassel.png
 delete mode 100644 quasselclient.desktop
 delete mode 100644 quasselcore.desktop

diff --git a/.cvsignore b/.cvsignore
index dba0b9f..9615175 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-quassel-0.5.2.tar.bz2
+quassel-0.6.1.tar.bz2
diff --git a/quassel.desktop b/quassel.desktop
deleted file mode 100644
index 8842eba..0000000
--- a/quassel.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=Quassel IRC
-Exec=quassel
-Icon=quassel
-Terminal=false
-Type=Application
-Categories=Qt;Network;IRCClient;
-
-
diff --git a/quassel.png b/quassel.png
deleted file mode 100644
index 9d17c6d6bf75e193611816bf25c6399a3df493db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4739
zcmV-}5`686P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L05@F#05@F$8GuGz00007bV*G`2iXA$
z69@orG!|R{01^X9L_t(&-o2W6uw_?u-hX@VGu-Lj`^J7fsk_xuw+4h--HixB1`DtZ
z2rO)4LTo5OlnR7Om5nNn<H7`pO@+cPhuAJ;*)DJyLm)OdDV4DR$B~STK#@c>8d|i5
zZuRi`sr$`$I>R1T{y6vbfP|2c@TppL>(;&Jo^P$a_FCV!_Eo$D*PlHp%+%O<QH$4S
zo~suNE?p_ux>C~VTB5!q8#+!Gfx|BF;Bv{g=5y}8=X#aB*k`L3bMtQ<l=jXh?`ddm
zZfW+U5vuU8RKQAES=U0(Lf^sALFU0I@QR*;|6K@wTn4`Vz#G&*p98<}4XMqv_~2BN
z-)KZkbYhrDU@8US2OKD&=b&$4=pl1Z1SkVo0R)tFcd9)9jsN$KvHM>r7X3nRc<bMW
zSD8o-1kEQ3&xDr>v;am!q^hW_8|&}YGo!WsaI4hoa@2QT`Gv**w*Av{wV#LsulSPi
z(_bmyr|Rk-qnf$|H3BYY%>XrX4(M}C)|dR8&(6&QuZ>xi=$2;6H!uF9Bb#4x2eh^y
zGEH-vib&*~sIQw=u(1x?8ZebWD}u2I+A(wz=tR(rsue<ksB@e`Ri0_hP^VW99CuIt
z&O_T@vOTc(uiX2a9dlbPhPr`9Q~{h!V5SCjBNQIyGngB~s#WBE1W;8gV>F~Ai<D4G
zwLkh!QTTw%EoEV`c}bZS<jX6MmA$oB^*;IPl^5l}%RZOAvN@UFou(>D3^WXMVi=Ew
zp@Wk{SapgroK2Bu`*Hb!-!%#vMraxc2rC1}O0PWQL@^kW9XtHDZaBO#|FawAhv75N
z1%B73my@Iue>HB#n~Z`;LtO>>RyaJ=%;kz<P=xi|egQR2fHElhUXcYwGto>n48aEm
znIm|?4+p#L{L!QS;Oz%~tUaJpJ`gqHD*#d@m=KsR6sJl}8D3-)Ip+!jU8h);i1Dd0
zc3se>QIApWNl@k!$uE9(>;<pD_D>!gkK4(Y)3LPCF;xv;bKnI;<e3%(34!1P;yuB8
zf*ZYhkA#3!H;<~8AXN7vLac;_5fp+ohN+1L8tATcTYl-Z4UhlbUC)Ly`k_m#?0-sX
zdb*_o%Z0-Kuq+fAf%60#z<Pr9_|hR>2qI{$P_ZG34Jt9H$Y5dvT7%XY1&LPFRFx81
zAP+FPd5YwkeH>am{U7w(KX+U4m7C_DmjfF=^xy?)UH@9ERcE<)wk=2nI(VdT*g-+Q
zG^FU2U7x%AybIqKFUNupD}Yr-x0PZ>MQUdhn|)Ek>~2i9blj<9YB5o2NMeH)RW(E)
zRgiljnVDkuo33j<@%3+htbq4FF9*^FzdgQXL%nN99qPQgC5ZF*+)^$N8JzB~l)d8f
z!OLH_CtBY={`<S#bLIObpXsys{SzAp3#WfBX~Z|x$LrUs&23dmim68^rIG3}#0r8J
zqS?)Cf9*9lA5XvX2ffd~{or$!(QO|+aOK4A?ccSvnt2BJAO!2M-2sCW-KBgr`>!Uc
z{mIg&E*tzfoA=5)grj#nv_DSu@3c2G-aNIrO=B#@n5b%W0#2atU`3N1J$`#@-$ieG
z;5F*m9k}KTUAoSGEi~$Hlykw4ID^kK@~6A>=evLDt-7Uq>s3oHMHRa9wD1cbKX7BC
zo!&OJZG2N}vO%20h*AUr>nj%PofE&b_A`h6{RRK`S<C3@(qHf5_>IAN#D_B$oWu3|
z434c7-Q#OF*V>(%UMlbauiK!w_1CYu-R6GZ!r|q+SLVCq!-C)f-UqA?c<=F|6rJ`b
zCO-0zdd3QD`{So|I@Wvu6|OqJ$Os|J$mUkF!RhShySMK920y{;f{#63FSG2+ovoc4
zT2o`FC?XGFy__i}!OFjU^1b7KeVzk5KfCr0Wx`*b-%f>46clqys6qHYbHDfU>wi30
zuVHLvk2WT5sruNs3PFW@xa!6BdZ!-?@b&Y)z5Av=|Cz<c1%E$v#V+Db6NkaeSzO{d
zSga0SK6lHO5CQD?ivi-w53V<rGheh8x7;Okb0#Opue|CD%lfPDnhehuc5C|mG$*(0
z*n8EscV4t}`gM(3v;&bi2rP9AcjDyQv6FMV?mBhs>MxbW%9Fj*p9Y{Ti@j@yzeU_>
z(@>kBUaxw_*|fMks@2{I+@S%&Fux=OcTH8>D+|u!hZ)7f8e?O1M9GGQrQ+)63x3n3
zA8Wko)%!mDZ*Te+cf9>=SH5p*qPA-=DB@EKJ&Y3Skwml8jh!#QYRk?0Uwhf#ZQg$2
zZ?|V|X^9Bdhqs6;S$*(cij^L|EUNvuj<4$C?>VOrsGk!NCH`#ch;x*yJ!&XSq)}Sq
zeE5Kf+^c>BYn$HoTeEL??PY)Z%KaByF+S7ADaF9SYT>aeV!qI<^#f8mYPFcDnXzbk
zX6#)LH)^lA_U8Zb-+ROSHA*S$(g}vgkJD_V&@`aUxsCLOO&@<esa8P3bwPv>LS;VS
zvmCcJpw>uHTA{SUi@fVCf4OqSbAjKm^F!@7UVp`B_wU_u#ZosT7kGNLV7Y{&D<wx3
z20Z-a0yc`#NyLfy9`}83j)lcOSMJ+>NpG(E<$P_ZQ5r<Z4nKtNXL#q%;tK&0KZa8K
zHGnv`FZc?07?sVCWyFC|^i`FDil|qF&wlXh{b$v!V>7?1uDE>rNB8X6eCf%BKF5}F
z9zD_H_)^C4#R02>lB8Lq(@t4j8}iVR71nIPNnn0CV;E>z(PLxTXoZ!=ubjZHt`UlI
zL<~n5D-O0tZ}{*dP4E3|#U@9L(mLEQBQko#^VJ!`-!J^thZg*2{_y_d8BDe{*4cmM
z%QxTn-ACs6>OUQ2e0Cfi85)g*ty?FU-8#YU%eSD?m_{RJdczpCW{lUG!iU<C`L&s~
z<sK8Y7ABWUdX@v+$`YY02`;dXGl&qpzetPslj5vCH+_P0_}mi3=VM&=W1;VV<<7(I
z3%`4>ZLEJ5H{Yi=Z<&1W{SVITJMTTl-u>Gdn`qJ*uQR)0jApye_MID8859iBEM<<K
z3oPY<xK(SYX1dX%RC}gPZM;cGl8S2kf-vk8%Ccg-XHrOz(oSjdK0O262SO0mJMo#G
zFe<IGuI3R=thsmIeawIR!{2nT5E0rF_14L!d#`=!<Qh>eq1H@LMpJrWabTI<&}M3)
z!Rc<!VrI#V!9|g(cN&wXk!~!5=+Zfw(__T-gz3&WDg+1)ab=a({s(Yct0Hl3Ai<-8
zIfvi-N+z8nSQvqqksv|fRM%bkPbJ^^H(ys@{ONbT`R~8;)%%+P&`CsQ15s><<A^Pt
zlz?J+t;gjTP7tR?FZIiocp3NBMF64n=tN^oM9_{}yN+431POqyC`||`rOyOYob^!<
zzpQMq5`}o3xJjtM`ZKk++8anfBN(KLfEI?Om`4`EyQRJ3-RZ<*rLM(8NldY@n%Rqj
zgyqv~VoX~P3KvDSBpI*QYL_-@^}8QAt)oN;D1sL-B}p^I01_K?sWIMGdOJ=DLC`@E
zHR_`w5WGJbt$gZL#rQ`K9wl(`D8yBoDDX}QKA==U86iT5spOxD1gD@FNj2*P8+4M?
z>WS1777N9~z?0VNEDk&+nqw;^6JrUv6Ov|%Ei57Opg~8v0+~i=J5p@kqauT@jg6S8
zRG9%#TEv!5RO?Z?`zu*EiZ+^Hz`Cj;dFLrhPhNP+GE~*T3w0$-Coqu+&3Z~?6cPjz
z83wuIfyWl9wdzD^%%O!L3%TQa^L-93WLTq-*nrWfC_=>%S?NJ5vhDz56cP$lt%a_)
z5M9ZWb&O#!L|l1a1R%rVKZHi|ug-Ql1yO{{J^8?q)D=2F2;jXUw~(faTB>Lynly#h
z)HsRJh*4-I7z4TW{KJDM*|xdEk`=Uxun3rd)*3H@iX(8o+VEMyu_wDk-XT4U*Cp}f
z#gHV3j*u|QaV0Pu&Pk*XRSuN-?J~%2rPYWlDWs4%A*hUDuf!LgwB1DeO5*8A@D8#<
zSTkTEh~pMz(!@B2R)#c*AvO%G@WfKa-itTTZo~|%=c&a$OTC;B0@`^(sjJx}3a=H?
zFR=^}Bh<FM3~v--Ocg;Cc#91Be>3>Zn}P=D-gez-84PX@enclk5FHa@AWbNS8H1%B
zMQ@1B%aIkhta>f;l40hEF5HdHN{V4o4X2bsM}~SMWoj%%8%>f#?3^8A*QPeDR!Wq{
zh}NJqB7!O{ldYH&i*uOHW|GM*_&6d2RTT~q!pe$Bk$>hqMJE0J?@7OZrqhYixFkW0
zhBzU3M>)*N*M=1RjB;3D^Ab05$Ylkx^<qRPD8Oa~SuZD8N9h7q6u}rIiU?6et(LNL
zLx)|PIz&jdDN6?-&|O`nhz7JT|0xQs2vJhye-Ol$$m-%Zg3;eQZ?I(#e10yz{Ox-}
zy?NQ0sk71$EQSc>+}UZZRHZL?2p%MiUR8voHRS1I#GNK+jfx{eWGExep3N<0nh{fV
zLnl`BGt1EvD|DB7gsechfbaKNTs=&5!DX~|@23ZdiAO^)ki}DhwbftFzxYe@&(Oru
z@7}`lVlRYIokwBQ6lXwcH3W|Ych<Zmc#F4|;B3|ICpY3}FT$_%(OOrM&wH}0q;P?H
ztf@zuR;=0D(6l2#D@B~fNS?8_dYmvl!}R_)u$EiAiL0~;Aj2NAG=FRU<zIQ=Sw(&R
zrFR@<`RQL}ZTT!|QV~U(5F&%5b%cQU%7HL)V%-t(7I7BYw4J=Ym11rQvJw*lv9~m&
z#8`_fErVf+5}|OQgOHs(#p3)S+(eVvSKmm_K_0~w4lhVqAjcnnlsx~<=bnvT@zDdi
z|LCkwnpaDlR-#^Oyn<K&ZBYK~@L#RV>h+@+@s)#(CN^!6A3aJ~S|$-sJ5_jFa`^Zn
zPoL^?=+FXBeD5h%o_L(q{ya=?WaBkAFqD|J0D?k9A;H11L#wr-dqZ~V`{uakzdXnJ
zz;@xM{`JAyy${~^KkdegZd8r2GXze1Ps2K50aaR*Xtaq?CPtYAW#SQ+I-6$Y@>96p
zB6L@XBv7lRlp|W~fYSE}#xS}4QZC%TkMGZCtoZ;+S3&U>HTT$X8vo00dh5Ht_PIMK
z`J#G`(c)3X>;=KTp;rIEUEjG&=QG>h%GeYDUK{#}qUJpHdW!OaU<1lKH0nGuxbA>X
z#?ZB#U<}rm6yAbz)k>*|*7PO3<@NjMn>t@RxWW*9Hm*g6n)`llTf6<iS6_4ey+!Fg
zUyOeAZ1m9M%3r=?YURzZzv0*K{Ku~?t`67U!_0Ptju55EVoe!5bp>f$B~fq=e5g_?
zc*J`ocywGNYRwW{hPV=ufHD!S$#HgHJj<r326rFsa-_S;y6gji-V)Kt$4<WN!d)NP
zb?KgatWv#4pR)dWA2D6?sYSIZ_APJS&PN`)_r@bjOTXr4cTUlo80~#Qsp`xu4uMFj
zvA7xyX3ssoR0@>QXH2vv0INew&RMmG0?HgtJt3W}d(ZxT*ZxVfJ@s&$q)(p8L+@Mv
zaaLZ?8QHZTKdmO}WkYPSz1LmY`|!d0-?L179kV-QnjMnZFkX+S#R}^MYXi>u5qFo$
z5g>@*q&gf4O5x8tk5ZM#wt&SGB+DnB-mz)x|Jt$hWp|k<KB(gKskLE!@U4$b%a3))
zch!GB##FtGwJ&D8wY!%W=U;i`*yC^Oir#N#x2LU{O{C2_k*c_ih~Ndhgo^wHp|F9{
z1;YAtZT+d<!LSQU$4LiEr)E17_iWp7>77wpd&I=?A*JJm`O|Uv$RF%{v41rXuKvvf
zs*y+<Y&q>pdvTuiuAHAca$Ud7_u9C=RkbIhXlxSQXrZDMj7F#!XITcEbBK3PW)<k(
zB2l*1Yijk>)Z~WmPEKvS-z4e5D2^YGlG?(skm9~i?v)<}@dcjK377o4Z>m-!HMl{`
zm&L5L`HmtR?CP#9?a7PbF6;azuT%%E>!Nflpn~^7g<y5?L!;G78pkJFt?|bit<Ixy
zQhPFrlOrasozhXg-z$Q9>~C`6)X)Be|E;p)y==Pn=T%)5T6~!}TQpo*v~8JBxH2EN
zW!dqrtotC5R?3?=9>#Ifjg#6+l+;$^B<)5?I>4l5K^jgTI3PUyu@?;E{{!q0?CuJ!
Rn(Y7p002ovPDHLkV1mmFSG)iK

diff --git a/quassel.spec b/quassel.spec
index 737a1d2..f1bbd14 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
+%post common
 touch --no-create %{_datadir}/icons/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 || :
 fi
 
-%posttrans
+%posttrans common
 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 || :
-
-
 %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/quasselclient.desktop b/quasselclient.desktop
deleted file mode 100644
index 497ca37..0000000
--- a/quasselclient.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=Quassel client
-Exec=quasselclient
-Icon=quassel
-Terminal=false
-Type=Application
-Categories=Qt;Network;IRCClient;
diff --git a/quasselcore.desktop b/quasselcore.desktop
deleted file mode 100644
index a33435d..0000000
--- a/quasselcore.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=Quassel IRC Core
-Exec=quasselcore
-Icon=quassel
-Terminal=false
-Type=Application
-Categories=Qt;Network;IRCClient;
-
-
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