[SPEC] patch na kadu 0.5.0-rc1 branch DEVEL
Bart
uzi18 at o2.pl
Sun Dec 17 21:21:51 CET 2006
matowy wrote:
> Bart napisał(a):
>
>> Przesylam patcha na speca.
>>
>> Czy cos musze tu jeszcze zmienic zeby ktos commitnal?
>>
>> Nie dziala tylko modul tcl_scripting.
>>
>>
> http://www.kadu.net/forum/viewtopic.php?t=6473
> _______________________________________________
> pld-devel-pl mailing list
> pld-devel-pl at lists.pld-linux.org
> http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
>
>
>
Tak ma go zastapic PowerKadu.
Chyba ze ktos sie wezmie :)
Probowalem to to ruszyc ale tcl.cpp sie nie kompilowalo i jakos przez to
przebrnalem ale na commands.cpp teraz stoje :P nie wiem czy mi sie chce
po tych schodach wchodzic :]
Rozumiem ze nikt nie commitnie patcha?
Moze dodac PowerKadu co?
Pozdrawiam
Bart.
-------------- next part --------------
diff -urN /home/users/uzi/rpm/SPECS/kadu.spec ~/rpm/SPECS/kadu2.spec
--- /home/users/uzi/rpm/SPECS/kadu.spec 2006-12-11 17:41:54.000000000 +0100
+++ /home/users/uzi/rpm/SPECS/kadu2.spec 2006-12-15 22:34:33.000000000 +0100
@@ -1,12 +1,11 @@
# $Revision: 1.97.2.68 $, $Date: 2006/11/13 21:08:28 $
#
# TODO:
-# - make miasto_plusa/tcl_scripting compile again
-# - consider dropping spy module: doesn't work anymore as expected
-# (also website is down, download is down)
+# - make tcl_scripting module compile again
+# - spy module - won't work with gg7 clients
#
# Conditional build:
-%bcond_without amarok # without amarok player support module
+%bcond_with amarok # without amarok player support module
%bcond_without alsa # without ALSA support
%bcond_without arts # without arts sound server support
%bcond_without esd # without ESD sound server support
@@ -17,49 +16,53 @@
%bcond_with spy # without Spying module that shows who's invisible
%bcond_with tcl_scripting # without TCL scripting support and KaduPro extensions
%bcond_without weather # without weather check module support
-%bcond_without xmms # without xmms player support module
+%bcond_with xmms # without xmms player support module
+%bcond_with tabs # without tabs support module
-%define _amarok_mod_ver 1.18
+
+%define _amarok_mod_ver 1.19
%define _libgadu_ver 4:1.6
%define _spellchecker_mod_ver 0.19
-%define _spy_mod_ver 0.0.8-2
+%define _spy_mod_ver 0.0.8-3
%define _tcl_mod_ver 0.6.2-Josephine
%define _weather_ver 3.01
-%define _xmms_mod_ver 1.30
+%define _xmms_mod_ver 1.32
%define _led_ver 0.9
-%define _miasto_plusa_ver 1.3.2
+%define _miasto_plusa_ver 1.3.5
%define _tabs_ver rev46
-%define snapshot 20061025
+%define snapshot rc1
%define year %(echo %{snapshot} |cut -b -4)
#
Summary: A Gadu-Gadu client for online messaging
Summary(pl): Klient Gadu-Gadu do przesyłania wiadomości po sieci
Name: kadu
Version: 0.5.0
-Release: 0.%{snapshot}.3
+Release: 0.%{snapshot}.1
License: GPL v2
Group: Applications/Communications
-Source0: http://kadu.net/download/snapshots/%{year}/%{name}-%{snapshot}.tar.bz2
-# Source0-md5: 21a55d099699d967028e49f4d8307a99
+Source0: http://kadu.net/download/stable/%{name}-%{version}-%{snapshot}.tar.bz2
+# Source0-md5: 75e5ebd7d0952e5ac4d10ea87b8f3f60
Source1: %{name}.desktop
Source2: http://scripts.one.pl/xmms/devel/%{version}/xmms-%{_xmms_mod_ver}.tar.gz
-# Source2-md5: 422b0bfe2fe1d67620896576e3092ac8
+# Source2-md5: e4ac1276f5326c5b17ef086ad2448e91
Source3: http://scripts.one.pl/amarok/devel/%{version}/amarok-%{_amarok_mod_ver}.tar.gz
-# Source3-md5: 0ec8466884d98d63a6d2e4eeac814612
+# Source3-md5: 139e50cbe9ff2014ca35e9b3b4be1f67
Source4: http://scripts.one.pl/spellchecker/devel/%{version}/spellchecker-%{_spellchecker_mod_ver}.tar.gz
# Source4-md5: f1e1c572f9fd92dfb420e62818bc826c
Source5: http://www.kadu.net/~blysk/weather-%{_weather_ver}.tar.bz2
# Source5-md5: c21727575d4bab551adeb9b5b1787f0c
Source6: http://scripts.one.pl/tcl4kadu/files/stable/0.4.3/tcl_scripting-%{_tcl_mod_ver}.tar.gz
# Source6-md5: 97406c1f3f34b8a073e0a1a18e842c9e
-Source7: http://scripts.one.pl/~przemos/download/kadu-spy-%{_spy_mod_ver}.tar.gz
-# Source7-md5: 2ffba6058d5d463ade20ff697e200f7c
+#Source7: http://scripts.one.pl/~przemos/download/kadu-spy-%{_spy_mod_ver}.tar.gz
+Source7: http://student.agh.edu.pl/neeo/kadu-spy-%{_spy_mod_ver}.tar.bz2
+# Source7-md5: b04fb7a4a98abe5d32e321da3058bbf0
Source8: http://www.kadu.net/~blysk/led_notify-%{_led_ver}.tar.bz2
# Source8-md5: 3f9e347fd775324f4077f2f6849a0de7
-Source9: http://www.kadu.net/~patryk/miastoplusa_sms/miastoplusa_sms-%{_miasto_plusa_ver}.tar.gz
-# Source9-md5: 76233b35fa769c56d7ff1343b1bf810f
-Source10: http://gov.one.pl/svnsnap/tabs-svn-%{_tabs_ver}.tar.gz
-# Source10-md5: 0d313a489bad8bf8b324e347e74f00e6
+Source9: http://kadu.net/~patryk/miastoplusa_sms/miastoplusa_sms-0.5-%{_miasto_plusa_ver}.tar.gz
+# Source9-md5: fae1f6bd3d4aca845ef5a57403b5b58c
+#Source10: http://gov.one.pl/svnsnap/tabs-svn-%{_tabs_ver}.tar.gz
+Source10: http://www.zakrzow.ovh.org/_tmp/tabs.tar.gz
+# Source10-md5: ecb8994e52112e877604e2d505e14bb1
Patch0: %{name}-ac_am.patch
URL: http://kadu.net/
%{?with_alsa:BuildRequires: alsa-lib-devel}
@@ -264,19 +267,23 @@
tar xzf %{SOURCE6} -C modules
%endif
%if %{with spy}
-tar xzf %{SOURCE7} -C modules
+tar xjf %{SOURCE7} -C modules
%endif
tar xjf %{SOURCE8} -C modules
%if %{with miasto_plusa}
tar xzf %{SOURCE9} -C modules
%endif
+%if %{with tabs}
tar xzf %{SOURCE10} -C modules
-
+%endif
%{__sed} -i 's,dataPath("kadu/modules/*,("%{_libdir}/kadu/modules/,g' kadu/modules.cpp
%build
+
+%if %{with tabs}
%{__sed} -i 's/module_tabs=n/module_tabs=m/' .config
+%endif
%if %{with miasto_plusa}
%{__sed} -i 's/module_miastoplusa_sms=n/module_miastoplusa_sms=m/' .config
%endif
@@ -346,9 +353,10 @@
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/modules/data
cp -fa $RPM_BUILD_ROOT%{_modules_dir}/data/config_wizard $RPM_BUILD_ROOT%{_datadir}/%{name}/modules/data
rm -fr $RPM_BUILD_ROOT%{_modules_dir}/data/config_wizard
+%if %{with tabs}
cp -Rfa $RPM_BUILD_ROOT%{_modules_dir}/data/tabs $RPM_BUILD_ROOT%{_datadir}/%{name}/modules/data
rm -fr $RPM_BUILD_ROOT%{_modules_dir}/data/tabs
-
+%endif
%if %{with xmms}
cp -fa $RPM_BUILD_ROOT%{_modules_dir}/data/xmms $RPM_BUILD_ROOT%{_datadir}/%{name}/modules/data
rm -fr $RPM_BUILD_ROOT%{_modules_dir}/data/xmms
@@ -400,8 +408,11 @@
%dir %{_datadir}/%{name}/modules
%dir %{_datadir}/%{name}/modules/data
+
+%if %{with miasto_plusa}
%dir %{_datadir}/%{name}/modules/data/tabs
%{_datadir}/%{name}/modules/data/tabs/attach.png
+%endif
#default modules:
%dir %{_libdir}/%{name}
@@ -439,8 +450,12 @@
%{_modules_dir}/sms.desc
%attr(755,root,root) %{_modules_dir}/sms.so
%{_modules_dir}/sound.desc
+
+%if %{with tabs}
%{_modules_dir}/tabs.desc
%attr(755,root,root) %{_modules_dir}/tabs.so
+%endif
+
%{_modules_dir}/voice.desc
%attr(755,root,root) %{_modules_dir}/voice.so
%attr(755,root,root) %{_modules_dir}/window_notify.so
@@ -511,7 +526,9 @@
%lang(fr) %{_modules_dir}/translations/sound_fr.qm
%lang(it) %{_modules_dir}/translations/sound_it.qm
%lang(pl) %{_modules_dir}/translations/sound_pl.qm
+%if %{with tabs}
%lang(pl) %{_modules_dir}/translations/tabs_pl.qm
+%endif
%lang(de) %{_modules_dir}/translations/voice_de.qm
%lang(fr) %{_modules_dir}/translations/voice_fr.qm
%lang(it) %{_modules_dir}/translations/voice_it.qm
More information about the pld-devel-pl
mailing list