From c9a760e371a14662c0d0b3b972b3136e0a34f25b Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Jul 31 2019 21:21:05 +0000
Subject: 3.1, fix FTBFS


---

diff --git a/.gitignore b/.gitignore
index fa72481..4373fb3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,33 @@
-ContextFreeSource2.2.1.tgz
-/ContextFreeSource2.2.2.tgz
-/ContextFreeSource3.0beta2.tgz
+Context Free.xcodeproj/xcuserdata
+Context Free.xcodeproj/project.xcworkspace/xcshareddata
+Context Free.xcodeproj/project.xcworkspace/xcuserdata
+cfdg
+objs
+output
+*.opensdf
+*.sdf
+src-net/CFControls/Debug/
+src-net/Controls/obj/
+src-net/Debug/
+src-net/FileDlgExtenders/obj/
+src-net/WinFormsUI/obj/
+src-net/WinFormsUI/bin/
+src-net/CFControls/Debug64/
+src-net/CFControls/Release/
+src-net/CFControls/Release64/
+src-net/Debug64/
+src-net/Release/
+src-net/Release64/
+Debug/
+Debug64/
+Release/
+Release64/
+*.dSYM*
+*.ipch
+*.db
+*.opendb
+packages*
+src-net/.vs/
+.vs/
+src-win/win-install/*.exe
+/ContextFreeSource3.1.tgz
diff --git a/cfdg-nostrip.patch b/cfdg-nostrip.patch
new file mode 100644
index 0000000..751061f
--- /dev/null
+++ b/cfdg-nostrip.patch
@@ -0,0 +1,11 @@
+--- Makefile~	2019-01-07 23:39:54.000000000 -0600
++++ Makefile	2019-07-31 14:59:22.889245136 -0500
+@@ -133,7 +133,7 @@
+ 
+ cfdg: $(OBJS)
+ 	$(LINK.o) $^ $(LINKFLAGS) -o $@
+-	strip $@
++#	strip $@
+ 
+ 
+ #
diff --git a/cfdg.spec b/cfdg.spec
index 7982c78..d783dd9 100644
--- a/cfdg.spec
+++ b/cfdg.spec
@@ -1,28 +1,15 @@
 Name: cfdg
-Version:  3.0
-Release:  0.beta2%{?dist}.17
+Version:  3.1
+Release:  1%{?dist}
 Summary: Context Free Design Grammar
 
 License: GPLv2+
 URL: http://www.contextfreeart.org/
 
-Source0: http://www.contextfreeart.org/download/ContextFreeSource3.0beta2.tgz
-
-#GCC 4.3 compatibility patches.  Submitted upstream via email 2008-06-25.
-#Patch0: contextfree-2.1-builder-includes.patch
-#Patch1: contextfree-2.1-yglue-includes.patch
-#Patch2: contextfree-2.1-SVGCanvas-includes.patch
-#Patch3: contextfree-2.1-tiledCanvas-includes.patch
-#Patch4: contextfree-2.1-posixSystem-includes.patch
-#Strip patch.
-Patch5: contextfree-2.1-Makefile-nostrip.patch
-Patch6: contextfree-2.2-mktemp.patch
-#Patch7: contextfree-2.2-optflags.patch
-Patch8: contextfree-2.2.1-dsolink.patch
-#Patch9: contextfree-2.2.2-yglue-type-fix.patch
-Patch10: contextfree-3.0-optflags.patch
-BuildRequires:  gcc-c++
-BuildRequires: libpng-devel, bison, flex
+Source0: http://www.contextfreeart.org/download/ContextFreeSource3.1.tgz
+BuildRequires: gcc-c++ libatomic libicu-devel
+BuildRequires: libpng-devel bison flex
+Patch0:  cfdg-nostrip.patch
 
 %description
 Context Free is a program that generates images from written instructions 
@@ -30,34 +17,27 @@ called a grammar. The program follows the instructions in a few seconds to
 create images that can contain millions of shapes.
 
 %prep
-%setup -qn ContextFreeSource3.0beta2
-
-#%patch0 -p0
-#%patch1 -p0
-#%patch2 -p0
-#%patch3 -p0
-#%patch4 -p0
-%patch5 -p0
-%patch6 -p0
-#%patch7 -p0
-%patch8 -p0
-#%patch9 -p0
-%patch10 -p0
+%setup -qcn ContextFreeSource3.1
+
+%patch0 -p0
 
 %build
 
 OPTFLAGS=$RPM_OPT_FLAGS make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
 install -D -m 755 cfdg %{buildroot}%{_bindir}/cfdg
 
 
 %files
 %{_bindir}/cfdg
-%doc input/* LICENSE.txt README.txt
+%license LICENSE.txt
+%doc input/* README
 
 %changelog
+* Wed Jul 31 2019 Gwyn Ciesla <gwync@protonmail.com> - 3.1-1
+- 3.1
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-0.beta2.17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index 912efd0..cde81fc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7958c1eda1dc055e5076bce8351dbd03  ContextFreeSource3.0beta2.tgz
+SHA512 (ContextFreeSource3.1.tgz) = 49a8e937a5018b198e4a2f841bfd3cdd5268fb5d087eec756a89ca1451b564b8dd1cdaa01f317a9d9a584a33cf1b22e2bfc52843178184c7252c90d562faf96c