From 77e8e1b09bc742bcf2fb143713928677e7b1946f Mon Sep 17 00:00:00 2001 From: Pete Travis Date: Apr 04 2015 18:59:58 +0000 Subject: Fix manpage handling --- diff --git a/python-nikola.spec b/python-nikola.spec index f95186d..05dfdf5 100644 --- a/python-nikola.spec +++ b/python-nikola.spec @@ -4,7 +4,7 @@ Name: python-nikola Version: 7.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A static website and blog generator License: MIT URL: http://getnikola.com @@ -144,7 +144,7 @@ echo "This is a stub package to provide optional dependencies for nikola" > READ mv build2 build %{__python2} setup.py install --skip-build --root %{buildroot} mv %{buildroot}/%{_bindir}/nikola %{buildroot}/%{_bindir}/nikola2 -/usr/bin/install -m 0644 -Dp docs/man/nikola.1.gz %{buildroot}/%{_mandir}/man1/nikola%{python2_version}.1.gz +mv %{buildroot}/%{_mandir}/man1/nikola.1.gz %{buildroot}/%{_mandir}/man1/nikola%{python2_version}.1.gz rm -rf %{buildroot}/%{python2_sitelib}/nikola/data/themes/bootstrap3/assets/fonts ln -s %{_datadir}/fonts/glyphicons-halflings \ %{buildroot}/%{python2_sitelib}/nikola/data/themes/bootstrap3/assets/fonts @@ -161,7 +161,7 @@ mv build3 build mv %{buildroot}/%{_bindir}/nikola %{buildroot}/%{_bindir}/nikola%{python3_version} find %{buildroot}/%{python3_sitelib}/nikola/ -name \*.py -execdir sed -i -e '/^#!\/usr\/bin\/python$/d' {} \; find %{buildroot}/%{python3_sitelib}/nikola/ -type f -execdir chmod a-x {} \; -/usr/bin/install -m 0644 -Dp docs/man/nikola.1.gz %{buildroot}/%{_mandir}/man1/nikola%{python3_version}.1.gz +mv %{buildroot}/%{_mandir}/man1/nikola.1.gz %{buildroot}/%{_mandir}/man1/nikola%{python3_version}.1.gz ls rm -rf %{buildroot}/%{python3_sitelib}/nikola/data/themes/bootstrap3/assets/fonts ln -s %{_datadir}/fonts/glyphicons-halflings \ @@ -170,13 +170,15 @@ ln -s %{_datadir}/fonts/glyphicons-halflings \ rm -rf %{buildroot}%{_datadir}/doc/nikola ln -s %{_bindir}/nikola2 %{buildroot}/%{_bindir}/nikola - +ln -s %{_mandir}/man1/nikola%{python2_version}.1.gz %{buildroot}/%{_mandir}/man1/nikola.1.gz + %files %{_bindir}/nikola %{_bindir}/nikola2 %{python2_sitelib}/Nikola-%{version}-py%{python2_version}.egg-info %{python2_sitelib}/nikola %{_mandir}/man1/nikola%{python2_version}* +%{_mandir}/man1/nikola.1.gz %doc AUTHORS.txt CHANGES.txt CONTRIBUTING.rst LICENSE.txt README.rst %files -n python3-nikola @@ -196,6 +198,9 @@ ln -s %{_bindir}/nikola2 %{buildroot}/%{_bindir}/nikola %doc README.extras %changelog +* Sat Apr 04 2015 Pete Travis - 7.3.1-2 +- Fix manpage handling + * Sat Apr 04 2015 Pete Travis - 7.3.1-1 - Update to upstream 7.3.1 - Primarily a bugfix release, refer to https://github.com/getnikola/nikola/releases/tag/v7.3.1