From c17319689c28798d013e0a1df0504c3d0319eb9d6c6c5fd827a5b6a65a369506 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Fri, 29 Sep 2017 12:16:32 +0000 Subject: [PATCH] - Remove conditionals for ffms2 and boost OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=43 --- aegisub.changes | 5 +++++ aegisub.spec | 19 ++++++------------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/aegisub.changes b/aegisub.changes index bfcc790..177cc5c 100644 --- a/aegisub.changes +++ b/aegisub.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 29 12:15:01 UTC 2017 - olaf@aepfle.de + +- Remove conditionals for ffms2 and boost + ------------------------------------------------------------------- Mon Jun 19 10:43:28 UTC 2017 - rpm@fthiessen.de diff --git a/aegisub.spec b/aegisub.spec index 216bd79..de7c6d3 100644 --- a/aegisub.spec +++ b/aegisub.spec @@ -16,7 +16,6 @@ # -%bcond_with ffms2 Name: aegisub Version: 3.2.2 Release: 0 @@ -36,10 +35,14 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: intltool +BuildRequires: libboost_filesystem-devel +BuildRequires: libboost_locale-devel +BuildRequires: libboost_regex-devel +BuildRequires: libboost_thread-devel BuildRequires: lua51 BuildRequires: pkgconfig >= 0.20 -BuildRequires: wxWidgets-devel >= 3 BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(ffms2) BuildRequires: pkgconfig(fftw3) >= 3.3 BuildRequires: pkgconfig(fontconfig) >= 2.4 BuildRequires: pkgconfig(gl) @@ -48,18 +51,8 @@ BuildRequires: pkgconfig(libass) BuildRequires: pkgconfig(libpulse) >= 0.5 BuildRequires: pkgconfig(luajit) BuildRequires: pkgconfig(zlib) +BuildRequires: wxWidgets-devel >= 3 ExcludeArch: ppc ppc64 ppc64le -%if 0%{?suse_version} > 1325 -BuildRequires: libboost_filesystem-devel -BuildRequires: libboost_locale-devel -BuildRequires: libboost_regex-devel -BuildRequires: libboost_thread-devel -%else -BuildRequires: boost-devel >= 1.50.0 -%endif -%if %{with ffms2} -BuildRequires: pkgconfig(ffms2) -%endif %description Aegisub is an advanced subtitle editor for Windows, and UNIX-like systems, such