[nvidia-kmod] Add epoch to kmod-nvidia-newest obsolete version
by Leigh Scott
commit 8a8dce42e890a9cc4a7080ca8482365129c5e8da
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue May 9 22:05:15 2017 +0100
Add epoch to kmod-nvidia-newest obsolete version
nvidia-kmod.spec | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index fbdc943..116170e 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -10,7 +10,7 @@ Name: nvidia-kmod
Epoch: 2
Version: 375.66
# Taken over by kmodtool
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -30,7 +30,7 @@ BuildRequires: %{AkmodsBuildRequires}
%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
# kmodtool does its magic here
-%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} --obsolete-name nvidia-newest --obsolete-version "%{version}" %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
+%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} --obsolete-name nvidia-newest --obsolete-version "%{?epoch}:%{version}" %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
%description
The nvidia %{version} display driver kernel module for kernel %{kversion}.
@@ -39,7 +39,7 @@ The nvidia %{version} display driver kernel module for kernel %{kversion}.
# error out if there was something wrong with kmodtool
%{?kmodtool_check}
# print kmodtool output for debugging purposes:
-kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} --obsolete-name nvidia-newest --obsolete-version "%{version}" %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
+kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} --obsolete-name nvidia-newest --obsolete-version "%{?epoch}:%{version}" %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
%setup -T -c
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}-%{_target_cpu}.tar.xz
# patch loop
@@ -73,6 +73,9 @@ done
%changelog
+* Tue May 09 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:375.66-2
+- Add epoch to kmod-nvidia-newest obsolete version
+
* Fri May 05 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:375.66-1
- Update to 375.66 release
7 years
[xpra-codecs-freeworld] Update to 2.0.2
by Antonio
commit c856b35e76eb9cce80ee14ccd9b5449e4edff5c8
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Tue May 9 19:47:42 2017 +0200
Update to 2.0.2
.gitignore | 1 +
sources | 2 +-
xpra-codecs-freeworld-xvid.patch | 20 --------------------
xpra-codecs-freeworld.spec | 29 ++++++++---------------------
4 files changed, 10 insertions(+), 42 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 168345a..d74379d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ xpra-0.16.3.tar.xz
/xpra-0.17.4.tar.xz
/xpra-0.17.5.tar.xz
/xpra-1.0.2.tar.xz
+/xpra-2.0.2.tar.xz
diff --git a/sources b/sources
index 2e46376..9adbbd7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b9c8fe1c7d9f665adf029fec8c16cb28 xpra-1.0.2.tar.xz
+3d4c418f2c208403694ba5b47e144a71 xpra-2.0.2.tar.xz
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index 4d1c86c..387ce94 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -1,7 +1,6 @@
%bcond_without enc_x264
%bcond_without dec_avcodec2
%bcond_without csc_swscale
-%bcond_without webp
# These are nececessary as the _with_foo is *not* defined if the
# --with flag isn't specifed, and we need to have the --without
@@ -18,22 +17,15 @@
%define _with_csc_swscale --without-csc_swscale
%endif
-%if %{with webp}
-%define _with_webp --with-webp
-%endif
-
Name: xpra-codecs-freeworld
-Version: 1.0.2
-Release: 2%{?dist}
+Version: 2.0.2
+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
-## Set directory path of xvid's header file
-Patch0: %{name}-xvid.patch
-
BuildRequires: python2-devel pygobject2-devel pygtk2-devel
BuildRequires: libXtst-devel
BuildRequires: libxkbfile-devel, libvpx-devel
@@ -41,10 +33,6 @@ BuildRequires: xvidcore-devel, x265-devel
BuildRequires: Cython
BuildRequires: libwebp-devel
-%if %{with webp}
-BuildRequires: libwebp-devel
-%endif
-
%if %{with enc_x264}
BuildRequires: x264-devel
%endif
@@ -61,12 +49,9 @@ x264 and ffmpeg.
%prep
%setup -q -n xpra-%{version}
-%patch0 -p0
%build
CFLAGS="%{optflags}" %{__python2} setup.py build --executable="%{__python2} -s" \
- --with-enc_xvid \
- %{?_with_webp} \
%{?_with_enc_x264} \
%{?_with_dec_avcodec2} \
%{?_with_csc_swscale} \
@@ -92,10 +77,7 @@ cp -pr \
%if %{with enc_x264}
enc_x264 \
%endif
-%if %{with webp}
- webp \
-%endif
- libav_common enc_ffmpeg enc_xvid enc_x265 %{buildroot}%{python2_sitearch}/xpra/codecs/
+ libav_common enc_ffmpeg enc_x265 %{buildroot}%{python2_sitearch}/xpra/codecs/
popd
#drop shebangs from python_sitearch
@@ -114,6 +96,11 @@ find %{buildroot}%{python2_sitearch}/xpra -name '*.so' \
%license COPYING
%changelog
+* Tue May 09 2017 Antonio Trande <sagitter(a)fedoraproject.org.com> - 2.0.2-1
+- Update to 2.0.2
+- webp option deprecated
+- xvid option deprecated
+
* Sat Apr 29 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0.2-2
- Rebuild for ffmpeg update
7 years
[xpra-codecs-freeworld/f25] Revert "- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild"
by Leigh Scott
commit 07f4376badcf0fb05e316fa964a465b5189597df
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue May 9 07:56:08 2017 +0100
Revert "- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild"
This reverts commit 435ef11ebadd6b4ae22b0cfc0b740dca08d602fe.
xpra-codecs-freeworld.spec | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
---
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index b22e8ab..e14b191 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -1,6 +1,6 @@
Name: xpra-codecs-freeworld
Version: 0.17.5
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: Additional codecs for xpra using x264 and ffmpeg
License: GPLv2+
@@ -58,9 +58,6 @@ find %{buildroot}%{python_sitearch}/xpra -name '*.so' \
%license COPYING
%changelog
-* Tue Mar 21 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 0.17.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
* 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
7 years
[xpra-codecs-freeworld/f25] Revert "Update to 1.0.2"
by Leigh Scott
commit d29cf2d4291f7bac6818198988fc4752df93b94e
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue May 9 07:56:06 2017 +0100
Revert "Update to 1.0.2"
This reverts commit 6f18974c08a6acd230c72c7a5a96cc491bfd3533.
.gitignore | 1 -
sources | 2 +-
xpra-codecs-freeworld-xvid.patch | 20 --------
xpra-codecs-freeworld.spec | 106 +++++++++------------------------------
4 files changed, 24 insertions(+), 105 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 168345a..fc62ef4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,3 @@ xpra-0.15.10.tar.xz
xpra-0.16.3.tar.xz
/xpra-0.17.4.tar.xz
/xpra-0.17.5.tar.xz
-/xpra-1.0.2.tar.xz
diff --git a/sources b/sources
index 2e46376..e38f504 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b9c8fe1c7d9f665adf029fec8c16cb28 xpra-1.0.2.tar.xz
+9ec20dae64cee8dbc70e6d5dbae0ab4a xpra-0.17.5.tar.xz
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index 6e74590..b22e8ab 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -1,59 +1,23 @@
-%bcond_without enc_x264
-%bcond_without dec_avcodec2
-%bcond_without csc_swscale
-%bcond_without webp
-
-# These are nececessary as the _with_foo is *not* defined if the
-# --with flag isn't specifed, and we need to have the --without
-# specified option in that case.
-%if %{without enc_x264}
-%define _with_enc_x264 --without-enc_x264
-%endif
-
-%if %{without dec_avcodec2}
-%define _with_dec_avcodec2 --without-dec_avcodec2
-%endif
-
-%if %{without csc_swscale}
-%define _with_csc_swscale --without-csc_swscale
-%endif
-
-%if %{with webp}
-%define _with_webp --with-webp
-%endif
-
Name: xpra-codecs-freeworld
-Version: 1.0.2
-Release: 1%{?dist}
+Version: 0.17.5
+Release: 2%{?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
-## Set directory path of xvid's header file
-Patch0: %{name}-xvid.patch
-
BuildRequires: python2-devel pygobject2-devel pygtk2-devel
BuildRequires: libXtst-devel
-BuildRequires: libxkbfile-devel, libvpx-devel
-BuildRequires: xvidcore-devel, x265-devel
+BuildRequires: libxkbfile-devel
BuildRequires: Cython
+BuildRequires: desktop-file-utils
BuildRequires: libwebp-devel
-
-%if %{with webp}
-BuildRequires: libwebp-devel
-%endif
-
-%if %{with enc_x264}
BuildRequires: x264-devel
-%endif
-%if %{with dec_avcodec2} || %{without csc_swscale}
BuildRequires: ffmpeg-devel
-%endif
-Requires: xpra%{?isa} = %{version}
-Requires: gstreamer1-plugins-ugly%{?isa}
+Requires: xpra = %{version}
+Requires: gstreamer1-plugins-ugly
%description
Provides support for H.264 encoding and swscale support in xpra using
@@ -61,63 +25,39 @@ x264 and ffmpeg.
%prep
%setup -q -n xpra-%{version}
-%patch0 -p0
+
%build
-CFLAGS="%{optflags}" %{__python2} setup.py build --executable="%{__python2} -s" \
- --with-enc_xvid \
- %{?_with_webp} \
- %{?_with_enc_x264} \
- %{?_with_dec_avcodec2} \
- %{?_with_csc_swscale} \
- --with-Xdummy \
- --with-Xdummy_wrapper \
- --without-html5 \
- --without-tests \
- --with-verbose
+CFLAGS="%{optflags}" %{__python} setup.py build \
+ --with-enc_x264 \
+ --with-dec_avcodec2 \
+ --with-csc_swscale \
+ --with-Xdummy \
+ --with-Xdummy_wrapper
%install
-%{__python2} setup.py install -O1 --skip-build --root destdir
-
-## We are interested to additional codecs only
-mkdir -p %{buildroot}%{python2_sitearch}/xpra/codecs/
-pushd destdir%{python2_sitearch}/xpra/codecs/
-cp -pr \
-%if %{with csc_swscale}
- csc_swscale \
-%endif
-%if %{with dec_avcodec2}
- dec_avcodec2 \
-%endif
-%if %{with enc_x264}
- enc_x264 \
-%endif
-%if %{with webp}
- webp \
-%endif
- libav_common enc_ffmpeg enc_xvid enc_x265 %{buildroot}%{python2_sitearch}/xpra/codecs/
+mkdir destdir
+%{__python} setup.py install --skip-build --root destdir
+
+mkdir -p %{buildroot}%{python_sitearch}/xpra/codecs/
+pushd destdir%{python_sitearch}/xpra/codecs/
+cp -pr csc_swscale dec_avcodec2 enc_x264 libav_common \
+ %{buildroot}%{python_sitearch}/xpra/codecs/
popd
#drop shebangs from python_sitearch
-find %{buildroot}%{python2_sitearch}/xpra -name '*.py' \
+find %{buildroot}%{python_sitearch}/xpra -name '*.py' \
-exec sed -i '1{\@^#!/usr/bin/env python@d}' {} \;
#fix permissions on shared objects
-find %{buildroot}%{python2_sitearch}/xpra -name '*.so' \
+find %{buildroot}%{python_sitearch}/xpra -name '*.so' \
-exec chmod 0755 {} \;
%files
-%dir %{python2_sitearch}/xpra
-%dir %{python2_sitearch}/xpra/codecs
-%{python2_sitearch}/xpra/codecs/*
-%doc README NEWS
+%{python_sitearch}/xpra/codecs/*
%license COPYING
%changelog
-* Thu Apr 20 2017 Antonio Trande <sagitter(a)fedoraproject.org.com> - 1.0.2-1
-- Update to 1.0.2
-- Include x265 and xvid encoders
-
* Tue Mar 21 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 0.17.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
7 years
[xpra-codecs-freeworld/f25] Revert "Fix macro"
by Leigh Scott
commit b9498a4bc4e9bec41bc975fc827111fa8cb987cc
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue May 9 07:56:04 2017 +0100
Revert "Fix macro"
This reverts commit 88719e7402953b20af381ef009c4a491cf2f5816.
xpra-codecs-freeworld.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index fc3c203..6e74590 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -48,7 +48,7 @@ BuildRequires: libwebp-devel
%if %{with enc_x264}
BuildRequires: x264-devel
%endif
-%if %{with dec_avcodec2} || %{with csc_swscale}
+%if %{with dec_avcodec2} || %{without csc_swscale}
BuildRequires: ffmpeg-devel
%endif
7 years
[xpra-codecs-freeworld/f25] Revert "Rebuild for ffmpeg update"
by Leigh Scott
commit 8f79e76ca6463099995362934a7794bfb20cf3e7
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue May 9 07:56:02 2017 +0100
Revert "Rebuild for ffmpeg update"
This reverts commit 9302be4cd343ad9de8f7bf9425697d329e6d63dc.
xpra-codecs-freeworld.spec | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
---
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index 4d1c86c..fc3c203 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -24,7 +24,7 @@
Name: xpra-codecs-freeworld
Version: 1.0.2
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: Additional codecs for xpra using x264 and ffmpeg
License: GPLv2+
@@ -114,9 +114,6 @@ find %{buildroot}%{python2_sitearch}/xpra -name '*.so' \
%license COPYING
%changelog
-* Sat Apr 29 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0.2-2
-- Rebuild for ffmpeg update
-
* Thu Apr 20 2017 Antonio Trande <sagitter(a)fedoraproject.org.com> - 1.0.2-1
- Update to 1.0.2
- Include x265 and xvid encoders
7 years
[xpra-codecs-freeworld/f25] Revert "Update to 1.0 to match fedora version"
by Leigh Scott
commit b54f960d169f1e32529f15546d33a1cfbd9af6d6
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue May 9 07:55:56 2017 +0100
Revert "Update to 1.0 to match fedora version"
This reverts commit 8405fb547fadc41292fa2a4959e66be279094671.
.gitignore | 1 -
sources | 2 +-
xpra-1.0-webp-encode-fix-import.patch | 12 ------------
xpra-codecs-freeworld.spec | 16 +++++++---------
4 files changed, 8 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a99b5fc..168345a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,3 @@ xpra-0.16.3.tar.xz
/xpra-0.17.4.tar.xz
/xpra-0.17.5.tar.xz
/xpra-1.0.2.tar.xz
-/xpra-1.0.tar.xz
diff --git a/sources b/sources
index 04cd3b9..2e46376 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4325abcfe95ede43209a212a13854b3c xpra-1.0.tar.xz
+b9c8fe1c7d9f665adf029fec8c16cb28 xpra-1.0.2.tar.xz
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index 6a7dd80..4d1c86c 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -23,8 +23,8 @@
%endif
Name: xpra-codecs-freeworld
-Version: 1.0
-Release: 1%{?dist}
+Version: 1.0.2
+Release: 2%{?dist}
Summary: Additional codecs for xpra using x264 and ffmpeg
License: GPLv2+
@@ -34,10 +34,6 @@ Source0: http://xpra.org/src/xpra-%{version}.tar.xz
## Set directory path of xvid's header file
Patch0: %{name}-xvid.patch
-# Fix import error in xpra/codecs/webp/encode.pyx
-# https://www.xpra.org/trac/ticket/1379
-Patch1: xpra-1.0-webp-encode-fix-import.patch
-
BuildRequires: python2-devel pygobject2-devel pygtk2-devel
BuildRequires: libXtst-devel
BuildRequires: libxkbfile-devel, libvpx-devel
@@ -66,7 +62,6 @@ x264 and ffmpeg.
%prep
%setup -q -n xpra-%{version}
%patch0 -p0
-%patch1 -p1
%build
CFLAGS="%{optflags}" %{__python2} setup.py build --executable="%{__python2} -s" \
@@ -119,8 +114,11 @@ find %{buildroot}%{python2_sitearch}/xpra -name '*.so' \
%license COPYING
%changelog
-* Tue May 09 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-1
-- Update to 1.0
+* Sat Apr 29 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0.2-2
+- Rebuild for ffmpeg update
+
+* Thu Apr 20 2017 Antonio Trande <sagitter(a)fedoraproject.org.com> - 1.0.2-1
+- Update to 1.0.2
- Include x265 and xvid encoders
* Tue Mar 21 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 0.17.5-2
7 years
[xpra-codecs-freeworld/f25] Update to 1.0 to match fedora version
by Leigh Scott
commit 8405fb547fadc41292fa2a4959e66be279094671
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue May 9 07:24:09 2017 +0100
Update to 1.0 to match fedora version
.gitignore | 1 +
sources | 2 +-
xpra-1.0-webp-encode-fix-import.patch | 12 ++++++++++++
xpra-codecs-freeworld.spec | 16 +++++++++-------
4 files changed, 23 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 168345a..a99b5fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ xpra-0.16.3.tar.xz
/xpra-0.17.4.tar.xz
/xpra-0.17.5.tar.xz
/xpra-1.0.2.tar.xz
+/xpra-1.0.tar.xz
diff --git a/sources b/sources
index 2e46376..04cd3b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b9c8fe1c7d9f665adf029fec8c16cb28 xpra-1.0.2.tar.xz
+4325abcfe95ede43209a212a13854b3c xpra-1.0.tar.xz
diff --git a/xpra-1.0-webp-encode-fix-import.patch b/xpra-1.0-webp-encode-fix-import.patch
new file mode 100644
index 0000000..d57473e
--- /dev/null
+++ b/xpra-1.0-webp-encode-fix-import.patch
@@ -0,0 +1,12 @@
+diff -up xpra-1.0/xpra/codecs/webp/encode.pyx.orig xpra-1.0/xpra/codecs/webp/encode.pyx
+--- xpra-1.0/xpra/codecs/webp/encode.pyx.orig 2016-12-06 10:56:27.000000000 +0000
++++ xpra-1.0/xpra/codecs/webp/encode.pyx 2016-12-10 11:13:14.305360914 +0000
+@@ -8,7 +8,7 @@ import os
+ from xpra.log import Logger
+ log = Logger("encoder", "webp")
+
+-from xpra.util envbool
++from xpra.util import envbool
+ cdef int LOG_CONFIG = envbool("XPRA_WEBP_LOG_CONFIG", False)
+ cdef int USE_THREADS = envbool("XPRA_WEBP_THREADING", True)
+
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index 4d1c86c..6a7dd80 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -23,8 +23,8 @@
%endif
Name: xpra-codecs-freeworld
-Version: 1.0.2
-Release: 2%{?dist}
+Version: 1.0
+Release: 1%{?dist}
Summary: Additional codecs for xpra using x264 and ffmpeg
License: GPLv2+
@@ -34,6 +34,10 @@ Source0: http://xpra.org/src/xpra-%{version}.tar.xz
## Set directory path of xvid's header file
Patch0: %{name}-xvid.patch
+# Fix import error in xpra/codecs/webp/encode.pyx
+# https://www.xpra.org/trac/ticket/1379
+Patch1: xpra-1.0-webp-encode-fix-import.patch
+
BuildRequires: python2-devel pygobject2-devel pygtk2-devel
BuildRequires: libXtst-devel
BuildRequires: libxkbfile-devel, libvpx-devel
@@ -62,6 +66,7 @@ x264 and ffmpeg.
%prep
%setup -q -n xpra-%{version}
%patch0 -p0
+%patch1 -p1
%build
CFLAGS="%{optflags}" %{__python2} setup.py build --executable="%{__python2} -s" \
@@ -114,11 +119,8 @@ find %{buildroot}%{python2_sitearch}/xpra -name '*.so' \
%license COPYING
%changelog
-* Sat Apr 29 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0.2-2
-- Rebuild for ffmpeg update
-
-* Thu Apr 20 2017 Antonio Trande <sagitter(a)fedoraproject.org.com> - 1.0.2-1
-- Update to 1.0.2
+* Tue May 09 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-1
+- Update to 1.0
- Include x265 and xvid encoders
* Tue Mar 21 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 0.17.5-2
7 years
