From 9161cabb8371c1bd3d1d1be6bffe2d9f9d8c1325 Mon Sep 17 00:00:00 2001
From: Michał Bentkowski <ecik@fedoraproject.org>
Date: Jul 30 2006 12:31:13 +0000
Subject: auto-import kadu-0.5.0-0.6.20060730svn on branch devel from

    kadu-0.5.0-0.6.20060730svn.src.rpm

---

diff --git a/.cvsignore b/.cvsignore
index db84a2c..453aa40 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,7 +3,9 @@ dcopexport-0.11.1-20060320-0.5.0-svn.tar.bz2
 exec_notify-20060424.tar.bz2
 ext_info-2.0beta8.tar.bz2
 filedesc-1.12.tar.gz
+filtering-0.3.2-20060727-0.5.0.tar.bz2
 kadu-iwait4u-1.3.tar.gz
+kadu-profiles-0.1.tar.gz
 kadu-theme-crystal-16.tar.bz2
 kadu-theme-crystal-22.tar.bz2
 kadu-theme-glass_16.tar.gz
@@ -13,11 +15,11 @@ kadu-theme-nuvola-22.tar.gz
 kompatybilne_z_GG6.tar.gz
 led_notify-0.9.tar.bz2
 miastoplusa_sms-0.5-1.3.5.tar.gz
+powerkadu-20060719.tar.gz
 spellchecker-0.18.tar.gz
 tabs-current.tar.gz
 weather-3.03.tar.bz2
 xmms-1.30.tar.gz
-filtering-0.3.2-20060727-0.5.0.tar.bz2
-kadu-20060727.tar.bz2
-kadu-profiles-0.1.tar.gz
-powerkadu-20060719.tar.gz
+kadu-20060730.tar.bz2
+kadu-emots-zestaw288.tar.bz2
+mail-current.tar.gz
diff --git a/kadu.spec b/kadu.spec
index db89a54..a8d6796 100644
--- a/kadu.spec
+++ b/kadu.spec
@@ -1,7 +1,7 @@
-%define		cvs_date	20060727
+%define		cvs_date	20060730
 Name:		kadu
 Version:	0.5.0
-Release:	0.5.%{cvs_date}svn%{?dist}
+Release:	0.6.%{cvs_date}svn%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Group:		Applications/Internet
 License:	GPL
@@ -16,11 +16,12 @@ 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
 Source102:	http://scripts.one.pl/filedesc/devel/0.5.0/filedesc-1.12.tar.gz
-#Source103:	http://michal.gov.one.pl/mail/tars/release/mail-0.2.0.tar.bz2
+Source103:	http://www.kadu.net/download/modules_mirror/mail-current.tar.gz
 Source104:	http://scripts.one.pl/spellchecker/devel/0.5.0/spellchecker-0.18.tar.gz
 Source105:	http://kadu.net/~blysk/weather-3.03.tar.bz2
 Source106:	http://www.kadu.net/~dzwiedziu/pub/ext_info-2.0beta8.tar.bz2
@@ -47,7 +48,7 @@ BuildRequires:	libpng-devel qt-devel libsndfile-devel openssl-devel
 %define		mod_files()	%files %1 \
 	%defattr(-,root,root,-) \
 	%{_moddata}/%1.desc \
-	%attr(0755, root, root) %{_modlib}/%1.so \
+	%{_modlib}/%1.so \
 	%{_modtrans}/%{1}*.qm \
 
 
@@ -55,7 +56,7 @@ BuildRequires:	libpng-devel qt-devel libsndfile-devel openssl-devel
 %define		mod_files2()	%files %1 \
 	%defattr(-,root,root,-) \
 	%{_moddata}/%1.desc \
-	%attr(0755, root, root) %{_modlib}/%1.so \
+	%{_modlib}/%1.so \
 	%{_modtrans}/%{1}*.qm \
 	%{_moddata}/data/%1 \
 
@@ -130,12 +131,12 @@ Requires:	%{name} = %{version}-%{release}
 %description weather
 Weather checking.
 
-#%package mail
-#Summary:	mail module for Kadu
-#Group:		Applications/Internet
-#Requires:	%{name} = %{version}-%{release}
-#%description mail
-#Mail checker module.
+%package mail
+Summary:	mail module for Kadu
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+%description mail
+Mail checker module.
 
 %package spellchecker
 Summary:	Spellchecker module for Kadu
@@ -271,11 +272,18 @@ 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 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 115 -n kadu/modules
+%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 -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 -n kadu/varia/themes/emoticons
+%setup -q -D -T -a 86 -a 87 -n kadu/varia/themes/emoticons
 %setup -q -D -T -n kadu
 
 ##==some changes in .config file
@@ -298,6 +306,7 @@ SHARED_CHANGES="module_alsa_sound \
 	module_powerkadu \
 	module_filtering \
 	module_profiles \
+	module_mail \
 	module_exec_notify"
 for change in $SHARED_CHANGES; do
 sed s/^$change=.$/$change=m/ -i .config
@@ -313,6 +322,9 @@ CHANGES="icons_crystal16 \
 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...
@@ -322,7 +334,7 @@ done
 mv varia/themes/emoticons/kompatybilne_z_GG6 varia/themes/emoticons/gg6_compatible
 #+
 
-##==add shellbang to beggining of file
+##==add shellbang to beginning of file
 sed 1i\#\!/bin/sh -i modules/dcopexport/bin/install-konqueror-setAsKaduDesc.sh
 #+
 
@@ -359,22 +371,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/fedora-kadu.desktop
 %dir %{_kadulib}
 %dir %{_modlib}
-%attr(0755, root, root) %{_modlib}/account_management.so
-%attr(0755, root, root) %{_modlib}/arts_sound.so
-%attr(0755, root, root) %{_modlib}/autoaway.so
-%attr(0755, root, root) %{_modlib}/autoresponder.so
-%attr(0755, root, root) %{_modlib}/config_wizard.so
-%attr(0755, root, root) %{_modlib}/dcc.so
-%attr(0755, root, root) %{_modlib}/default_sms.so
-%attr(0755, root, root) %{_modlib}/dsp_sound.so
-%attr(0755, root, root) %{_modlib}/encryption.so
-%attr(0755, root, root) %{_modlib}/ext_sound.so
-%attr(0755, root, root) %{_modlib}/hints.so
-%attr(0755, root, root) %{_modlib}/migration.so
-%attr(0755, root, root) %{_modlib}/sms.so
-%attr(0755, root, root) %{_modlib}/voice.so
-%attr(0755, root, root) %{_modlib}/window_notify.so
-%attr(0755, root, root) %{_modlib}/x11_docking.so
+%{_modlib}/account_management.so
+%{_modlib}/arts_sound.so
+%{_modlib}/autoaway.so
+%{_modlib}/autoresponder.so
+%{_modlib}/config_wizard.so
+%{_modlib}/dcc.so
+%{_modlib}/default_sms.so
+%{_modlib}/dsp_sound.so
+%{_modlib}/encryption.so
+%{_modlib}/ext_sound.so
+%{_modlib}/hints.so
+%{_modlib}/migration.so
+%{_modlib}/sms.so
+%{_modlib}/voice.so
+%{_modlib}/window_notify.so
+%{_modlib}/x11_docking.so
 %dir %{_modlib}/bin
 %ghost %{_datadir}/applnk/Internet/kadu.desktop
 %dir %{_kadudir}
@@ -445,18 +457,18 @@ rm -rf $RPM_BUILD_ROOT
 %files arts_sound
 %defattr(-,root,root,-)
 %{_moddata}/arts_sound.desc
-%attr(0755, root, root) %{_modlib}/arts_sound.so
+%{_modlib}/arts_sound.so
 %{_modlib}/bin/arts_sound
 
 %files esd_sound
 %defattr(-,root,root,-)
 %{_moddata}/esd_sound.desc
-%attr(0755, root, root) %{_modlib}/esd_sound.so
+%{_modlib}/esd_sound.so
 
 %files alsa_sound
 %defattr(-,root,root,-)
 %{_moddata}/alsa_sound.desc
-%attr(0755, root, root) %{_modlib}/alsa_sound.so
+%{_modlib}/alsa_sound.so
 %{_modtrans}/alsa_sound_*.qm
 
 %mod_files2 xmms
@@ -491,6 +503,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %mod_files exec_notify
 
+%mod_files mail
+
 %files theme-nuvola16
 %{_themesdir}/icons/nuvola16
 
@@ -514,11 +528,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files weather
 %defattr(-,root,root,-)
-%attr(0755, root, root) %{_modlib}/weather.so
+%{_modlib}/weather.so
 %{_moddata}/weather.desc
 %{_moddata}/data/weather
 
+%files theme-emots
+%{_themesdir}/emoticons/zestaw_288
+
+
 %changelog
+* Sun Jul 30 2006 Michał Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.6.20060730svn
+- Update upstream do 20060730, with fixed x64 bugs
+- Add mail module and emots theme
+
 * Thu Jul 27 2006 Michał Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.5.20060727svn
 - Delete qt dependency
 - Exclude libgadu.a file
diff --git a/sources b/sources
index 31aff52..db5c144 100644
--- a/sources
+++ b/sources
@@ -3,7 +3,9 @@
 15e6ba4e7ec1cacce3290525cd51e696  exec_notify-20060424.tar.bz2
 4a120b52760f1b4093001e043d852d03  ext_info-2.0beta8.tar.bz2
 d5e5718f3a64f33874a869b235bbdff7  filedesc-1.12.tar.gz
+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
@@ -13,11 +15,11 @@ c3beb753222b96dad46f3adf230eb3e1  kadu-theme-glass_16.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
 6bf19f183eb4e5ea48e2a27d04da2ead  spellchecker-0.18.tar.gz
 ef56085ab7d8e60be15d86d2c5f4a424  tabs-current.tar.gz
 30833253a9f94eedc892767c1267536a  weather-3.03.tar.bz2
 422b0bfe2fe1d67620896576e3092ac8  xmms-1.30.tar.gz
-e9d8676608f8c731f665ffc5c5288ad0  filtering-0.3.2-20060727-0.5.0.tar.bz2
-54ba848004b93c69a6e354b954512339  kadu-20060727.tar.bz2
-739e2c76fdae17f570d1f4934958cae6  kadu-profiles-0.1.tar.gz
-7148f9fbf312abd6a142339d453e1d90  powerkadu-20060719.tar.gz
+dc18b4d5c271f5daab8b2f4facc4eb8f  kadu-20060730.tar.bz2
+98a378047ea252f7277e978f06f9a6bb  kadu-emots-zestaw288.tar.bz2
+270c19fc9fb3e96bcbce76c2077d3ec2  mail-current.tar.gz