From bde7e81d0525f18e28880e14315625612a233234 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Sun, 14 Feb 2016 18:02:41 -0600
Subject: [PATCH] 15.12.2

---
 .gitignore                   |  2 +-
 kf5-kholidays.spec           | 20 ++++++++++----------
 kholidays-15.12.1-gcc6.patch | 11 -----------
 sources                      |  2 +-
 4 files changed, 12 insertions(+), 23 deletions(-)
 delete mode 100644 kholidays-15.12.1-gcc6.patch

diff --git a/.gitignore b/.gitignore
index da7a537..9574230 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/kholidays-15.12.1.tar.xz
+/kholidays-15.12.2.tar.xz
diff --git a/kf5-kholidays.spec b/kf5-kholidays.spec
index c0c3404..0bedd2d 100644
--- a/kf5-kholidays.spec
+++ b/kf5-kholidays.spec
@@ -1,12 +1,12 @@
 %global framework kholidays
 
-Name:           kf5-%{framework}
-Version:        15.12.1
-Release:        1%{?dist}
-Summary:        The KHolidays Library
+Name:    kf5-%{framework}
+Version: 15.12.2
+Release: 1%{?dist}
+Summary: The KHolidays Library
 
-License:        LGPLv2+ and GPLv3+
-URL:            https://projects.kde.org/%{framework}
+License: LGPLv2+ and GPLv3+
+URL:     https://projects.kde.org/%{framework}
 
 %global revision %(echo %{version} | cut -d. -f3)
 %if %{revision} >= 50
@@ -14,10 +14,7 @@ URL:            https://projects.kde.org/%{framework}
 %else
 %global stable stable
 %endif
-Source0:        http://download.kde.org/%{stable}/applications/%{version}/src/%{framework}-%{version}.tar.xz
-
-## upstreamable patches
-Patch1: kholidays-15.12.1-gcc6.patch
+Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{framework}-%{version}.tar.xz
 
 BuildRequires:  kf5-rpm-macros
 BuildRequires:  extra-cmake-modules
@@ -74,6 +71,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Sun Feb 14 2016 Rex Dieter <rdieter@fedoraproject.org> - 15.12.2-1
+- 15.12.2
+
 * Thu Feb 11 2016 Rex Dieter <rdieter@fedoraproject.org> 15.12.1-1
 - 15.12.1
 - fix gcc6 FTBFS
diff --git a/kholidays-15.12.1-gcc6.patch b/kholidays-15.12.1-gcc6.patch
deleted file mode 100644
index 843c3a3..0000000
--- a/kholidays-15.12.1-gcc6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up kholidays-15.12.1/src/sunriseset.cpp.gcc6 kholidays-15.12.1/src/sunriseset.cpp
---- kholidays-15.12.1/src/sunriseset.cpp.gcc6	2015-11-21 18:49:24.000000000 -0600
-+++ kholidays-15.12.1/src/sunriseset.cpp	2016-02-11 08:31:39.554683739 -0600
-@@ -23,6 +23,7 @@
- */
- 
- #include "sunriseset.h"
-+#include <math.h>
- #include <cmath>
- static const double PI = 3.14159265358979323846;
- static const double MaxLat = 89.99;
diff --git a/sources b/sources
index e33e0d2..cd03cc6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2bce2350a78938f08fd7065d0382dec1  kholidays-15.12.1.tar.xz
+9369e69a2a6ecbf8813a472d3b72c60c  kholidays-15.12.2.tar.xz