packages: kde4-kdebase-workspace/kde4-kdebase-workspace.spec - rel 3: O wal...

[arekm]

Author: arekm                        Date: Sun Sep 25 22:33:41 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3: O wallpapers

---- Files affected:
packages/kde4-kdebase-workspace:
   kde4-kdebase-workspace.spec (1.279 -> 1.280) 

---- Diffs:

================================================================
Index: packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec
diff -u packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.279 packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.280
--- packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.279	Sun Sep 25 22:49:31 2011
+++ packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec	Mon Sep 26 00:33:36 2011
@@ -9,7 +9,7 @@
 Summary(pl.UTF-8):	Podstawowe komponenty środowiska KDE 4
 Name:		kde4-kdebase-workspace
 Version:	4.7.1
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
@@ -92,12 +92,12 @@
 Obsoletes:	kde4-decoration-ozone
 Obsoletes:	kde4-kdebase-workspace-core
 Obsoletes:	kde4-kdebase-workspace-kde4-decoration-libs
+Obsoletes:	kde4-kdebase-workspace-wallpapers
 Obsoletes:	kdebase-desktop
 Obsoletes:	kdebase4-workspace
 Conflicts:	kdebase-core
 Conflicts:	kdebase-desktop
 Conflicts:	kdebase4-workspace
-Conflicts:	kde4-kdebase-workspace-wallpapers < 4.6.99
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -1876,6 +1876,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.280  2011/09/25 22:33:36  arekm
+- rel 3: O wallpapers
+
 Revision 1.279  2011/09/25 20:49:31  arekm
 - rel 2; try to solve file conflicts by using package conflict
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec?r1=1.279&r2=1.280&f=u