Re: [xpra-codecs-freeworld/f25] Update to 1.0 to match fedora version

commit 8405fb547fadc41292fa2a4959e66be279094671 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; 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&gt; - 1.0.2-2 -- Rebuild for ffmpeg update - -* Thu Apr 20 2017 Antonio Trande <sagitter(a)fedoraproject.org.com&gt; - 1.0.2-1 -- Update to 1.0.2 +* Tue May 09 2017 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1.0-1 +- Update to 1.0  - Include x265 and xvid encoders    * Tue Mar 21 2017 RPM Fusion Release Engineering <kwizart@rpmfusion. org> - 0.17.5-2 _______________________________________________ rpmfusion-commits mailing list -- rpmfusion-commits(a)lists.rpmfusion.o rg To unsubscribe send an email to rpmfusion-commits-leave(a)lists.rpmfusi on.org