monitoring/SatConfig/general/NOCpulse-ini | 2 ++
monitoring/SatConfig/general/SatConfig-general.spec | 12 ++++++++++--
rel-eng/packages/SatConfig-general | 2 +-
3 files changed, 13 insertions(+), 3 deletions(-)
New commits:
commit 5c399656736d8325277a13cef36caab916b3e31e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 8 10:30:16 2014 +0100
Automatic commit of package [SatConfig-general] release [1.216.30-1].
diff --git a/monitoring/SatConfig/general/SatConfig-general.spec
b/monitoring/SatConfig/general/SatConfig-general.spec
index 6086936..2ab6910 100644
--- a/monitoring/SatConfig/general/SatConfig-general.spec
+++ b/monitoring/SatConfig/general/SatConfig-general.spec
@@ -2,7 +2,7 @@
%define hb_res_dir %{_sysconfdir}/ha.d/resource.d
%define installed_dir %sysv_dir/installed
Name: SatConfig-general
-Version: 1.216.29
+Version: 1.216.30
Release: 1%{?dist}
Summary: Satellite Configuration System - general setup, used by many packages
URL:
https://fedorahosted.org/spacewalk
@@ -70,6 +70,9 @@ install -D -p -m 755 NOCpulse-ini
$RPM_BUILD_ROOT%{_sbindir}/NOCpulse-ini
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Jan 08 2014 Michael Mraka <michael.mraka(a)redhat.com> 1.216.30-1
+- fixed man page encoding
+
* Mon Feb 18 2013 Miroslav Suchý <msuchy(a)redhat.com> 1.216.29-1
- Buildrequire pod2man
- %%defattr is not needed since rpm 4.4
diff --git a/rel-eng/packages/SatConfig-general b/rel-eng/packages/SatConfig-general
index 7ae50ed..4997b02 100644
--- a/rel-eng/packages/SatConfig-general
+++ b/rel-eng/packages/SatConfig-general
@@ -1 +1 @@
-1.216.29-1 monitoring/SatConfig/general/
+1.216.30-1 monitoring/SatConfig/general/
commit 8f32713a1d6d5c615f90e283a85f022c06a312ec
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 8 10:16:13 2014 +0100
fixed man page encoding
addressing (F20 failed build)
NOCpulse-ini around line 199: Non-ASCII character seen before =encoding in
'Such�'. Assuming UTF-8
POD document had syntax errors at /usr/bin/pod2man line 69.
diff --git a/monitoring/SatConfig/general/NOCpulse-ini
b/monitoring/SatConfig/general/NOCpulse-ini
index 345dfc6..2531319 100644
--- a/monitoring/SatConfig/general/NOCpulse-ini
+++ b/monitoring/SatConfig/general/NOCpulse-ini
@@ -132,6 +132,8 @@ $ini->disconnect();
=pod
+=encoding utf8
+
=head1 NAME
NOCpulse-ini - Show content of monitoring config file NOCpulse.ini and allow you to edit
it.
diff --git a/monitoring/SatConfig/general/SatConfig-general.spec
b/monitoring/SatConfig/general/SatConfig-general.spec
index f9a493e..6086936 100644
--- a/monitoring/SatConfig/general/SatConfig-general.spec
+++ b/monitoring/SatConfig/general/SatConfig-general.spec
@@ -23,7 +23,12 @@ to make a monitoring work.
%setup -q
%build
-pod2man --section=8 NOCpulse-ini NOCpulse-ini.8
+%if 0%{?rhel} && 0%{?rhel} < 6
+%define pod2man pod2man
+%else
+%define pod2man pod2man --utf8
+%endif
+%{pod2man} --section=8 NOCpulse-ini NOCpulse-ini.8
%install
rm -rf $RPM_BUILD_ROOT