Author: arvenil Date: Thu Jan 17 21:22:15 2008 GMT Module: SPECS Tag: DEVEL ---- Log message: - firewall module updated to 0.7.1 - reenabled firewall module - reenabled speech module - fixed building mediaplayer_xmms module (first unpack, then patch;))
---- Files affected: SPECS: kadu.spec (1.97.2.81 -> 1.97.2.82) ---- Diffs: ================================================================ Index: SPECS/kadu.spec diff -u SPECS/kadu.spec:1.97.2.81 SPECS/kadu.spec:1.97.2.82 --- SPECS/kadu.spec:1.97.2.81 Tue Jan 15 20:12:59 2008 +++ SPECS/kadu.spec Thu Jan 17 22:22:10 2008 @@ -19,7 +19,7 @@ %bcond_without docking_desktop # without desktop_docking module support %bcond_without filedesc # without filedesc module support %bcond_without filtering # without filtering module support -%bcond_with firewall # without firewall module support +%bcond_without firewall # without firewall module support %bcond_with iwait4u # without iwait4u module support %bcond_without mediaplayer # without media player modules support %bcond_without mediaplayer_amarok # without amarok player support module @@ -29,7 +29,7 @@ %bcond_without notify_led # without led_notify module support %bcond_with notify_osdhints # without osdhints_notify module %bcond_without notify_pcspeaker # without pcspeaker_notify module support -%bcond_with notify_speech # without Speech synthesis support +%bcond_without notify_speech # without Speech synthesis support %bcond_with powerkadu # without PowerKadu extensions %bcond_without profiles # without profiles module support %bcond_without sound_alsa # without ALSA support @@ -52,7 +52,7 @@ %define _falf_mod_ver 20071225 %define _filedesc_ver 20071221 %define _filtering_ver 20080108 -%define _firewall_ver 0.6.4 +%define _firewall_ver 0.7.1 %define _iwait4u_ver 1.3 %define _libgadu_ver 4:1.7.1 %define _mediaplayer_mod_ver 20080104 @@ -139,9 +139,8 @@ # Source25-md5: 586cc6ff9ba62f0fdd7c7c1adf229efb Source26: http://www.kadu.net/download/additions/%{name}-theme-nuvola-22.tar.gz # Source26-md5: 7a17b4881141b346c6268ef25c284613 -Source27: http://www.kadu.net/~pan_wojtas/firewall/download/%{name}-firewall-%{_firewall_ver}.tar.gz -# Source27-md5: 0ec61d3db8befa99032029a8a05310c5 - +Source27: http://www.kadu.net/~dorr/%{name}-firewall-%{_firewall_ver}.tar.bz2 +# Source27-md5: a853e082901df6f3cfec375a6f6a4684 Patch0: %{name}-ac_am.patch Patch1: %{name}-xmms.patch URL: http://kadu.net/ @@ -161,7 +160,7 @@ BuildRequires: openssl-devel >= 0.9.7d BuildRequires: qt-linguist BuildRequires: sed >= 4.0 -%{?with_xmms:BuildRequires: xmms-devel} +%{?with_mediaplayer_xmms:BuildRequires: xmms-devel} Obsoletes: kadu-module-imiface <= 0.4.3 Obsoletes: kadu-module-speech <= 0.4.3 Obsoletes: kadu-module-tcl_scripting <= 0.4.3 @@ -638,7 +637,6 @@ %prep %setup -q -T -b %{?with_snap:10}0 -n %{name} %patch0 -p1 -%patch1 -p0 %if %{with mediaplayer} tar xjf %{SOURCE2} -C modules @@ -656,7 +654,7 @@ tar xjf %{SOURCE6} -C modules %endif %if %{with firewall} -tar xzf %{SOURCE27} -C modules +tar xjf %{SOURCE27} -C modules %endif %if %{with iwait4u} tar xzf %{SOURCE7} -C modules @@ -699,6 +697,7 @@ %endif %if %{with mediaplayer_xmms} tar xjf %{SOURCE20} -C modules +%patch1 -p0 %endif # themes-icons tar xjf %{SOURCE21} -C varia/themes/icons @@ -884,8 +883,7 @@ %{__automake} %configure \ --enable-voice \ - --enable-dist-info=PLD \ - #--with-existing-libgadu=/usr + --enable-dist-info="PLD Linux Distribution" %{__make} %install @@ -925,11 +923,6 @@ rm -fr $RPM_BUILD_ROOT%{_modules_dir}/data/filtering %endif -%if %{with firewall} -cp -fa $RPM_BUILD_ROOT%{_modules_dir}/data/firewall $RPM_BUILD_ROOT%{_datadir}/%{name}/modules/data -rm -fr $RPM_BUILD_ROOT%{_modules_dir}/data/firewall -%endif - %if %{with mediaplayer} cp -fa $RPM_BUILD_ROOT%{_modules_dir}/data/mediaplayer $RPM_BUILD_ROOT%{_datadir}/%{name}/modules/data rm -fr $RPM_BUILD_ROOT%{_modules_dir}/data/mediaplayer @@ -1118,11 +1111,13 @@ %{_datadir}/%{name}/modules/configuration/docking.ui %{_datadir}/%{name}/modules/configuration/encryption.ui %{_datadir}/%{name}/modules/configuration/ext_sound.ui +%{_datadir}/%{name}/modules/configuration/firewall.ui %{_datadir}/%{name}/modules/configuration/hints.ui %{_datadir}/%{name}/modules/configuration/history.ui %{_datadir}/%{name}/modules/configuration/notify.ui %{_datadir}/%{name}/modules/configuration/sms.ui %{_datadir}/%{name}/modules/configuration/sound.ui +%{_datadir}/%{name}/modules/configuration/speech.ui %{_datadir}/%{name}/modules/configuration/voice.ui %if %{with advanced_userlist} @@ -1209,8 +1204,6 @@ %attr(755,root,root) %{_modules_dir}/firewall.so %lang(pl) %{_modules_dir}/translations/firewall_pl.qm %{_modules_dir}/firewall.desc -%dir %{_datadir}/%{name}/modules/data/firewall -%{_datadir}/%{name}/modules/data/firewall/firewall.png %endif %if %{with iwait4u} @@ -1453,6 +1446,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.97.2.82 2008-01-17 21:22:10 arvenil +- firewall module updated to 0.7.1 +- reenabled firewall module +- reenabled speech module +- fixed building mediaplayer_xmms module (first unpack, then patch;)) + Revision 1.97.2.81 2008-01-15 19:12:59 cactus - enables profiles module - updated pcspeaker module ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kadu.spec?r1=1.97.2.81&r2=1.97.2.82&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
