[libxfcegui4] Add libxfcegui4-4.10.0-no-xfce_setenv.patch (RHBZ#1197984).

corsepiu corsepiu at fedoraproject.org
Tue Mar 3 11:31:47 UTC 2015


commit 796136ad838a2dbef4b75a982c8528c723764553
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Tue Mar 3 08:22:25 2015 +0100

    Add libxfcegui4-4.10.0-no-xfce_setenv.patch (RHBZ#1197984).
    
    - Fix bogus %changelog entries.

 libxfcegui4-4.10.0-no-xfce_setenv.patch | 14 ++++++++++++++
 libxfcegui4.spec                        | 14 +++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)
---
diff --git a/libxfcegui4-4.10.0-no-xfce_setenv.patch b/libxfcegui4-4.10.0-no-xfce_setenv.patch
new file mode 100644
index 0000000..ffb2160
--- /dev/null
+++ b/libxfcegui4-4.10.0-no-xfce_setenv.patch
@@ -0,0 +1,14 @@
+http://bugs.gentoo.org/513568
+http://bugzilla.xfce.org/show_bug.cgi?id=10974
+
+--- libxfcegui4/xfce-exec.c
++++ libxfcegui4/xfce-exec.c
+@@ -79,7 +79,7 @@
+ #ifndef G_OS_WIN32
+     gchar *dpyname = user_data;
+     
+-    xfce_setenv ("DISPLAY", dpyname, TRUE);
++    g_setenv ("DISPLAY", dpyname, TRUE);
+ #endif
+ }
+ 
diff --git a/libxfcegui4.spec b/libxfcegui4.spec
index 3ce3c48..3ba7ff9 100644
--- a/libxfcegui4.spec
+++ b/libxfcegui4.spec
@@ -2,7 +2,7 @@
 
 Name:           libxfcegui4
 Version:        4.10.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        GTK widgets for Xfce
 
 Group:          System Environment/Libraries
@@ -10,6 +10,9 @@ License:        LGPLv2+
 URL:            http://www.xfce.org/
 #VCS git:git://git.xfce.org/xfce/libxfcegui4
 Source0:        http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
+
+# From https://bugzilla.xfce.org/show_bug.cgi?id=10974#c6
+Patch0:         libxfcegui4-4.10.0-no-xfce_setenv.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  pkgconfig(gtk+-2.0) >= 2.10.0
@@ -44,6 +47,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
@@ -99,6 +103,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %doc %{_datadir}/gtk-doc
 
 %changelog
+* Tue Mar 03 2015 Ralf Corsépius <corsepiu at fedoraproject.org> - 4.10.0-8
+- Add libxfcegui4-4.10.0-no-xfce_setenv.patch (RHBZ#1197984).
+- Fix bogus %%changelog entries.
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.10.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
@@ -114,7 +122,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.10.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
-* Sat Apr 29 2012 Christoph Wickert <cwickert at fedoraproject.org> - 4.10.0-2
+* Sun Apr 29 2012 Christoph Wickert <cwickert at fedoraproject.org> - 4.10.0-2
 - Fix Dependencies
 
 * Sat Apr 28 2012 Christoph Wickert <cwickert at fedoraproject.org> - 4.10.0-1
@@ -165,7 +173,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 * Wed May 19 2010 Kevin Fenzi <kevin at tummy.com> - 4.6.3-2
 - Rebuild for new glade version. 
 
-* Wed Jan 21 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.3-1
+* Thu Jan 21 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.3-1
 - Update to 4.6.3
 
 * Tue Jan 05 2010 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.2-1


More information about the scm-commits mailing list