From 54053bee4c5847ad07401347f441d6bbc0f909a81d03fb0c8ce45c3bd0c40388 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Tue, 21 Feb 2017 08:30:45 +0000
Subject: [PATCH] Accepting request 459441 from
 home:olh:branches:multimedia:apps

- Require wxWidgets 3+ unconditional
  remove obsolete aegisub-old_wc.patch

OBS-URL: https://build.opensuse.org/request/show/459441
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=35
---
 aegisub-old_wc.patch | 12 ------------
 aegisub.changes      |  6 ++++++
 aegisub.spec         |  8 --------
 3 files changed, 6 insertions(+), 20 deletions(-)
 delete mode 100644 aegisub-old_wc.patch

diff --git a/aegisub-old_wc.patch b/aegisub-old_wc.patch
deleted file mode 100644
index 74e5884..0000000
--- a/aegisub-old_wc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rupN aegisub-3.2.0.old/configure.ac aegisub-3.2.0/configure.ac
---- aegisub-3.2.0.old/configure.ac	2014-07-28 07:29:16.000000000 -0700
-+++ aegisub-3.2.0/configure.ac	2014-08-07 10:57:53.991229983 -0700
-@@ -15,7 +15,7 @@ m4_define([libass_required_version], [0.
- m4_define([libpulse_required_version], [0.5])
- m4_define([pkgconfig_required_version], [0.20])
- m4_define([portaudio_required_version], [19])
--m4_define([wx_required_version], [3.0.0])
-+m4_define([wx_required_version], [2.9.5])
- 
- #######
- # Setup
diff --git a/aegisub.changes b/aegisub.changes
index 0025180..c243675 100644
--- a/aegisub.changes
+++ b/aegisub.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Feb 21 08:20:44 UTC 2017 - olaf@aepfle.de
+
+- Require wxWidgets 3+ unconditional
+  remove obsolete aegisub-old_wc.patch
+
 -------------------------------------------------------------------
 Wed Feb  1 09:52:26 UTC 2017 - adam.majer@suse.de
 
diff --git a/aegisub.spec b/aegisub.spec
index 7fd7a39..67da131 100644
--- a/aegisub.spec
+++ b/aegisub.spec
@@ -26,7 +26,6 @@ License:        BSD-3-Clause
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 Url:            http://www.aegisub.net/
 Source0:        http://ftp.aegisub.org/pub/releases/aegisub-%{version}.tar.xz
-Patch0:         aegisub-old_wc.patch
 Patch1:         Makefile.inc.in.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -41,13 +40,7 @@ BuildRequires:  boost-devel >= 1.50.0
 BuildRequires:  gcc-c++
 BuildRequires:  intltool
 BuildRequires:  pkg-config >= 0.20
-%if 0%{?suse_version} >= 1320
 BuildRequires:  wxWidgets-devel >= 3
-%else
-%define _use_internal_dependency_generator 0
-%define __find_requires %wx_requires
-BuildRequires:  wxWidgets-devel >= 2.9.5
-%endif
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(fftw3) >= 3.3
 BuildRequires:  pkgconfig(fontconfig) >= 2.4
@@ -73,7 +66,6 @@ functions with ease.
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
 sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/version.cpp