[gwenview] drop libjpeg-turbo workaround
Rex Dieter
rdieter at fedoraproject.org
Wed Nov 26 14:01:10 UTC 2014
commit af2e01c798288e021a2c81afd0a3771a4168ac45
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Wed Nov 26 08:01:07 2014 -0600
drop libjpeg-turbo workaround
gwenview-4.14.3-libjpeg_turbo_macros.patch | 32 ----------------------------
gwenview.spec | 9 +++----
2 files changed, 4 insertions(+), 37 deletions(-)
---
diff --git a/gwenview.spec b/gwenview.spec
index 75599ac..b4552b2 100644
--- a/gwenview.spec
+++ b/gwenview.spec
@@ -1,7 +1,7 @@
Name: gwenview
Summary: An image viewer
Version: 4.14.3
-Release: 2%{?dist}
+Release: 3%{?dist}
# app: GPLv2+
# lib: IJG and (LGPLv2 or LGPLv3 or LGPLv3+ (KDE e.V.)) and LGPLv2+ and GPLv2+
@@ -17,8 +17,6 @@ Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar
Source1: gwenview.appdata.xml
## upstreamable patches
-# FTBFS against newer libjpeg-turbo (which no longer defines some macros)
-Patch1: gwenview-4.14.3-libjpeg_turbo_macros.patch
BuildRequires: baloo-devel >= %{version}
BuildRequires: desktop-file-utils
@@ -58,8 +56,6 @@ Requires: %{name} = %{version}-%{release}
%prep
%setup -q
-%patch1 -p1 -b .libjpeg_turbo_macros
-
%build
mkdir -p %{_target_platform}
@@ -126,6 +122,9 @@ fi
%changelog
+* Wed Nov 26 2014 Rex Dieter <rdieter at fedoraproject.org> 4.14.3-3
+- drop libjpeg-turbo workaround
+
* Mon Nov 17 2014 Rex Dieter <rdieter at fedoraproject.org> - 4.14.3-2
- fix/workaround FTBFS against new libjpeg-turbo (#1163476)
- use %%find_lang
More information about the scm-commits
mailing list