Author: arekm Date: Sun Sep 25 20:49:36 2011 GMT Module: packages Tag: HEAD ---- Log message: - rel 2; try to solve file conflicts by using package conflict
---- Files affected: packages/kde4-kdebase-workspace: kde4-kdebase-workspace.spec (1.278 -> 1.279) ---- Diffs: ================================================================ Index: packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec diff -u packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.278 packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.279 --- packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.278 Sun Sep 25 16:50:14 2011 +++ packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec Sun Sep 25 22:49:31 2011 @@ -9,7 +9,7 @@ Summary(pl.UTF-8): Podstawowe komponenty środowiska KDE 4 Name: kde4-kdebase-workspace Version: 4.7.1 -Release: 1 +Release: 2 License: GPL v2+ Group: X11/Applications Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2 @@ -97,6 +97,7 @@ 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 @@ -1875,6 +1876,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.279 2011/09/25 20:49:31 arekm +- rel 2; try to solve file conflicts by using package conflict + Revision 1.278 2011/09/25 14:50:14 arekm - rel 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec?r1=1.278&r2=1.279&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
