commit 40ea12cf5b690ce5d6e513f205ad16288dffbd5c
Author: Jonathan Underwood <jonathan.underwood(a)gmail.com>
Date: Sun Sep 11 13:24:37 2016 +0100
Update to 0.17.5
- Remove xpra-0.17.x-12944.patch
.gitignore | 1 +
sources | 2 +-
xpra-0.17.x-12944.patch | 10 ----------
xpra-codecs-freeworld.spec | 17 +++++++----------
4 files changed, 9 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 710e5b7..fc62ef4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ xpra-0.14.21.tar.xz
xpra-0.15.10.tar.xz
xpra-0.16.3.tar.xz
/xpra-0.17.4.tar.xz
+/xpra-0.17.5.tar.xz
diff --git a/sources b/sources
index 2ad7832..e38f504 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b8d028fe85245500bb3bfa041e04636f xpra-0.17.4.tar.xz
+9ec20dae64cee8dbc70e6d5dbae0ab4a xpra-0.17.5.tar.xz
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index b83d8f8..e14b191 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -1,19 +1,12 @@
Name: xpra-codecs-freeworld
-Version: 0.17.4
-Release: 2%{?dist}
+Version: 0.17.5
+Release: 1%{?dist}
Summary: Additional codecs for xpra using x264 and ffmpeg
License: GPLv2+
URL:
http://www.xpra.org/
Source0:
http://xpra.org/src/xpra-%{version}.tar.xz
-# Fix build failure due to deprecated avcodec_decode_video2 in recent ffmpeg
-# See:
https://www.xpra.org/trac/changeset/12944/xpra
-# And:
https://xpra.org/trac/changeset/12943/xpra
-# 12943 doesn't apply cleanly, so for now we'll just use 12944
-# Can be dropped in 0.17.5
-Patch0: xpra-0.17.x-12944.patch
-
BuildRequires: python2-devel pygobject2-devel pygtk2-devel
BuildRequires: libXtst-devel
BuildRequires: libxkbfile-devel
@@ -32,7 +25,7 @@ x264 and ffmpeg.
%prep
%setup -q -n xpra-%{version}
-%patch0 -p4
+
%build
CFLAGS="%{optflags}" %{__python} setup.py build \
@@ -65,6 +58,10 @@ find %{buildroot}%{python_sitearch}/xpra -name '*.so' \
%license COPYING
%changelog
+* Sun Sep 11 2016 Jonathan Underwood <jonathan.underwood(a)gmail.com> - 0.17.5-1
+- Update to 0.17.5
+- Remove xpra-0.17.x-12944.patch
+
* Sun Jul 31 2016 Jonathan Underwood <jonathan.underwood(a)gmail.com> - 0.17.4-2
- Add xpra-0.17.x-12944.patch to fix build failure with latest ffmpeg
- Fix bogus changelog date in spec file