rpms/kadu/FC-5 .cvsignore, 1.5, 1.6 kadu.spec, 1.4, 1.5 sources, 1.5, 1.6

Sat Sep 16 10:20:48 UTC 2006

Author: ecik

Update of /cvs/extras/rpms/kadu/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19200

Modified Files:
	.cvsignore kadu.spec sources 
Log Message:
* Sat Sep 16 2006 MichaÅ‚ Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.8.20060915svn
- Update upstream to 20060915
- Move themes to external spec file
- Link to existing libgadu



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kadu/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6

--- .cvsignore	11 Aug 2006 11:25:47 -0000	1.5
+++ .cvsignore	16 Sep 2006 10:20:48 -0000	1.6
@@ -1,2 +1 @@
-kadu-20060808.tar.bz2
-kadu-firewall-0.6.3.tar.gz
+kadu-20060915.tar.bz2


Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/FC-5/kadu.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kadu.spec	11 Aug 2006 11:25:47 -0000	1.4
+++ kadu.spec	16 Sep 2006 10:20:48 -0000	1.5
@@ -1,22 +1,13 @@
-%define		cvs_date	20060808
+%define		cvs_date	20060915
 Name:		kadu
 Version:	0.5.0
-Release:	0.7.%{cvs_date}svn%{?dist}
+Release:	0.8.%{cvs_date}svn%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
 URL:		http://www.kadu.net
 Source0:	http://www.kadu.net/download/snapshots/2006/kadu-%{cvs_date}.tar.bz2
 Source3:	kadu.desktop
-# Source 80-99 are themes
-Source80:	http://www.kadu.net/download/additions/kadu-theme-nuvola-16.tar.gz
-Source81:	http://www.kadu.net/download/additions/kadu-theme-nuvola-22.tar.gz
-Source82:	http://www.kadu.net/download/additions/kadu-theme-crystal-16.tar.bz2
-Source83:	http://www.kadu.net/download/additions/kadu-theme-crystal-22.tar.bz2
-Source84:	http://www.kadu.net/download/additions/kadu-theme-glass_16.tar.gz
-Source85:	http://www.kadu.net/download/additions/kadu-theme-glass_22.tar.gz
-Source86:	http://www.kadu.net/download/additions/kompatybilne_z_GG6.tar.gz
-Source87:	http://www.kadu.net/download/additions/kadu-emots-zestaw288.tar.bz2
 # Sources 100-149 are external modules
 Source100:	http://scripts.one.pl/xmms/devel/0.5.0/xmms-1.30.tar.gz
 Source101:	http://scripts.one.pl/amarok/devel/0.5.0/amarok-1.17.tar.gz
@@ -37,7 +28,7 @@
 Source116:	http://www.kadu.net/~pan_wojtas/firewall/download/kadu-firewall-0.6.3.tar.gz
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	libpng-devel qt-devel libsndfile-devel openssl-devel
+BuildRequires:	libpng-devel qt-devel libsndfile-devel openssl-devel libgadu-devel
 %define		_kadudir	%{_datadir}/kadu
 %define		_kadulib	%{_libdir}/kadu	
 %define		_modlib		%{_kadulib}/modules
@@ -239,67 +230,11 @@
 %description wmaker_docking
 WindowMaker docking module
 
-%package theme-nuvola16
-Summary:	Nuvola16 theme for Kadu
-Group:		Applications/Internet
-Requires:	%{name} = %{version}-%{release}
-%description theme-nuvola16
-Nuvola 16x16 icons by David Vignoni
-
-%package theme-nuvola22
-Summary:	Nuvola22 theme for Kadu
-Group:		Applications/Internet
-Requires:	%{name} = %{version}-%{release}
-%description theme-nuvola22
-Nuvola 22x22 icons by David Vignoni
 
-%package theme-crystal16
-Summary:	Crystal16 theme for Kadu
-Group:		Applications/Internet
-Requires:	%{name} = %{version}-%{release}
-%description theme-crystal16
-Crystal 16x16 icons made by Arcisz
-
-%package theme-crystal22
-Summary:	Crystal22 theme for Kadu
-Group:		Applications/Internet
-Requires:	%{name} = %{version}-%{release}
-%description theme-crystal22
-Crystal 22x22 icons made by Arcisz
-
-%package theme-glass16
-Summary:	Glass16 theme for Kadu
-Group:		Applications/Internet
-Requires:	%{name} = %{version}-%{release}
-%description theme-glass16
-Glass 16x16 icons made by Mariusz Waluga
-
-%package theme-glass22
-Summary:	Glass22 theme for Kadu
-Group:		Applications/Internet
-Requires:	%{name} = %{version}-%{release}
-%description theme-glass22
-Glass 22x22 icons made by Mariusz Waluga
-
-%package theme-gg6_compatible
-Summary:	Gg6_compatible theme for Kadu
-Group:		Applications/Internet
-Requires:	%{name} = %{version}-%{release}
-%description theme-gg6_compatible
-Old Gadu-Gadu 6.x emoticons
-
-%package theme-emots
-Summary:	Set of 288 emoticons for Kadu
-Group:		Applications/Internet
-Requires:	%{name} = %{version}-%{release}
-%description theme-emots
-Set of additional 288 emoticons
 
 %prep
 %setup -q -n kadu
 %setup -q -D -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 115 -a 116 -n kadu/modules
-%setup -q -D -T -a 80 -a 81 -a 82 -a 83 -a 84 -a 85 -n kadu/varia/themes/icons
-%setup -q -D -T -a 86 -a 87 -n kadu/varia/themes/emoticons
 %setup -q -D -T -n kadu
 
 ##==some changes in .config file
@@ -329,28 +264,6 @@
 for change in $SHARED_CHANGES; do
 sed s/^$change=.$/$change=m/ -i .config
 done
-#2. themes and others...
-CHANGES="icons_crystal16 \
-	icons_crystal22 \
-	icons_nuvola16 \
-	icons_nuvola22 \
-	icons_glass16 \
-	icons_glass22 \
-	emoticons_gg6_compatible"
-for change in $CHANGES; do
-sed s/^$change=.$/$change=y/ -i .config
-done
-#3. some things need to be added to .config file
-ADDS="emoticons_zestaw_288"
-echo $ADDS >> .config
-#+
-
-##==due to kadu autodownloader there is need to change names of some directories...
-for directory in `ls -d varia/themes/icons/kadu-theme-*`; do
-mv $directory `echo $directory | sed -e s/kadu-theme-// -e s/-// -e s/_//`
-done
-mv varia/themes/emoticons/kompatybilne_z_GG6 varia/themes/emoticons/gg6_compatible
-#+
 
 ##==add shellbang to beginning of file
 sed 1i\#\!/bin/sh -i modules/dcopexport/bin/install-konqueror-setAsKaduDesc.sh
@@ -358,7 +271,7 @@
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-%configure --enable-debug --disable-dependency-tracking
+%configure --enable-debug --disable-dependency-tracking --with-existing-libgadu
 make %{?_smp_mflags}
 
 
@@ -468,9 +381,6 @@
 %defattr(-,root,root,-)
 %{_bindir}/kadu-config
 %{_includedir}/kadu
-%{_includedir}/libgadu*
-%exclude %{_libdir}/libgadu.a
-%{_libdir}/pkgconfig/libgadu.pc
 
 %files arts_sound
 %defattr(-,root,root,-)
@@ -531,38 +441,18 @@
 
 %mod_files mail
 
-%files theme-nuvola16
-%{_themesdir}/icons/nuvola16
-
-%files theme-nuvola22
-%{_themesdir}/icons/nuvola22
-
-%files theme-crystal22
-%{_themesdir}/icons/crystal22
-
-%files theme-crystal16
-%{_themesdir}/icons/crystal16
-
-%files theme-glass16
-%{_themesdir}/icons/glass16
-
-%files theme-glass22
-%{_themesdir}/icons/glass22
-
-%files theme-gg6_compatible
-%{_themesdir}/emoticons/gg6_compatible
-
 %files weather
 %defattr(-,root,root,-)
 %{_modlib}/weather.so
 %{_moddata}/weather.desc
 %{_moddata}/data/weather
 
-%files theme-emots
-%{_themesdir}/emoticons/zestaw_288
-
-
 %changelog
+* Sat Sep 16 2006 MichaÅ‚ Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.8.20060915svn
+- Update upstream to 20060915
+- Move themes to external spec file
+- Link to existing libgadu
+
 * Fri Aug 11 2006 MichaÅ‚ Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.7.20060808svn
 - Update upstream to 20060808
 - Add firewall and wmaker_docking modules


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kadu/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Aug 2006 11:25:47 -0000	1.5
+++ sources	16 Sep 2006 10:20:48 -0000	1.6
@@ -1,4 +1,4 @@
-f908d887c1891287aff6fd050b543b2c  kadu-20060808.tar.bz2
+575746c975382dc7a7d275175449cb21  kadu-20060915.tar.bz2
 62913be4ecb267b9bbf6d87dbb3e67e6  kadu-firewall-0.6.3.tar.gz
 0fb5d8f465899ffbe96d44685e5e9955  amarok-1.17.tar.gz
 9b0622b02a7190502519b2e3034ccec4  dcopexport-0.11.1-20060320-0.5.0-svn.tar.bz2
@@ -8,13 +8,6 @@
 e9d8676608f8c731f665ffc5c5288ad0  filtering-0.3.2-20060727-0.5.0.tar.bz2
 6233a8ef21d901fc5fb91c0db40d0e32  kadu-iwait4u-1.3.tar.gz
 739e2c76fdae17f570d1f4934958cae6  kadu-profiles-0.1.tar.gz
-023085edabaf6a1b844fe6b5fc9315f9  kadu-theme-crystal-16.tar.bz2
-57852ff3d3fd0063a642fcc173f7fa29  kadu-theme-crystal-22.tar.bz2
-c3beb753222b96dad46f3adf230eb3e1  kadu-theme-glass_16.tar.gz
-9ee70ca873fd0f22b2b83be133964d89  kadu-theme-glass_22.tar.gz
-586cc6ff9ba62f0fdd7c7c1adf229efb  kadu-theme-nuvola-16.tar.gz
-7a17b4881141b346c6268ef25c284613  kadu-theme-nuvola-22.tar.gz
-16cbc9e657549b35ee8d8a32f4b6a47d  kompatybilne_z_GG6.tar.gz
 3f9e347fd775324f4077f2f6849a0de7  led_notify-0.9.tar.bz2
 fae1f6bd3d4aca845ef5a57403b5b58c  miastoplusa_sms-0.5-1.3.5.tar.gz
 7148f9fbf312abd6a142339d453e1d90  powerkadu-20060719.tar.gz
@@ -22,5 +15,4 @@
 ef56085ab7d8e60be15d86d2c5f4a424  tabs-current.tar.gz
 30833253a9f94eedc892767c1267536a  weather-3.03.tar.bz2
 422b0bfe2fe1d67620896576e3092ac8  xmms-1.30.tar.gz
-98a378047ea252f7277e978f06f9a6bb  kadu-emots-zestaw288.tar.bz2
 270c19fc9fb3e96bcbce76c2077d3ec2  mail-current.tar.gz


