From ee16f83f8578c88575b3eebeac2751b4b86e9d93 Mon Sep 17 00:00:00 2001
From: Petr Hracek <phracek@redhat.com>
Date: Jul 16 2013 09:13:50 +0000
Subject: Merge branch 'master' into f19


Conflicts:
	amanda.spec

---

diff --git a/amanda.spec b/amanda.spec
index 9d83ca3..e2e1494 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -10,7 +10,7 @@
 Summary: A network-capable tape backup solution
 Name: amanda
 Version: 3.3.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1: amanda.crontab
 Source4: disklist
@@ -144,7 +144,7 @@ install -p -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/amanda@.service
 install -p -m 644 -D %{SOURCE13} %{buildroot}%{_unitdir}/amanda-udp.socket
 install -p -m 644 -D %{SOURCE14} %{buildroot}%{_unitdir}/amanda-udp@.service
 install -D %{SOURCE11}  %{buildroot}/%{_mandir}/man1/activate-devpay.1.gz
-install -D %{SOURCE12}  %{buildroot}/%{_mandir}/man8/killpgrp.8.gz
+install -D %{SOURCE12}  %{buildroot}/%{_mandir}/man8/killpgrp.8
 
 ln -s %{_libexecdir}/amanda/amandad $RPM_BUILD_ROOT%{_sbindir}/amandad
 ln -s amrecover.8.gz $RPM_BUILD_ROOT%{_mandir}/man8/amoldrecover.8
@@ -463,6 +463,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Tue Jul 16 2013 Petr Hracek <phracek@redhat.com> - 3.3.3-4
+- Correct problem with man page killpgrp (#881128)"
+
 * Tue Jun 25 2013 Petr Hracek <phracek@redhat.com> - 3.3.3-3
 - Remove dependency on dump in RHEL-7