packages: kadu/kadu.spec, kadu/TODO (NEW) - rel.5 - handle conditional obso...

[blues]

Author: blues                        Date: Sat Jun  6 18:25:21 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel.5 - handle conditional obsoletes for modeles that were present in
  previous releases (at least I had them)

---- Files affected:
packages/kadu:
   kadu.spec (1.217 -> 1.218) , TODO (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/kadu/kadu.spec
diff -u packages/kadu/kadu.spec:1.217 packages/kadu/kadu.spec:1.218
--- packages/kadu/kadu.spec:1.217	Thu May 28 00:03:23 2009
+++ packages/kadu/kadu.spec	Sat Jun  6 20:25:15 2009
@@ -1,10 +1,4 @@
 # $Revision$, $Date$
-#
-# TODO:
-# - Some modules with bcond_with will not work for now, we need to wait for next releases
-# - better descriptions/summaries for all modules (maybe also information in each package that it is a kadu module/theme)
-# - Qt4 Req and BReq
-#
 # Conditional build:
 %bcond_with	debug			# build with debug
 %bcond_without	advanced_userlist	# without Advanced Userlist support
@@ -108,7 +102,7 @@
 Summary(pl.UTF-8):	Klient Gadu-Gadu do przesyłania wiadomości po sieci
 Name:		kadu
 Version:	0.6.5.2
-Release:	4
+Release:	5
 License:	GPL v2
 Group:		Applications/Communications
 Source0:	http://kadu.net/download/stable/%{name}-%{version}.tar.bz2
@@ -248,6 +242,12 @@
 Obsoletes:	kadu-theme-icons-crystal22
 Obsoletes:	kadu-theme-icons-nuvola16
 Obsoletes:	kadu-theme-icons-nuvola22
+%{!?with_mediaplayer:Obsoletes:	kadu-module-mediaplayer}
+%{!?with_split_messages:Obsoletes:	kadu-module-split_messages}
+%if %{without notify_osdhints} && %{without notify_xosd}
+Obsoletes:	kadu-module-notify-osdhints
+Obsoletes:	kadu-module-notify-xosd
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		modules_lib_dir		%{_libdir}/%{name}/modules
@@ -649,6 +649,9 @@
 Summary(pl.UTF-8):	Powiadamianie o zdarzeniach przy pomocy dymków typu OSD
 Group:		Applications/Communications
 Requires:	%{name} = %{version}-%{release}
+%if %{without notify_xosd}
+Obsoletes:	kadu-module-notify-xosd
+%endif
 
 %description module-notify-osdhints
 Notification by OSD-like hints.
@@ -699,6 +702,9 @@
 Summary(pl.UTF-8):	Moduł powiadamiania o zdarzeniach przy pomocy XOSD
 Group:		Applications/Communications
 Requires:	%{name} = %{version}-%{release}
+%if %{without notify_osdhints}
+Obsoletes:	kadu-module-notify-osdhints
+%endif
 
 %description module-notify-xosd
 Notification by XOSD module.
@@ -741,7 +747,7 @@
 Requires:	%{name}-module-autostatus = %{version}-%{release}
 Requires:	%{name}-module-cenzor = %{version}-%{release}
 Requires:	%{name}-module-parser_extender = %{version}-%{release}
-Requires:	%{name}-module-split_messages = %{version}-%{release}
+%{!?with_split_messages:Requires:	%{name}-module-split_messages = %{version}-%{release}}
 Requires:	%{name}-module-word_fix = %{version}-%{release}
 
 %description module-powerkadu
@@ -2183,6 +2189,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.218  2009/06/06 18:25:15  blues
+- rel.5 - handle conditional obsoletes for modeles that were present in
+  previous releases (at least I had them)
+
 Revision 1.217  2009/05/27 22:03:23  cactus
 - upstream libsuffix patch, but for external modules hack still needed
 - rel 4

================================================================
Index: packages/kadu/TODO
diff -u /dev/null packages/kadu/TODO:1.1
--- /dev/null	Sat Jun  6 20:25:21 2009
+++ packages/kadu/TODO	Sat Jun  6 20:25:15 2009
@@ -0,0 +1,4 @@
+# TODO:
+- Some modules with bcond_with will not work for now, we need to wait for next releases
+- better descriptions/summaries for all modules (maybe also information in each package that it is a kadu module/theme)
+- Qt4 Req and BReq
================================================================

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