packages: kadu/kadu.spec - Obsoletes for removed plugins - updated globalho...

lisu lisu at pld-linux.org
Tue Sep 13 17:37:46 CEST 2011


Author: lisu                         Date: Tue Sep 13 15:37:46 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Obsoletes for removed plugins
- updated globalhotkeys plugin

---- Files affected:
packages/kadu:
   kadu.spec (1.328 -> 1.329) 

---- Diffs:

================================================================
Index: packages/kadu/kadu.spec
diff -u packages/kadu/kadu.spec:1.328 packages/kadu/kadu.spec:1.329
--- packages/kadu/kadu.spec:1.328	Tue Sep 13 17:11:00 2011
+++ packages/kadu/kadu.spec	Tue Sep 13 17:37:41 2011
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 #
 # TODO:
-# - modules update/remove: desc_history, geoip
+# - modules update/remove: desc_history, geoip, mail, mediaplayer_amarok2
 # - make voice module link with system libgsm
 #
 # Conditional build:
@@ -18,14 +18,12 @@
 %bcond_without	filedesc		# without filedesc module support
 %bcond_without	firewall		# without firewall module support
 %bcond_with	geoip			# without geoip module support
-%bcond_with	globalhotkeys		# without globalhotkeys module support
+%bcond_without	globalhotkeys		# without globalhotkeys module support
 %bcond_without	last_seen		# without last_seen module support
 %bcond_with	mail			# without mail module support
 %bcond_without	mediaplayer		# without media player modules support
 %bcond_with	mediaplayer_amarok	# without amarok player support module
 %bcond_with	mediaplayer_amarok2	# without amarok2 player support module
-%bcond_with	mediaplayer_audacious	# without audacious player support module
-%bcond_with	mediaplayer_bmpx	# without bmpx player support module
 %bcond_with	mediaplayer_dragon	# without dragon player support module
 %bcond_without	mediaplayer_falf	# without falf player support module
 %bcond_with	mediaplayer_mpd		# without mpd player support module
@@ -75,7 +73,7 @@
 %define		dcopexport_ver		0.11.3-20071129
 %define		desc_history_ver	1.1
 %define		geoip_ver		0.2
-%define		globalhotkeys_ver	0.9.0-23
+%define		globalhotkeys_ver	0.10-25
 %define		mail_ver		0.3.6
 %define		mime_tex_ver		0.6.6.6
 %define		nextinfo_ver		0.9.0-5
@@ -103,7 +101,7 @@
 Source3:	dcopexport-%{dcopexport_ver}-0.6.0.tar.bz2
 # Source3-md5:	b36fcfcf4756285f30cbb6c2b6c2a2da
 Source4:	http://www.ultr.pl/kadu/globalhotkeys-%{globalhotkeys_ver}.tar.gz
-# Source4-md5:	3e6ae8580d26dafc439f773ee99134c6
+# Source4-md5:	b7eecb5a889cbb59b0c146357f689630
 Source5:	http://kadu.net/~michal/mail/mail-%{mail_ver}.tar.bz2
 # Source5-md5:	85fdf695c7fbc58e607dc15278391ab3
 Source6:	http://kadu.net/~patryk/mime_tex/mime_tex-%{mime_tex_ver}.tar.bz2
@@ -189,11 +187,16 @@
 Requires:	QtSql-sqlite3
 Requires:	libgadu >= %{libgadu_ver}
 Obsoletes:	kadu-module-advanced_userlist
+Obsoletes:	kadu-module-agent
 Obsoletes:	kadu-module-dbus
 Obsoletes:	kadu-module-docking-wmaker <= 0.6.5
+Obsoletes:	kadu-module-filtering
+Obsoletes:	kadu-module-gg_avatars
 Obsoletes:	kadu-module-imiface <= 0.4.3
 Obsoletes:	kadu-module-iwait4u <= 0.5.0
 %{!?with_mediaplayer:Obsoletes:	kadu-module-mediaplayer}
+Obsoletes:	kadu-module-mediaplayer_audacious
+Obsoletes:	kadu-module-mediaplayer_bmpx
 Obsoletes:	kadu-module-notify-xosd <= 0.6.5
 Obsoletes:	kadu-module-sound-arts <= 0.6.5
 Obsoletes:	kadu-module-sound-esd <= 0.6.5
@@ -477,37 +480,6 @@
 Moduł umożliwiający w opisie statusu pokazywanie informacji o
 odgrywanym utworze z odtwarzacza amarok 2.
 
-%package module-mediaplayer-audacious
-Summary:	Support audacious status
-Summary(pl.UTF-8):	Moduł statusu dla odtwarzacza audacious
-Group:		Applications/Communications
-Requires:	%{name}-module-mediaplayer-mpris = %{version}-%{release}
-Requires:	audacious
-
-%description module-mediaplayer-audacious
-Module which allows showing in status description information about
-the song currently played in audacious.
-
-%description module-mediaplayer-audacious -l pl.UTF-8
-Moduł umożliwiający w opisie statusu pokazywanie informacji o
-odgrywanym utworze z odtwarzacza audacious.
-
-%package module-mediaplayer-bmpx
-Summary:	Support BMPX status
-Summary(pl.UTF-8):	Moduł statusu dla odtwarzacza BMPX
-Group:		Applications/Communications
-Requires:	%{name}-module-mediaplayer-mpris = %{version}-%{release}
-Requires:	bmpx
-Provides:	kadu-module-bmpx = %{version}
-
-%description module-mediaplayer-bmpx
-Module which allows showing in status description information about
-the song currently played in BMPX.
-
-%description module-mediaplayer-bmpx -l pl.UTF-8
-Moduł umożliwiający w opisie statusu pokazywanie informacji o
-odgrywanym utworze z odtwarzacza BMPX.
-
 %package module-mediaplayer-dragon
 Summary:	Support dragon status
 Summary(pl.UTF-8):	Moduł statusu dla odtwarzacza dragon
@@ -1238,11 +1210,7 @@
 %else
 %{__sed} -i 's/module_geoip_lookup=m/module_geoip_lookup=n/' .config
 %endif
-%if %{with globalhotkeys}
-%{__sed} -i 's/module_globalhotkeys=n/module_globalhotkeys=m/' .config
-%else
-%{__sed} -i 's/module_globalhotkeys=m/module_globalhotkeys=n/' .config
-%endif
+%{?with_globalhotkeys:%{__sed} -i '/^set (COMPILE_PLUGINS$/a\\tglobalhotkeys' Plugins.cmake}
 %{!?with_last_seen:%{__sed} -i 's/\tlast_seen$/\t#last_seen/' Plugins.cmake}
 %if %{with mail}
 %{__sed} -i 's/module_mail=n/module_mail=m/' .config
@@ -1258,16 +1226,6 @@
 %else
 %{__sed} -i 's/module_amarok2_mediaplayer=m/module_amarok2_mediaplayer=n/' .config
 %endif
-%if %{with mediaplayer_audacious}
-%{__sed} -i 's/module_audacious_mediaplayer=n/module_audacious_mediaplayer=m/' .config
-%else
-%{__sed} -i 's/module_audacious_mediaplayer=m/module_audacious_mediaplayer=n/' .config
-%endif
-%if %{with mediaplayer_bmpx}
-%{__sed} -i 's/module_bmpx_mediaplayer=n/module_bmpx_mediaplayer=m/' .config
-%else
-%{__sed} -i 's/module_bmpx_mediaplayer=m/module_bmpx_mediaplayer=n/' .config
-%endif
 %if %{with mediaplayer_dragon}
 %{__sed} -i 's/module_dragon_mediaplayer=n/module_dragon_mediaplayer=m/' .config
 %else
@@ -1834,20 +1792,6 @@
 %attr(755,root,root) %{modules_lib_dir}/libamarok2_mediaplayer.so
 %endif
 
-%if %{with mediaplayer_audacious}
-%files module-mediaplayer-audacious
-%defattr(644,root,root,755)
-%{modules_data_dir}/audacious_mediaplayer.desc
-%attr(755,root,root) %{modules_lib_dir}/libaudacious_mediaplayer.so
-%endif
-
-%if %{with mediaplayer_bmpx}
-%files module-mediaplayer-bmpx
-%defattr(644,root,root,755)
-%{modules_data_dir}/bmpx_mediaplayer.desc
-%attr(755,root,root) %{modules_lib_dir}/libbmpx_mediaplayer.so
-%endif
-
 %if %{with mediaplayer_dragon}
 %files module-mediaplayer-dragon
 %defattr(644,root,root,755)
@@ -2324,6 +2268,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.329  2011/09/13 15:37:41  lisu
+- Obsoletes for removed plugins
+- updated globalhotkeys plugin
+
 Revision 1.328  2011/09/13 15:11:00  lisu
 - updated and reenabled anonymous_check plugin
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kadu/kadu.spec?r1=1.328&r2=1.329&f=u



More information about the pld-cvs-commit mailing list