Author: megabajt Date: Sat Mar 10 21:13:17 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- changed conflicts gnome-keyring-* to obsoletes in subpackages
---- Files affected:
packages/gcr:
gcr.spec (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/gcr/gcr.spec
diff -u packages/gcr/gcr.spec:1.1 packages/gcr/gcr.spec:1.2
--- packages/gcr/gcr.spec:1.1 Sat Mar 10 13:00:10 2012
+++ packages/gcr/gcr.spec Sat Mar 10 22:13:12 2012
@@ -51,7 +51,7 @@
Summary: gcr library
Summary(pl.UTF-8): Biblioteka gcr
Group: Libraries
-Conflicts: gnome-keyring-libs < 3.3.0
+Obsoletes: gnome-keyring-libs < 3.3.0
%description libs
This package provides gcr library.
@@ -66,7 +66,7 @@
Requires: %{name}-libs = %{version}-%{release}
Requires: glib2-devel >= 1:2.26.0
Requires: p11-kit-devel >= 0.6
-Conflicts: gnome-keyring-devel < 3.3.0
+Obsoletes: gnome-keyring-devel < 3.3.0
%description devel
Header files for gcr library.
@@ -79,7 +79,7 @@
Summary(pl.UTF-8): Statyczna biblioteka gcr
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
-Conflicts: gnome-keyring-static < 3.3.0
+Obsoletes: gnome-keyring-static < 3.3.0
%description static
Static gcr library.
@@ -92,7 +92,7 @@
Summary(pl.UTF-8): Dokumentacja API biblioteki gcr
Group: Documentation
Requires: gtk-doc-common
-Conflicts: gnome-keyring-apidocs < 3.3.0
+Obsoletes: gnome-keyring-apidocs < 3.3.0
%description apidocs
API documentation for gcr library.
@@ -207,6 +207,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.2 2012/03/10 21:13:12 megabajt
+- changed conflicts gnome-keyring-* to obsoletes in subpackages
+
Revision 1.1 2012/03/10 12:00:10 megabajt
- new
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gcr/gcr.spec?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
