jgu pushed to xpra (f21). "Update to 0.14.24 (..more)"

[notifications at fedoraproject.org]

From 2b4af443e9208db19461cecbda7b39795484a23d Mon Sep 17 00:00:00 2001
From: Jonathan Underwood <jonathan.underwood at gmail.com>
Date: Wed, 27 May 2015 19:39:04 +0100
Subject: Update to 0.14.24 Remove Requires for xorg-x11-server-Xvfb Remove
 upstreamed appdata patch


diff --git a/xpra-0.14.22-appdata.patch b/xpra-0.14.22-appdata.patch
deleted file mode 100644
index 0d81355..0000000
--- a/xpra-0.14.22-appdata.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -up xpra-0.14.22/xdg/xpra.appdata.xml.orig xpra-0.14.22/xdg/xpra.appdata.xml
---- xpra-0.14.22/xdg/xpra.appdata.xml.orig	2015-04-02 10:05:47.000000000 +0100
-+++ xpra-0.14.22/xdg/xpra.appdata.xml	2015-04-28 12:02:59.593511678 +0100
-@@ -5,14 +5,27 @@
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-2.0+</project_license>
-  <name>Xpra</name>
-- <summary>Screen for X11</summary>
-+ <summary>A persistent remote display server and client for X11</summary>
-  <description>
-   <p>
--   Xpra gives you "persistent remote applications" for X11.
-+   Xpra is a persistent remote display server and client for X11
-+   applications and desktops.
-   </p>
-   <p>
--   Xpra allows you to forward applications or full desktops to remote clients,
--   including sound, clipboard, printing, etc
-+    Xpra is "screen for X": it allows you to run X programs, usually
-+    on a remote host, direct their display to your local machine, and
-+    then to disconnect from these programs and reconnect from the same
-+    or another machine, without losing any state. It gives you remote
-+    access to individual applications. Xpra also allows forwarding of
-+    sound, clipboard and printing services.
-+  </p>
-+  <p>
-+    Xpra is "rootless" or "seamless": programs you run under it show
-+    up on your desktop as regular programs, managed by your regular
-+    window manager.  Sessions can be accessed over SSH, or password
-+    protected over plain TCP sockets.  Xpra is usable over reasonably
-+    slow links and does its best to adapt to changing network
-+    bandwidth constraints.
-   </p>
-  </description>
-  <screenshots>
diff --git a/xpra.spec b/xpra.spec
index 61472f0..e1d2574 100644
--- a/xpra.spec
+++ b/xpra.spec
@@ -21,8 +21,8 @@
 %global __provides_exclude_from ^%{python_sitearch}/.*\\.so$
 
 Name:           xpra
-Version:        0.14.22
-Release:        5%{?dist}
+Version:        0.14.24
+Release:        1%{?dist}
 Summary:        Remote display server for applications and desktops
 
 License:        GPLv2+ and BSD and LGPLv3+ and MIT
@@ -37,10 +37,6 @@ Patch1:         %{name}-unbundle-rencode.patch
 # http://xpra.org/trac/ticket/843
 # https://bugzilla.redhat.com/show_bug.cgi?id=1215527
 Patch2:         xpra-0.14-stop-using-void-driver.patch
-# This patch fixes up the paragraphs to end with a period so the
-# validation doesn't bail. It also expands the text to be more
-# helpful - will be included in 0.14.24.
-Patch3:         xpra-0.14.22-appdata.patch
 # This patch fixes:
 # https://bugzilla.redhat.com/show_bug.cgi?id=1224678
 # https://www.xpra.org/trac/ticket/872
@@ -63,7 +59,7 @@ BuildRequires:  ffmpeg-devel
 
 Requires:       python-imaging
 Requires:       dbus-python
-Requires:       xorg-x11-server-utils xorg-x11-server-Xvfb
+Requires:       xorg-x11-server-utils
 Requires:       xorg-x11-drv-dummy
 Requires:       PyOpenGL pygtkglext
 Requires:       python-numeric numpy
@@ -99,7 +95,6 @@ network bandwidth constraints.
 %setup -q
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %patch4 -p1
 
 #use the system python-rencode
@@ -209,6 +204,11 @@ fi
 
 
 %changelog
+* Wed May 27 2015 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.14.24-1
+- Update to 0.14.24
+- Remove Requires for xorg-x11-server-Xvfb
+- Remove upstreamed appdata patch
+
 * Tue May 26 2015 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.14.22-5
 - Add patch to correctly locate Xorg binary in Fedora 22 onwards (BZ 1224678)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/xpra.git/commit/?h=f21&id=2b4af443e9208db19461cecbda7b39795484a23d