immanetize pushed to python-nikola (master). "Upstream 7.3.1"

Sat Apr 4 18:23:41 UTC 2015

>From 961cea9a31e422bb01f3ca37077f187935043066 Mon Sep 17 00:00:00 2001
From: Pete Travis <immanetize at fedoraproject.org>
Date: Sat, 4 Apr 2015 12:24:10 -0600
Subject: Upstream 7.3.1

diff --git a/.gitignore b/.gitignore
index 0ee8abf..239516f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /v6.4.0.tar.gz
 /v7.2.0.tar.gz
 /v7.3.0.tar.gz
+/nikola-d956c31576e1fc9a40e584bfe79906128e371835.tar.gz
diff --git a/python-nikola.spec b/python-nikola.spec
index 1197b7b..f95186d 100644
--- a/python-nikola.spec
+++ b/python-nikola.spec
@@ -1,19 +1,21 @@
 %global with_python3 1
+%global commit d956c31576e1fc9a40e584bfe79906128e371835
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
 Name: python-nikola	
-Version:	7.3.0
-Release:	5%{?dist}
+Version:	7.3.1
+Release:	1%{?dist}
 Summary:	A static website and blog generator
 License:	MIT
 URL:		http://getnikola.com
-Source0:	https://github.com/getnikola/nikola/archive/v%{version}.tar.gz
+Source0:	https://github.com/getnikola/nikola/archive/%{commit}/nikola-%{commit}.tar.gz
 BuildArch:	noarch
 BuildRequires:	python2-devel
 BuildRequires:	python-setuptools
 Requires:	python-doit >= 0.23.0
 Requires:	python-pygments >= 1.6
 Requires:	python-pillow >= 2.4.0
-# Upstream requirements.txt v7.3.0 shows python-dateutil==2.4 but this is probably ok
-Requires: python-dateutil >= 2.2
+Requires: python-dateutil >= 2.4.1
 Requires:	python-docutils >= 0.12
 Requires:	python-mako >= 1.0.0
 Requires:	python-unidecode >= 0.04.16
@@ -22,7 +24,7 @@ Requires:	python-yapsy >= 1.10.423
 Requires:	python-PyRSS2Gen >= 1.1
 Requires:	python-logbook >= 0.7.0
 Requires:	python-blinker >= 1.3
-Requires:	python-natsort >= 3.3.0
+Requires:	python-natsort >= 3.5.2
 Requires: glyphicons-halflings-fonts
 
 %description
@@ -75,7 +77,7 @@ BuildRequires:	python3-setuptools
 Requires:	python3-doit >= 0.23.0
 Requires:	python3-pygments >= 1.6
 Requires:	python3-pillow >= 2.4.0
-Requires: python3-dateutil >= 2.2
+Requires: python3-dateutil >= 2.4.1
 Requires:	python3-docutils >= 0.12
 Requires:	python3-mako >= 1.0.0
 Requires:	python3-unidecode >= 0.04.16
@@ -84,7 +86,7 @@ Requires:	python3-yapsy >= 1.10.423
 Requires:	python3-PyRSS2Gen >= 1.1
 Requires:	python3-logbook >= 0.7.0
 Requires:	python3-blinker >= 1.3
-Requires:	python3-natsort >= 3.3.0
+Requires:	python3-natsort >= 3.5.2
 Requires: glyphicons-halflings-fonts
 %description -n python3-nikola
 Nikola is a static site and blog generator using Python. It generates sites
@@ -124,7 +126,7 @@ python-nikola-doc contains detailed usage instructions for Nikola, a static
 website and blog generator in python.
 
 %prep
-%setup -qn nikola-%{version}
+%setup -qn nikola-%{commit}
 sed -i -e 's/^setuptools>=5.4.1/setuptools/' requirements.txt
 
 %build
@@ -142,14 +144,14 @@ 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 %{buildroot}/%{_mandir}/man1/nikola2.1
+/usr/bin/install -m 0644 -Dp docs/man/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
 
 ## communicated to upstream, fix pending:
-find %{buildroot}/%{python2_sitelib}/nikola/ -name \*.py -execdir sed -i -e '/^#!\/usr\/bin\/python$/d' {} \;
-find %{buildroot}/%{python2_sitelib}/nikola/ -type f -execdir chmod a-x {} \;
+#find %{buildroot}/%{python2_sitelib}/nikola/ -name \*.py -execdir sed -i -e '/^#!\/usr\/bin\/python$/d' {} \;
+#find %{buildroot}/%{python2_sitelib}/nikola/ -type f -execdir chmod a-x {} \;
 ##
 rm -rf build
 
@@ -159,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 %{buildroot}/%{_mandir}/man1/nikola3.1
+/usr/bin/install -m 0644 -Dp docs/man/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 \
@@ -174,14 +176,14 @@ ln -s %{_bindir}/nikola2 %{buildroot}/%{_bindir}/nikola
 %{_bindir}/nikola2
 %{python2_sitelib}/Nikola-%{version}-py%{python2_version}.egg-info
 %{python2_sitelib}/nikola
-%{_mandir}/man1/nikola2.1*
+%{_mandir}/man1/nikola%{python2_version}*
 %doc AUTHORS.txt CHANGES.txt CONTRIBUTING.rst LICENSE.txt README.rst
 
 %files -n python3-nikola
 %{_bindir}/nikola%{python3_version}
 %{python3_sitelib}/Nikola-%{version}-py%{python3_version}.egg-info
 %{python3_sitelib}/nikola
-%{_mandir}/man1/nikola3.1*
+%{_mandir}/man1/nikola%{python3_version}*
 %doc AUTHORS.txt CHANGES.txt CONTRIBUTING.rst LICENSE.txt README.rst
 
 %files -n python-nikola-doc
@@ -194,6 +196,10 @@ ln -s %{_bindir}/nikola2 %{buildroot}/%{_bindir}/nikola
 %doc README.extras
 
 %changelog
+* Sat Apr 04 2015 Pete Travis <immanetize at fedoraproject.org> - 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
+
 * Wed Feb 25 2015 Pete Travis <immanetize at fedoraproject.org> - 7.3.0-5
 - Stop removing empty files, really.
 
diff --git a/sources b/sources
index c1c2e98..c3c8387 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-639d4c6faacfe6f07142c593261fac9c  v7.3.0.tar.gz
+d7ecfdab969556b66086a56f97aa7cec  nikola-d956c31576e1fc9a40e584bfe79906128e371835.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/python-nikola.git/commit/?h=master&id=961cea9a31e422bb01f3ca37077f187935043066
