Author: arvenil Date: Fri Feb 15 19:59:35 2008 GMT
Module: SPECS Tag: AC-DEVEL
---- Log message:
- up to 0.6.0-rc3 (merged from DEVEL)
- merged all other changes from DEVEL
- added TODO
---- Files affected:
SPECS:
kadu.spec (1.97.2.102.2.1 -> 1.97.2.102.2.2)
---- Diffs:
================================================================
Index: SPECS/kadu.spec
diff -u SPECS/kadu.spec:1.97.2.102.2.1 SPECS/kadu.spec:1.97.2.102.2.2
--- SPECS/kadu.spec:1.97.2.102.2.1 Sat Jan 26 23:04:28 2008
+++ SPECS/kadu.spec Fri Feb 15 20:59:30 2008
@@ -3,6 +3,8 @@
# TODO:
# - Some modules with bcond_with will not work for now, we need to wait for
next releases
# - Add Obsoletes for modules iwait4u, powerkadu, notify_osdhints if they will
not be fixed before final 0.6.0
+# - water_notify module doesn't build:
+# "Please define DBUS_API_SUBJECT_TO_CHANGE to acknowledge your
understanding that D-BUS hasn't reached 1.0 and is subject to protocol and API
churn."
#
# NOTE:
# - We use staticly linked libgadu because of no stable release with dcc7
@@ -35,6 +37,7 @@
%bcond_with notify_osdhints # with osdhints_notify module
%bcond_without notify_pcspeaker # without pcspeaker_notify module
support
%bcond_without notify_speech # without Speech synthesis support
+%bcond_with notify_water # with water_notify module support
%bcond_without notify_xosd # without xosd_notify module support
%bcond_with powerkadu # with PowerKadu extensions
%bcond_without profiles # without profiles module support
@@ -52,35 +55,36 @@
%bcond_without voice # without voice support module
%bcond_without weather # without weather check module support
-%define _snap 20080110
-%define _rel rc1
+%define _snap 20080208
+%define _rel rc3
-%define _agent_mod_ver 0.4.3
+%define _agent_mod_ver 0.4.4
%define _amarok_mod_ver 20071220
%define _dcopexport_ver 0.11.3-20071129
%define _falf_mod_ver 20071225
-%define _filedesc_ver 20071221
-%define _filtering_ver 20080108
-%define _firewall_ver 0.7.3
+%define _filedesc_ver 20080104
+%define _filtering_ver 20080204
+%define _firewall_ver 0.7.5
%define _iwait4u_ver 1.3
-%define _mail_ver 0.3.1
-%define _mediaplayer_mod_ver 20080104
+%define _mail_ver 0.3.2
+%define _mediaplayer_mod_ver 20080210
%define _mediaplayer_audacious_ver 20071220
-%define _mime_tex_ver 1.4
+%define _mime_tex_ver 1.4.1
%define _notify_exec_ver 20070101
-%define _notify_led_ver 0.14
-%define _notify_mx610_ver 0.3.0
-%define _notify_osdhints_ver 0.3.2.2
-%define _notify_pcspeaker_ver 0.6.0.2
+%define _notify_led_ver 0.18
+%define _notify_mx610_ver 0.3.1
+%define _notify_osdhints_ver 0.4.0.4
+%define _notify_pcspeaker_ver 0.6.0.3
+%define _notify_water_ver 0.1.1-try2
%define _powerkadu_ver 20070129
%define _profiles_ver 0.3.1
%define _screenshot_ver 20080104
%define _sms_miastoplusa_ver 1.3.9
%define _sound_ao_ver 20060424
%define _spellchecker_mod_ver 20071230
-%define _tabs_ver 1.1.3
-%define _weather_ver 3.12
-%define _xmms_mod_ver 20071220
+%define _tabs_ver 1.1.4
+%define _weather_ver 3.13
+%define _xmms_mod_ver 20080116
%if %{with snap}
%define year %(echo %{_snap} |cut -b -4)
@@ -96,32 +100,32 @@
%if %{with snap}
Source100: http://kadu.net/download/snapshots/2008/%{name}-%{_snap}.tar.bz2
-# Source100-md5: 14a94cb448946f4e66ab6dcd5eccf70c
+# Source100-md5: d158fe973922a66b36a3616b5494fd72
%else
Source0:
http://kadu.net/download/stable/%{name}-%{version}-%{_rel}.tar.bz2
-# Source0-md5: 2ff4b8fd6ba9b866ed202e15b3524ab7
+# Source0-md5: f943e42c31ca0dec3137472d37344f39
%endif
Source1: %{name}.desktop
Source2:
http://www.kadu.net/download/modules_extra/mediaplayer/mediaplayer-%{_mediaplayer_mod_ver}.tar.bz2
-# Source2-md5: bfc19ea0c1db22f2381c528b124866fe
+# Source2-md5: f24c85c640fa88a887cab078d8cacfc4
Source3:
http://www.kadu.net/download/modules_extra/amarok_mediaplayer/amarok_mediaplayer-%{_amarok_mod_ver}.tar.bz2
# Source3-md5: 51d304e335e814f3d8c0f1654007a7d7
Source4:
http://alan.umcs.lublin.pl/~pinkworm/dcopexport/dcopexport-%{_dcopexport_ver}-%{version}.tar.bz2
# Source4-md5: b36fcfcf4756285f30cbb6c2b6c2a2da
Source5:
http://www.kadu.net/download/modules_extra/filedesc/filedesc-%{_filedesc_ver}.tar.bz2
-# Source5-md5: 317627cbc5fd09a6a0039cdfccbfbce1
+# Source5-md5: 8d11979fa8a3795f7ab20fbb1fb8bdbb
Source6:
http://www.kadu.net/download/modules_extra/filtering/filtering-%{_filtering_ver}.tar.bz2
-# Source6-md5: 628442e61e1a561d5f4d2b2d95eada0c
+# Source6-md5: 89174f20bf9c71d23ca7d3619907737a
Source7:
http://www.kadu.net/~pan_wojtas/iwait4u/download/%{name}-iwait4u-%{_iwait4u_ver}.tar.gz
# Source7-md5: 6233a8ef21d901fc5fb91c0db40d0e32
Source8:
http://www.kadu.net/download/modules_extra/falf_mediaplayer/falf_mediaplayer-%{_falf_mod_ver}.tar.bz2
# Source8-md5: 927db40f7136ff86b3e83307b5cec2d9
Source9: http://kadu.net/~blysk/led_notify-%{_notify_led_ver}.tar.bz2
-# Source9-md5: 6721b6507077936d87783e3408818d6c
-Source10:
http://www.kadu.net/~pan_wojtas/osdhints_notify/download/%{name}-osdhints_notify-%{_notify_osdhints_ver}-kadu-0.5.tar.gz
-# Source10-md5: d3023aba93f8085612b8c532c0e06889
+# Source9-md5: 786a0ee40a3aef03b51e2d89a2bceda5
+Source10:
http://www.kadu.net/~dorr/moduly/%{name}-osdhints_notify-%{_notify_osdhints_ver}.tar.bz2
+# Source10-md5: d7b4e069731ecb2e8bde67b4a1e3211c
Source11:
http://www.kadu.net/~dorr/%{name}-pcspeaker-%{_notify_pcspeaker_ver}.tar.bz2
-# Source11-md5: 6f2609f6e9d4c80cee632bc8d0533973
+# Source11-md5: 5fef08c32809bbce6b6bf96659b39df6
Source12:
http://kadu.net/~patryk/powerkadu/powerkadu-%{_powerkadu_ver}.tar.gz
# Source12-md5: c6046e8b49dd9994fbf573faaafddab8
Source13:
http://www.kadu.net/~dorr/%{name}-profiles-%{_profiles_ver}.tar.bz2
@@ -132,39 +136,40 @@
# Source15-md5: e5c4d5cd94cef40730e281b9a6c9ed37
Source16:
http://www.kadu.net/download/modules_extra/spellchecker/spellchecker-%{_spellchecker_mod_ver}.tar.bz2
# Source16-md5: a46eab2f3d9c31cee13ccf3a441bceec
-Source17:
http://misiek.jah.pl/assets/2007/12/27/agent-%{_agent_mod_ver}.tar.gz
-# Source17-md5: a9a11dac6098de49d19b80760374fe3b
+Source17:
http://misiek.jah.pl/assets/2008/2/8/agent-%{_agent_mod_ver}.tar.gz
+# Source17-md5: 4401e0e3c509af347cb14a89236301ea
Source18:
http://kadu.net/~arvenil/tabs/download/%{version}/%{_tabs_ver}/%{name}-tabs-%{_tabs_ver}.tar.bz2
-# Source18-md5: 67ebc59abc770825f19b29a3d5114201
+# Source18-md5: 57e4c970f496ba81495d59d7b96bcdf1
Source19: http://kadu.net/~blysk/weather-%{_weather_ver}.tar.bz2
-# Source19-md5: 1ba55b1ca7e38a3e70e6db0028976d65
+# Source19-md5: 41a6edd1356a36e4606e432d0bc856f6
Source20:
http://www.kadu.net/download/modules_extra/xmms_mediaplayer/xmms_mediaplayer-%{_xmms_mod_ver}.tar.bz2
-# Source20-md5: 3c2bfa4507bea42395d1d3cd02576711
+# Source20-md5: 97dd4c9cd19b69b9ab6d38a20cd37a2e
+Source21:
http://kadu.jarzebski.pl/water_notify-%{_notify_water_ver}.tar.bz2
+# Source21-md5: 10320f9b96366422bbcd7ec76d4e85a1
Source23:
http://www.kadu.net/download/additions/%{name}-0.6-theme-glass-16.tar.gz
-# Source23-md5: 480c08874b2cb3a23d74b371d7921df0
+# Source23-md5: d09256b6b2ae801088c1f6e04bbac5f7
Source24:
http://www.kadu.net/download/additions/%{name}-0.6-theme-glass-22.tar.gz
-# Source24-md5: 4a3e6a75c314d821c1e5afec2d537e80
-Source27:
http://www.kadu.net/~dorr/%{name}-firewall-%{_firewall_ver}.tar.bz2
-# Source27-md5: 1ba39f4d934d66a3a5d7fbf38266ff36
+# Source24-md5: d9f33f1224315771615faaefd2397918
+Source27:
http://www.kadu.net/~dorr/moduly/%{name}-firewall-%{_firewall_ver}.tar.bz2
+# Source27-md5: 9b0f04b4254b4ff08254b15e59a81be7
Source28:
http://kadu.net/~patryk/mime_tex/mime_tex-%{_mime_tex_ver}.tar.bz2
-# Source28-md5: 8ed1d465614881a6dfd1da4c12d18587
+# Source28-md5: d640b2ba650fb5aa0f3502ad7379b14b
Source29:
http://kadu.jarzebski.pl/mx610_notify-%{_notify_mx610_ver}.tar.bz2
-# Source29-md5: ca25d85581127e4f52b53193b5fcb45e
+# Source29-md5: 08bba105d9307bbf1a8e8482529441a4
Source30:
http://www.kadu.net/~joi/ao_sound/packages/ao_sound-%{_sound_ao_ver}.tar.bz2
# Source30-md5: 95809d330e48e61f58ec961ddbf0b529
Source31:
http://www.kadu.net/download/modules_extra/audacious_mediaplayer/audacious_mediaplayer-%{_mediaplayer_audacious_ver}.tar.bz2
# Source31-md5: 37cb762e361208c5c571771fb86968b5
Source32: http://www.kadu.net/~weagle/mail/mail-%{_mail_ver}.tar.bz2
-# Source32-md5: 1be6fb5c52a37393030dd1c532648ee6
+# Source32-md5: 0526354146a6c46b3670239f820a7caa
Source33:
http://www.kadu.net/download/additions/%{name}-0.6-theme-oxygen-16.tar.gz
# Source33-md5: fb13f2624dec27632c42a6bc2c1a252f
Source34:
http://www.kadu.net/download/additions/%{name}-0.6-theme-tango-16.tar.gz
-# Source34-md5: 44b4b4a62e0e93275f993d98f573612d
+# Source34-md5: 52fe12765b600b9aa44cfc6489dce8eb
Patch0: %{name}-ac_am.patch
-Patch1: %{name}-xmms.patch
+Patch1: %{name}-voice.patch
Patch2: %{name}-mediaplayer-audacious.patch
-Patch3: %{name}-voice.patch
-Patch4: %{name}-gcc3.patch
+Patch3: %{name}-gcc3.patch
URL: http://kadu.net/
%{?with_sound_alsa:BuildRequires: alsa-lib-devel}
%{?with_sound_arts:BuildRequires: artsc-devel}
@@ -506,6 +511,18 @@
%description module-notify-speech -l pl.UTF-8
ModuĹ obsĹugi "GĹoĹnego czytania" przez zewnÄtrzny program "powiedz".
+%package module-notify-water
+Summary: Notification by Water Plugin in Compiz
+Summary(pl.UTF-8): ModuĹ powiadamiania pluginem Water w Compiz
+Group: Applications/Communications
+Requires: %{name} = %{version}-%{release}
+
+%description module-notify-water
+Notification by Water Plugin in Compiz.
+
+%description module-notify-water -l pl.UTF-8
+ModuĹ powiadamiania pluginem Water w Compiz.
+
%package module-notify-xosd
Summary: Notification by XOSD module
Summary(pl.UTF-8): ModuĹ powiadamiania o zdarzeniach przy pomocy XOSD
@@ -758,8 +775,8 @@
%prep
%setup -q -T -b %{?with_snap:10}0 -n %{name}
%patch0 -p1
+%patch1 -p1
%patch3 -p1
-%patch4 -p1
%if %{with mediaplayer}
tar xjf %{SOURCE2} -C modules
@@ -807,6 +824,9 @@
%if %{with notify_pcspeaker}
tar xjf %{SOURCE11} -C modules
%endif
+%if %{with notify_water}
+tar xjf %{SOURCE21} -C modules
+%endif
%if %{with powerkadu}
tar xzf %{SOURCE12} -C modules
%endif
@@ -836,7 +856,6 @@
%endif
%if %{with mediaplayer_xmms}
tar xjf %{SOURCE20} -C modules
-%patch1 -p1
%endif
# themes-icons
tar xzf %{SOURCE23} -C varia/themes/icons
@@ -965,6 +984,11 @@
%else
%{__sed} -i 's/module_speech=m/module_speech=n/' .config
%endif
+%if %{with notify_water}
+%{__sed} -i 's/module_water_notify=n/module_water_notify=m/' .config
+%else
+%{__sed} -i 's/module_water_notify=m/module_water_notify=n/' .config
+%endif
%if %{with notify_xosd}
%{__sed} -i 's/module_xosd_notify=n/module_xosd_notify=m/' .config
%else
@@ -1391,8 +1415,10 @@
%{_modules_data_dir}/configuration/mime_tex.ui
%attr(755,root,root) %{_modules_lib_dir}/mime_tex.so
%dir %{_modules_data_dir}/data/mime_tex
+%dir %{_modules_data_dir}/data/mime_tex/editor_icons
%dir %{_modules_data_dir}/data/mime_tex/mime_tex_icons
%{_modules_data_dir}/data/mime_tex/mime_tex_32x32.png
+%{_modules_data_dir}/data/mime_tex/editor_icons/*.png
%{_modules_data_dir}/data/mime_tex/mime_tex_icons/*.png
%lang(pl) %{_modules_data_dir}/translations/mime_tex_pl.qm
%endif
@@ -1434,6 +1460,7 @@
%attr(755,root,root) %{_modules_lib_dir}/osdhints_notify.so
%lang(pl) %{_modules_data_dir}/translations/osdhints_notify_pl.qm
%dir %{_modules_data_dir}/data/osdhints_notify
+%{_modules_data_dir}/data/osdhints_notify/License
%{_modules_data_dir}/data/osdhints_notify/*.png
%endif
@@ -1460,6 +1487,15 @@
%lang(pl) %{_modules_data_dir}/translations/speech_pl.qm
%endif
+%if %{with notify_water}
+%files module-notify-water
+%defattr(644,root,root,755)
+%{_modules_data_dir}/water_notify.desc
+%{_modules_data_dir}/configuration/water_notify.ui
+%attr(755,root,root) %{_modules_lib_dir}/water_notify.so
+%lang(pl) %{_modules_data_dir}/translations/water_notify_pl.qm
+%endif
+
%if %{with notify_xosd}
%files module-notify-xosd
%defattr(644,root,root,755)
@@ -1649,6 +1685,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.97.2.102.2.2 2008-02-15 19:59:30 arvenil
+- up to 0.6.0-rc3 (merged from DEVEL)
+- merged all other changes from DEVEL
+- added TODO
+
Revision 1.97.2.102.2.1 2008-01-26 22:04:28 arvenil
- DEVEL version for AC
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kadu.spec?r1=1.97.2.102.2.1&r2=1.97.2.102.2.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
