From 3b906b76629c38ba9923ac1f6aa725f5357decf4 Mon Sep 17 00:00:00 2001 From: Peter Vrabec Date: Fri, 27 Jul 2012 10:58:47 +0200 Subject: [PATCH 1/2] conflict with man-pages-pl (#843020) --- shadow-utils.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/shadow-utils.spec b/shadow-utils.spec index 9106674..a686af4 100644 --- a/shadow-utils.spec +++ b/shadow-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for managing accounts and shadow password files Name: shadow-utils Version: 4.1.5 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 2 URL: http://pkg-shadow.alioth.debian.org/ Source0: http://pkg-shadow.alioth.debian.org/releases/shadow-%{version}.tar.bz2 @@ -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 @@ -206,6 +207,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/vigr.8* %changelog +* Fri Jul 27 2012 Peter Vrabec - 2:4.1.5-4 +- conflict with man-pages-pl (#843020) + * Mon Jun 18 2012 Peter Vrabec - 2:4.1.5-3 - pwconv/grpconv skipped 2nd of consecutive failures (#832995) From 9b0f55cf5c653020a1f7367a71e61519d5bb1e92 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Fri, 11 Jan 2013 11:27:12 +0100 Subject: [PATCH 2/2] Fix changelog order. --- shadow-utils.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shadow-utils.spec b/shadow-utils.spec index f93c962..bca9362 100644 --- a/shadow-utils.spec +++ b/shadow-utils.spec @@ -211,12 +211,12 @@ rm -rf $RPM_BUILD_ROOT - new upstream version - use the original file permissions when creating backup (#853102) -* Wed Jul 25 2012 Peter Vrabec - 2:4.1.5-5 -- make /etc/default/useradd world-readable (#835137) - * Fri Jul 27 2012 Peter Vrabec - 2:4.1.5-4 - conflict with man-pages-pl (#843020) +* Wed Jul 25 2012 Peter Vrabec - 2:4.1.5-5 +- make /etc/default/useradd world-readable (#835137) + * Sat Jul 21 2012 Fedora Release Engineering - 2:4.1.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild