From 9483d5306bcdcd4e5bdab2f0fd4e7fb673c7625a Mon Sep 17 00:00:00 2001
From: José Matos <jamatos@fedoraproject.org>
Date: Jul 23 2016 12:27:41 +0000
Subject: Adjust patch and provides for extra packages


---

diff --git a/0001-adjust-requires-for-f24-2016-07-23.patch b/0001-adjust-requires-for-f24-2016-07-23.patch
new file mode 100644
index 0000000..0ed6fd4
--- /dev/null
+++ b/0001-adjust-requires-for-f24-2016-07-23.patch
@@ -0,0 +1,34 @@
+diff -ur a/requirements-extras.txt b/requirements-extras.txt
+--- a/requirements-extras.txt	2016-07-20 17:22:28.000000000 +0100
++++ b/requirements-extras.txt	2016-07-23 12:21:31.797553510 +0100
+@@ -2,13 +2,8 @@
+ Markdown>=2.4.0
+ Jinja2>=2.7.2
+ pyphen>=0.9.1
+-micawber>=0.3.0
+ pygal>=2.0.0
+-typogrify>=2.0.4
+-phpserialize>=1.3
+ webassets>=0.10.1
+ notebook>=4.0.0
+ ipykernel>=4.0.0
+-ghp-import2>=1.0.0
+-ws4py==0.3.5
+-watchdog==0.8.3
++watchdog>=0.8.2
+diff -ur a/requirements-tests.txt b/requirements-tests.txt
+--- a/requirements-tests.txt	2016-07-20 17:22:28.000000000 +0100
++++ b/requirements-tests.txt	2016-07-23 12:25:04.731052645 +0100
+@@ -1,8 +1,7 @@
+ -r requirements-extras.txt
+-mock==2.0.0
+-coverage==4.1
++mock>=1.3.3
++coverage>=4.1
+ pytest==2.9.2
+-pytest-cov==2.3.0
+-freezegun==0.3.7
+-python-coveralls==2.7.0
++pytest-cov>=2.2.1
++freezegun>=0.3.6
+ colorama>=0.3.4
diff --git a/0001-adjust-requires-for-rawhide-2016-07-01.patch b/0001-adjust-requires-for-rawhide-2016-07-01.patch
deleted file mode 100644
index 45cc3cb..0000000
--- a/0001-adjust-requires-for-rawhide-2016-07-01.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur a/requirements-extras.txt b/requirements-extras.txt
---- a/requirements-extras.txt	2016-06-11 10:56:15.000000000 +0100
-+++ b/requirements-extras.txt	2016-07-01 16:06:06.394572016 +0100
-@@ -2,13 +2,8 @@
- Markdown>=2.4.0
- Jinja2>=2.7.2
- pyphen>=0.9.1
--micawber>=0.3.0
- pygal>=2.0.0
--typogrify>=2.0.4
--phpserialize>=1.3
- webassets>=0.10.1
- notebook>=4.0.0
- ipykernel>=4.0.0
--ghp-import2>=1.0.0
--ws4py==0.3.5
--watchdog==0.8.3
-+watchdog>=0.8.2
-diff -ur a/requirements-tests.txt b/requirements-tests.txt
---- a/requirements-tests.txt	2016-06-11 10:56:15.000000000 +0100
-+++ b/requirements-tests.txt	2016-07-01 15:37:21.834940398 +0100
-@@ -1,8 +1,7 @@
- -r requirements-extras.txt
--mock==2.0.0
--coverage==4.1
-+mock>=1.3.3
-+coverage>=4.1
- pytest==2.9.2
- pytest-cov==2.2.1
--freezegun==0.3.7
--python-coveralls==2.7.0
-+freezegun>=0.3.6
- colorama>=0.3.4
diff --git a/python-nikola.spec b/python-nikola.spec
index a34d748..56c2e19 100644
--- a/python-nikola.spec
+++ b/python-nikola.spec
@@ -7,7 +7,7 @@ Summary:	A static website and blog generator
 License:	MIT
 URL:		http://getnikola.com
 Source0:	https://github.com/getnikola/nikola/archive/v%{version}.tar.gz
-Patch0:		0001-adjust-requires-for-rawhide-2016-07-01.patch
+Patch0:		0001-adjust-requires-for-f24-2016-07-23.patch
 BuildArch:	noarch
 
 BuildRequires:	python2-devel
@@ -108,7 +108,7 @@ Requires:	glyphicons-halflings-fonts
 
 %package -n python2-nikola-extras
 Summary: Extra functionality for python2-nikola
-%{?python_provide:%python_provide python2-%{srcname}-extras}
+Provides:       python-nikola-extras = %{version}
 #begin optional dependencies
 Requires:	python2-nikola == %{version}
 Requires:	python2-requests
@@ -163,7 +163,6 @@ It also automatically builds image galleries.
 
 %package -n python3-nikola-extras
 Summary:	 Extra functionality for python3-nikola
-%{?python_provide:%python_provide python3-%{srcname}-extras}
 #begin optional dependencies
 Requires:	python3-nikola == %{version}
 Requires:	python3-requests