From 9f15e131277c7a6fa24f58426c69147ae22d4966 Mon Sep 17 00:00:00 2001
From: Dan Vrátil <dvratil@redhat.com>
Date: Jan 29 2015 11:39:27 +0000
Subject: oxygen-fonts 5.2.0, remove the fontforge workaround in rawhide


---

diff --git a/.gitignore b/.gitignore
index 35189da..ba5a8ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /oxygen-fonts-0.4.0.tar.xz
 /oxygen-fonts-0.4.2.tar.xz
 /oxygen-fonts-5.1.0.tar.xz
+/oxygen-fonts-5.2.0.tar.xz
diff --git a/disable-broken-fontforge-in-rawhide.patch b/disable-broken-fontforge-in-rawhide.patch
deleted file mode 100644
index 0fd4a02..0000000
--- a/disable-broken-fontforge-in-rawhide.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f8307a3..8e62905 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -47,6 +47,7 @@ else()
-     message(FATAL_ERROR "Could not find FontForge executable")
- endif()
- 
-+if (FONTFORGE_IS_NOT_BROKEN)
- add_custom_target(regular ALL fontforge ${CMAKE_CURRENT_SOURCE_DIR}/generate-ttf.pe
-                    ${CMAKE_CURRENT_SOURCE_DIR}/oxygen-fonts/Regular-400/src/Oxygen-Sans.sfd
-                    ${CMAKE_CURRENT_BINARY_DIR}/Oxygen-Sans.ttf
-@@ -66,4 +67,12 @@ set(fontFiles
-     ${CMAKE_CURRENT_BINARY_DIR}/Oxygen-Sans.ttf
- )
- 
-+else()
-+set(fontFiles
-+    ${CMAKE_SOURCE_DIR}/oxygen-fonts/Bold-700/Oxygen-Sans-Bold.ttf
-+    ${CMAKE_SOURCE_DIR}/oxygen-fonts/mono-400/OxygenMono-Regular.ttf
-+    ${CMAKE_SOURCE_DIR}/oxygen-fonts/Regular-400/Oxygen-Sans.ttf
-+)
-+endif(FONTFORGE_IS_NOT_BROKEN)
-+
- install(FILES ${fontFiles} DESTINATION ${OXYGEN_FONT_INSTALL_DIR})
diff --git a/oxygen-fonts.spec b/oxygen-fonts.spec
index f1a0f23..f5edbc3 100644
--- a/oxygen-fonts.spec
+++ b/oxygen-fonts.spec
@@ -2,8 +2,8 @@
 %global fontconf 61-%{fontname}
 
 Name:           %{fontname}-fonts
-Version:        5.1.0
-Release:        2%{?dist}
+Version:        5.2.0
+Release:        1%{?dist}
 Summary:        Oxygen fonts created by the KDE Community
 
 # See LICENSE-GPL+FE for details about the exception
@@ -13,12 +13,6 @@ Source0:        http://download.kde.org/stable/plasma/%{version}/%{name}-%{versi
 Source1:        %{fontconf}-sans.conf
 Source2:        %{fontconf}-mono.conf
 
-#See https://bugzilla.redhat.com/show_bug.cgi?id=1147421
-%if 0%{?fedora} < 22
-%global fontforge -DFONTFORGE_IS_NOT_BROKEN:BOOL=ON
-%endif
-Patch0:         disable-broken-fontforge-in-rawhide.patch
-
 BuildArch:      noarch
 BuildRequires:  cmake
 BuildRequires:  extra-cmake-modules
@@ -63,8 +57,6 @@ developing applications that use %{name}.
 %prep
 %setup -q -n %{name}-%{version}
 
-%patch0 -p1 -b .disablefontforge
-
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -102,6 +94,9 @@ ln -s %{_fontconfig_templatedir}/%{fontconf}-mono.conf \
 %{_libdir}/cmake/OxygenFont/
 
 %changelog
+* Thu Jan 29 2015 Daniel Vrátil <dvratil@redhat.com> - 5.2.0-1
+- oxygen-font 5.2.0, remove the fontforge rawhide workaround
+
 * Mon Oct 20 2014 Rex Dieter <rdieter@fedoraproject.org> 5.1.0-2
 - provide oxygen-fonts (meta)package, fixes upgrade path (#1154369)
 
diff --git a/sources b/sources
index 4f6303a..a6aeed6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-04933d7cfdb2fcdcb433d4e363ceef14  oxygen-fonts-5.1.0.tar.xz
+4868641ea354177bca6873e7798398ad  oxygen-fonts-5.2.0.tar.xz