Fix changelog order.

Merge branch 'master' into f17
Conflicts: shadow-utils.spec
2013-01-11 11:27:12 +01:00 · 2013-01-11 11:26:16 +01:00 · 2012-07-27 10:58:47 +02:00
1 changed files with 4 additions and 0 deletions
--- a/shadow-utils.spec
+++ b/shadow-utils.spec
@ -27,6 +27,7 @@ Requires: audit-libs >= 1.6.5
 Requires: setup
 Requires(pre): coreutils
 Requires(post): coreutils
+Conflicts:  man-pages-pl < 0.24-14
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

 %description
@ -210,6 +211,9 @@ rm -rf $RPM_BUILD_ROOT
 - new upstream version
 - use the original file permissions when creating backup (#853102)

+* Fri Jul 27 2012 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.5-4
+- conflict with man-pages-pl (#843020)
+
 * Wed Jul 25 2012 Peter Vrabec <pvrabec@redhat.com> - 2:4.1.5-5
 - make /etc/default/useradd world-readable (#835137)
Author	SHA1	Message	Date
Tomas Mraz	9b0f55cf5c	Fix changelog order.	2013-01-11 11:27:12 +01:00
Tomas Mraz	ddbf3bb9d8	Merge branch 'master' into f17 Conflicts: shadow-utils.spec	2013-01-11 11:26:16 +01:00
Peter Vrabec	3b906b7662	conflict with man-pages-pl (#843020 )	2012-07-27 10:58:47 +02:00