From 8f9e3a613a6626aba9d9b9d9fc50a19028fc7fa3 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Thu, 29 Dec 2016 11:40:58 +0100
Subject: [PATCH] Update to 3.4.0

---
 .gitignore                      |  1 +
 gtkd-fix-secondary-arches.patch | 41 ---------------------------------
 gtkd.spec                       | 20 ++++++++--------
 sources                         |  2 +-
 4 files changed, 12 insertions(+), 52 deletions(-)
 delete mode 100644 gtkd-fix-secondary-arches.patch

diff --git a/.gitignore b/.gitignore
index f9a5ad1..7a543b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /v3.2.1.tar.gz
 /gtkd-3.2.2.tar.gz
 /gtkd-3.3.1.tar.gz
+/gtkd-3.4.0.tar.gz
diff --git a/gtkd-fix-secondary-arches.patch b/gtkd-fix-secondary-arches.patch
deleted file mode 100644
index f3ef851..0000000
--- a/gtkd-fix-secondary-arches.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- GtkD-3.3.1/GNUmakefile.orig	2016-11-30 12:09:00.314067964 +0100
-+++ GtkD-3.3.1/GNUmakefile	2016-11-30 12:13:10.087744201 +0100
-@@ -4,7 +4,6 @@
- datadir=$(prefix)/share
- 
- OS=$(shell uname || uname -s)
--ARCH=$(shell uname -m || arch)
- 
- ifndef DC
-     ifneq ($(strip $(shell which dmd 2>/dev/null)),)
-@@ -49,22 +48,6 @@
-     LDFLAGS+=$(LINKERFLAG)-ldl
- endif
- 
--ifndef MODEL
--    ifeq ("$(ARCH)", "x86_64")
--        MODEL=64
--    else
--        MODEL=32
--    endif
--endif
--
--ifeq ($(MODEL), 64) 
--   DCFLAGS+=-m64
--   LDFLAGS+=-m64
--else
--   DCFLAGS+=-m32
--   LDFLAGS+=-m32
--endif
--
- AR=ar
- RANLIB=ranlib
- 
-@@ -197,7 +180,6 @@
- # Create a versioned symlink so the demo is able to load it.
- 
- $(BINNAME_DEMO): IMPORTS=-Isrc -Idemos/gtkD/TestWindow
--$(BINNAME_DEMO): DCFLAGS=-m$(MODEL)
- $(BINNAME_DEMO): $(OBJECTS_DEMO)
- 	$(if $(wildcard $(SONAME_GTKD)),,$(if $(wildcard $(LIBNAME_GTKD)),,$(MAKE) $(LIBNAME_GTKD)))
- 	$(if $(wildcard $(SONAME_GTKD)),$(eval LDFLAGS+= $(LINKERFLAG)-rpath=./))
diff --git a/gtkd.spec b/gtkd.spec
index 6eff203..dbe2792 100644
--- a/gtkd.spec
+++ b/gtkd.spec
@@ -1,19 +1,17 @@
 # debug info seem not works with D compiler
 %global     debug_package   %{nil}
 %global     gtkd_major 0
-%global     gtkd_minor 3
+%global     gtkd_minor 4
 %global     gtkd_bump  0
 
 Name:           gtkd
-Version:        3.3.1
-Release:        4%{?dist}
+Version:        3.4.0
+Release:        1%{?dist}
 Summary:        D binding and OO wrapper of GTK+
 
 License:        LGPLv3+ with exceptions
 URL:            https://github.com/gtkd-developers/GtkD/
 Source0:        https://github.com/gtkd-developers/GtkD/archive/v%{version}/%{name}-%{version}.tar.gz
-# Fix the build on secondary arches
-Patch0:         gtkd-fix-secondary-arches.patch
 
 ExclusiveArch:  %{ldc_arches}
 
@@ -61,7 +59,6 @@ Active l'autocompletion pour pour la bibliothèque gtkd dans geany (IDE)
 
 %prep
 %setup -q -n GtkD-%{version}
-%patch0 -p1
 
 # temp geany config directory for allow geany to generate tags
 mkdir geany_config
@@ -104,15 +101,18 @@ install -m0644 gtkd.d.tags %{buildroot}/%{_datadir}/geany/tags/
 %{_libdir}/libgtkdgl-3.so
 %{_libdir}/libgtkdsv-3.so
 %{_libdir}/libvted-3.so
-%{_datadir}/pkgconfig/gtkd-3.pc
-%{_datadir}/pkgconfig/gtkdgl-3.pc
-%{_datadir}/pkgconfig/gtkdsv-3.pc
-%{_datadir}/pkgconfig/vted-3.pc
+%{_libdir}/pkgconfig/gtkd-3.pc
+%{_libdir}/pkgconfig/gtkdgl-3.pc
+%{_libdir}/pkgconfig/gtkdsv-3.pc
+%{_libdir}/pkgconfig/vted-3.pc
 
 %files geany-tags
 %{_datadir}/geany/tags/gtkd.d.tags
 
 %changelog
+* Thu Dec 29 2016 Kalev Lember <klember@redhat.com> - 3.4.0-1
+- Update to 3.4.0
+
 * Wed Nov 30 2016 Kalev Lember <klember@redhat.com> - 3.3.1-4
 - Rebuilt for new ldc compiler
 
diff --git a/sources b/sources
index ac44697..f674c7a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ddf5476d978871f90009c432e264104f  gtkd-3.3.1.tar.gz
+SHA512 (gtkd-3.4.0.tar.gz) = dc2e806c84a91970e92026261e6855ac1a8bfa7c6a779da2e70be106722baa4d2ba94b24c26ac92401e02b6cca0fa5bb9a1266ee5f2604e8136978069d5e3eba