rel-eng/packages/spacewalk-utils | 2 +-
utils/Makefile | 7 ++++---
utils/spacewalk-api | 2 ++
utils/spacewalk-utils.spec | 12 +++++++++---
4 files changed, 16 insertions(+), 7 deletions(-)
New commits:
commit 50518d5a2378588d6c8991a9971f791678167976
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 8 11:15:39 2014 +0100
Automatic commit of package [spacewalk-utils] release [2.1.23-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index aad3aae..556ac4e 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-2.1.22-1 utils/
+2.1.23-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index bb04d80..f56a2eb 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 2.1.22
+Version: 2.1.23
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -91,6 +91,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot}
%changelog
+* Wed Jan 08 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.23-1
+- fixed man page encoding
+
* Tue Nov 12 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.22-1
- Added Oracle Linux channels for UEKR3, as well as Spacewalk 2.0 Server/Client
for OL6 and Client for OL5
commit 9a480b1701f3ff0a9f68753bf4ee735fb5d1bf07
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jan 8 11:02:27 2014 +0100
fixed man page encoding
addressing (failed F20 build)
pod2man --section=8 spacewalk-api spacewalk-api.8
spacewalk-api around line 136: 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/utils/Makefile b/utils/Makefile
index b76d1de..bb3dcfd 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -12,6 +12,7 @@ SCRIPTS = sw-system-snapshot migrate-system-profile spacewalk-api apply_errata \
CONFIGS = spacewalk-common-channels.ini
DOCBOOK = $(wildcard /usr/bin/docbook2man)
+POD2MAN = pod2man --utf8
SGMLS = $(wildcard *.sgml)
MANS = $(patsubst %.sgml,%.8,$(SGMLS) )
@@ -32,9 +33,9 @@ install :: $(SCRIPTS) $(PREFIX)/$(BINDIR)
ifneq ($(DOCBOOK),)
# install man pages
all :: $(MANS)
- pod2man --section=8 spacewalk-api spacewalk-api.8
- pod2man --section=8 delete-old-systems-interactive delete-old-systems-interactive.8
- pod2man --section=8 spacewalk-dump-schema spacewalk-dump-schema.8
+ $(POD2MAN) --section=8 spacewalk-api spacewalk-api.8
+ $(POD2MAN) --section=8 delete-old-systems-interactive delete-old-systems-interactive.8
+ $(POD2MAN) --section=8 spacewalk-dump-schema spacewalk-dump-schema.8
install :: $(MANS) $(PREFIX)/$(MANDIR)
$(INSTALL_DATA) $(MANS) spacewalk-api.8* delete-old-systems-interactive.8 spacewalk-dump-schema.8* $(PREFIX)/$(MANDIR)/man8
install :: $(CONFIGS) $(PREFIX)/$(CONFDIR)
diff --git a/utils/spacewalk-api b/utils/spacewalk-api
index f69b2a0..babd3e8 100644
--- a/utils/spacewalk-api
+++ b/utils/spacewalk-api
@@ -87,6 +87,8 @@ if ($login) {
=pod
+=encoding utf8
+
=head1 NAME
spacewalk-api - Call Spacawalk API from command line.
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index 8cf66b9..bb04d80 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -55,15 +55,18 @@ Generic utilities that may be run against a Spacewalk server.
%prep
%setup -q
+%if 0%{?rhel} && 0%{?rhel} < 6
+%define pod2man POD2MAN=pod2man
+%endif
%build
-make all
+make all %{?pod2man}
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/%{rhnroot}
make install PREFIX=$RPM_BUILD_ROOT ROOT=%{rhnroot} \
- MANDIR=%{_mandir}
+ MANDIR=%{_mandir} %{?pod2man}
%clean