[rpms/kig] epel10: Merge branch 'master' into f20

[Rex Dieter <rdieter@math.unl.edu>]

A new commit has been pushed.

Repo   : rpms/kig
Branch : epel10
Commit : 3de68c11dbd90206d73feb6620c37230d30f4d2e
Author : Rex Dieter <rdieter@math.unl.edu>
Date   : 2014-06-30T23:00:46-05:00
Stats  : +37/-2 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/kig/c/3de68c11dbd90206d73feb6620c37230d30f4d2e?branch=epel10

Log:
Merge branch 'master' into f20

---
diff --git a/.gitignore b/.gitignore
index 25265c6..101b81d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,9 @@
 /kig-4.12.1.tar.xz
 /kig-4.12.2.tar.xz
 /kig-4.12.3.tar.xz
+/kig-4.12.90.tar.xz
+/kig-4.12.95.tar.xz
+/kig-4.12.97.tar.xz
+/kig-4.13.0.tar.xz
+/kig-4.13.1.tar.xz
+/kig-4.13.2.tar.xz

diff --git a/kig.spec b/kig.spec
index 7aefca8..ca960ce 100644
--- a/kig.spec
+++ b/kig.spec
@@ -1,6 +1,6 @@
 Name:    kig
 Summary: Interactive Geometry 
-Version: 4.12.3
+Version: 4.13.2
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -14,7 +14,10 @@ URL:     https://projects.kde.org/projects/kde/kdeedu/%{name}
 Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
 
 # Kig can optionally use Boost.Python for Python scripting
+%if 0%{?fedora} || 0%{?rhel} > 6
+%global boost_python 1
 BuildRequires: boost-devel
+%endif
 BuildRequires: desktop-file-utils
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: python-devel python
@@ -73,13 +76,39 @@ fi
 %{_kde4_datadir}/applications/kde4/kig.desktop
 %{_kde4_iconsdir}/hicolor/*/*/kig.*
 %{_kde4_iconsdir}/hicolor/*/*/application-x-kig.*
+%if 0%{?boost_python}
 %{_kde4_appsdir}/katepart/syntax/python-kig.xml
+%endif
 %{_kde4_appsdir}/kig/
 %{_kde4_datadir}/kde4/services/kig_part.desktop
 %{_mandir}/man1/kig.*
 
 
 %changelog
+* Mon Jun 09 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.13.2-1
+- 4.13.2
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.13.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Fri May 23 2014 David Tardon <dtardon@redhat.com> - 4.13.1-2
+- rebuild for boost 1.55.0
+
+* Sun May 11 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.13.1-1
+- 4.13.1
+
+* Sat Apr 12 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.13.0-1
+- 4.13.0
+
+* Fri Apr 04 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.12.97-1
+- 4.12.97
+
+* Sun Mar 23 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.12.95-1
+- 4.12.95
+
+* Wed Mar 19 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.12.90-1
+- 4.12.90
+
 * Sun Mar 02 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.12.3-1
 - 4.12.3
 

diff --git a/sources b/sources
index dc4d5d5..8baaf03 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7965d6c2127e6dac5b0e8cfedb167a4f  kig-4.12.3.tar.xz
+88296e2a49124d5d667aa5277b11b651  kig-4.13.2.tar.xz