From 5c3a88a5f2274dc1e053acf567d428dccc3f313c Mon Sep 17 00:00:00 2001 From: Michał Bentkowski Date: Jul 27 2006 15:45:50 +0000 Subject: auto-import kadu-0.5.0-0.5.20060727svn on branch devel from kadu-0.5.0-0.5.20060727svn.src.rpm kadu update to 20060727 snapshot --- diff --git a/.cvsignore b/.cvsignore index a21a3e5..db84a2c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -3,7 +3,6 @@ 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 -kadu-20060716.tar.bz2 kadu-iwait4u-1.3.tar.gz kadu-theme-crystal-16.tar.bz2 kadu-theme-crystal-22.tar.bz2 @@ -18,3 +17,7 @@ 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 diff --git a/kadu.spec b/kadu.spec index d935abc..db89a54 100644 --- a/kadu.spec +++ b/kadu.spec @@ -1,7 +1,7 @@ -%define cvs_date 20060716 +%define cvs_date 20060727 Name: kadu Version: 0.5.0 -Release: 0.4.%{cvs_date}svn%{?dist} +Release: 0.5.%{cvs_date}svn%{?dist} Summary: An Gadu-Gadu client for online messaging Group: Applications/Internet License: GPL @@ -30,9 +30,11 @@ Source109: http://www.kadu.net/download/modules_mirror/tabs-current.tar.gz Source110: http://kadu.net/~blysk/led_notify-0.9.tar.bz2 Source111: http://www.kadu.net/~pan_wojtas/iwait4u/download/kadu-iwait4u-1.3.tar.gz Source112: http://www.kadu.net/~joi/exec_notify/packages/exec_notify-20060424.tar.bz2 +Source113: http://alan.umcs.lublin.pl/~pinkworm/filtering/filtering-0.3.2-20060727-0.5.0.tar.bz2 +Source114: http://kadu.net/~patryk/powerkadu/powerkadu-20060719.tar.gz +Source115: http://www.kadu.net/~dorr/kadu-profiles-0.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpng-devel qt-devel libsndfile-devel openssl-devel -Requires: qt %define _kadudir %{_datadir}/kadu %define _kadulib %{_libdir}/kadu %define _modlib %{_kadulib}/modules @@ -46,7 +48,7 @@ Requires: qt %defattr(-,root,root,-) \ %{_moddata}/%1.desc \ %attr(0755, root, root) %{_modlib}/%1.so \ - %{_modtrans}/%{1}_*.qm \ + %{_modtrans}/%{1}*.qm \ # @@ -54,7 +56,7 @@ Requires: qt %defattr(-,root,root,-) \ %{_moddata}/%1.desc \ %attr(0755, root, root) %{_modlib}/%1.so \ - %{_modtrans}/%{1}_*.qm \ + %{_modtrans}/%{1}*.qm \ %{_moddata}/data/%1 \ @@ -199,6 +201,27 @@ Requires: %{name} = %{version}-%{release} %description exec_notify Notification by external commands module. +%package powerkadu +Summary: Powerkadu module for Kadu +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} +%description powerkadu +Improvement of Kadu capabilities. + +%package profiles +Summary: Profiles module for kadu +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} +%description profiles +Profiles support + +%package filtering +Summary: Filtering module for kadu +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} +%description filtering +User list filtering + %package theme-nuvola16 Summary: Nuvola16 theme for Kadu Group: Applications/Internet @@ -250,7 +273,7 @@ Old Gadu-Gadu 6.x 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 -n kadu/modules +%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 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 -n kadu @@ -272,6 +295,9 @@ SHARED_CHANGES="module_alsa_sound \ module_tabs\ module_led_notify \ module_iwait4u\ + module_powerkadu \ + module_filtering \ + module_profiles \ module_exec_notify" for change in $SHARED_CHANGES; do sed s/^$change=.$/$change=m/ -i .config @@ -413,7 +439,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/kadu-config %{_includedir}/kadu %{_includedir}/libgadu* -%{_libdir}/libgadu.a +%exclude %{_libdir}/libgadu.a %{_libdir}/pkgconfig/libgadu.pc %files arts_sound @@ -451,6 +477,14 @@ rm -rf $RPM_BUILD_ROOT %mod_files2 tabs +%mod_files2 powerkadu + +%{_modlib}/bin/powerkadu + +%mod_files2 filtering + +%mod_files profiles + %mod_files led_notify %mod_files iwait4u @@ -485,6 +519,11 @@ rm -rf $RPM_BUILD_ROOT %{_moddata}/data/weather %changelog +* Thu Jul 27 2006 Michał Bentkowski - 0.5.0-0.5.20060727svn +- Delete qt dependency +- Exclude libgadu.a file +- Add powerkadu, filtering and profiles modules + * Mon Jul 24 2006 Michał Bentkowski - 0.5.0-0.4.20060716svn - Add COPYING file to doc @@ -499,4 +538,4 @@ rm -rf $RPM_BUILD_ROOT - Add --enable-debug and --disable-dependency-tracking options to configure * Thu Jul 20 2006 Michał Bentkowski - 0.5.0-0.1.20060716svn -- Another first release \ No newline at end of file +- Another first release diff --git a/sources b/sources index dbe9fbc..31aff52 100644 --- a/sources +++ b/sources @@ -3,7 +3,6 @@ 15e6ba4e7ec1cacce3290525cd51e696 exec_notify-20060424.tar.bz2 4a120b52760f1b4093001e043d852d03 ext_info-2.0beta8.tar.bz2 d5e5718f3a64f33874a869b235bbdff7 filedesc-1.12.tar.gz -49a3df1a87351af77183009c211ead96 kadu-20060716.tar.bz2 6233a8ef21d901fc5fb91c0db40d0e32 kadu-iwait4u-1.3.tar.gz 023085edabaf6a1b844fe6b5fc9315f9 kadu-theme-crystal-16.tar.bz2 57852ff3d3fd0063a642fcc173f7fa29 kadu-theme-crystal-22.tar.bz2 @@ -18,3 +17,7 @@ fae1f6bd3d4aca845ef5a57403b5b58c miastoplusa_sms-0.5-1.3.5.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