Skip to content

Commit 8441ab7

Browse files
author
David Sommerseth
committed
Package man pages in the RPM
The spec file slipped the man page addition commit, so the man pages was not packaged into the RPM itself. Signed-off-by: David Sommerseth <davids@redhat.com>
1 parent 1680cbe commit 8441ab7

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

MANIFEST

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ python-ethtool/etherinfo_ipv6_obj.c
99
python-ethtool/etherinfo_struct.h
1010
python-ethtool/etherinfo.h
1111
python-ethtool/etherinfo_obj.h
12+
man/pethtool.8.asciidoc
13+
man/pifconfig.8.asciidoc
1214
setup.py
1315
rpm/SPECS/python-ethtool.spec
1416
MANIFEST

rpm/SPECS/python-ethtool.spec

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33

44
Summary: Ethernet settings python bindings
55
Name: python-ethtool
6-
Version: 0.6
6+
Version: 0.7
77
Release: 1%{?dist}
88
URL: http://fedorapeople.org/gitweb?p=dsommers/public_git/python-ethtool.git;a=summary
99
Source: http://dsommers.fedorapeople.org/python-ethtool/%{name}-%{version}.tar.bz2
1010
License: GPLv2
1111
Group: System Environment/Libraries
12-
BuildRequires: python-devel libnl-devel
12+
BuildRequires: python-devel libnl-devel asciidoc
1313
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
1414

1515
%description
@@ -22,13 +22,17 @@ PCI locations.
2222

2323
%build
2424
%{__python} setup.py build
25+
a2x -d manpage -f manpage man/pethtool.8.asciidoc
26+
a2x -d manpage -f manpage man/pifconfig.8.asciidoc
2527

2628
%install
2729
rm -rf %{buildroot}
2830
%{__python} setup.py install --skip-build --root %{buildroot}
29-
mkdir -p %{buildroot}%{_sbindir}
31+
mkdir -p %{buildroot}%{_sbindir} %{buildroot}%{_mandir}/man8
3032
cp -p pethtool.py %{buildroot}%{_sbindir}/pethtool
3133
cp -p pifconfig.py %{buildroot}%{_sbindir}/pifconfig
34+
%{__gzip} -c man/pethtool.8 > %{buildroot}%{_mandir}/man8/pethtool.8.gz
35+
%{__gzip} -c man/pifconfig.8 > %{buildroot}%{_mandir}/man8/pifconfig.8.gz
3236

3337
%clean
3438
rm -rf %{buildroot}
@@ -38,12 +42,21 @@ rm -rf %{buildroot}
3842
%doc COPYING
3943
%{_sbindir}/pethtool
4044
%{_sbindir}/pifconfig
45+
%doc %{_mandir}/man8/*
4146
%{python_sitearch}/ethtool.so
4247
%if "%{python_ver}" >= "2.5"
4348
%{python_sitearch}/*.egg-info
4449
%endif
4550

4651
%changelog
52+
* Mon Apr 11 2011 David Sommerseth <davids@redhat.com> - 0.7-1
53+
- Fixed several memory leaks (commit aa2c20e697af, abc7f912f66d)
54+
- Improved error checking towards NULL values(commit 4e928d62a8e3)
55+
- Fixed typo in pethtool --help (commit 710766dc722)
56+
- Only open a NETLINK connection when needed (commit 508ffffbb3c)
57+
- Added man page for pifconfig and pethtool (commit 9f0d17aa532, rhbz#638475)
58+
- Force NETLINK socket to close on fork() using FD_CLOEXEC (commit 1680cbeb40e)
59+
4760
* Wed Jan 19 2011 David Sommerseth <dazo@users.sourceforge.net> - 0.6-1
4861
- Don't segfault if we don't receive any address from rtnl_link_get_addr()
4962
- Remove errornous file from MANIFEST

0 commit comments

Comments
 (0)