From 2f9897b0e3b7fddae641077aeeb8c51b34c700fc0acfa54dd41427c7eb0183c1 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Sun, 12 Feb 2012 22:35:46 +0000 Subject: [PATCH] - update to version 4.8.3 - link to gmodule - translation updates - dropped obsolete xfce4-session-fix-libgmodule-underlinking.patch OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=85 --- xfce4-session-4.8.2.tar.bz2 | 3 -- xfce4-session-4.8.3.tar.bz2 | 3 ++ ...-session-fix-libgmodule-underlinking.patch | 54 ------------------- xfce4-session.changes | 8 +++ xfce4-session.spec | 9 +--- 5 files changed, 12 insertions(+), 65 deletions(-) delete mode 100644 xfce4-session-4.8.2.tar.bz2 create mode 100644 xfce4-session-4.8.3.tar.bz2 delete mode 100644 xfce4-session-fix-libgmodule-underlinking.patch diff --git a/xfce4-session-4.8.2.tar.bz2 b/xfce4-session-4.8.2.tar.bz2 deleted file mode 100644 index 153426e..0000000 --- a/xfce4-session-4.8.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31bca2a559e05a8a859f150394a901517e5842414ef171a85c5da234e344c0d0 -size 1607774 diff --git a/xfce4-session-4.8.3.tar.bz2 b/xfce4-session-4.8.3.tar.bz2 new file mode 100644 index 0000000..6823adc --- /dev/null +++ b/xfce4-session-4.8.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f0801b8c0ffa7e5d41b29b8df281ac127adf467bf50e8ded8aebe5a02bd99338 +size 1594643 diff --git a/xfce4-session-fix-libgmodule-underlinking.patch b/xfce4-session-fix-libgmodule-underlinking.patch deleted file mode 100644 index 833054b..0000000 --- a/xfce4-session-fix-libgmodule-underlinking.patch +++ /dev/null @@ -1,54 +0,0 @@ -Index: xfce4-session-4.8.2/configure.in -=================================================================== ---- xfce4-session-4.8.2.orig/configure.in -+++ xfce4-session-4.8.2/configure.in -@@ -82,6 +82,7 @@ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2. - XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.22]) - XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.0.0]) - XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.73]) -+XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], []) - XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.8.0]) - - dnl we provide a panel plugin now -Index: xfce4-session-4.8.2/settings/Makefile.am -=================================================================== ---- xfce4-session-4.8.2.orig/settings/Makefile.am -+++ xfce4-session-4.8.2/settings/Makefile.am -@@ -25,6 +25,7 @@ xfce4_session_settings_CFLAGS = \ - -DMODULESDIR=\"$(libdir)/xfce4/session/splash-engines\" \ - -DG_LOG_DOMAIN=\"xfce4-session-settings\" \ - -I$(top_srcdir) \ -+ $(GMODULE_CFLAGS) \ - $(LIBXFCE4UTIL_CFLAGS) \ - $(LIBXFCE4UI_CFLAGS) \ - $(XFCONF_CFLAGS) \ -@@ -32,7 +33,8 @@ xfce4_session_settings_CFLAGS = \ - - xfce4_session_settings_LDADD = \ - $(top_builddir)/libxfsm/libxfsm-4.6.la \ -- $(LIBXFCE4UTIL_CFLAGS) \ -+ $(GMODULE_LIBS) \ -+ $(LIBXFCE4UTIL_LIBS) \ - $(LIBXFCE4UI_LIBS) \ - $(XFCONF_LIBS) \ - $(DBUS_GLIB_LIBS) -Index: xfce4-session-4.8.2/xfce4-session/Makefile.am -=================================================================== ---- xfce4-session-4.8.2.orig/xfce4-session/Makefile.am -+++ xfce4-session-4.8.2/xfce4-session/Makefile.am -@@ -51,6 +51,7 @@ xfce4_session_SOURCES = \ - xfsm-startup.h - - xfce4_session_CFLAGS = \ -+ $(GMODULE_CFLAGS) \ - $(GNOME_CFLAGS) \ - $(GNOME_KEYRING_CFLAGS) \ - $(LIBSM_CFLAGS) \ -@@ -69,6 +70,7 @@ xfce4_session_CFLAGS = \ - - xfce4_session_LDADD = \ - $(top_builddir)/libxfsm/libxfsm-4.6.la \ -+ $(GMODULE_LIBS) \ - $(LIBSM_LDFLAGS) \ - $(LIBSM_LIBS) \ - $(LIBX11_LDFLAGS) \ diff --git a/xfce4-session.changes b/xfce4-session.changes index 6f69381..a050892 100644 --- a/xfce4-session.changes +++ b/xfce4-session.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Feb 12 20:27:03 UTC 2012 - gber@opensuse.org + +- update to version 4.8.3 + - link to gmodule + - translation updates +- dropped obsolete xfce4-session-fix-libgmodule-underlinking.patch + ------------------------------------------------------------------- Fri Jan 13 17:04:56 UTC 2012 - gber@opensuse.org diff --git a/xfce4-session.spec b/xfce4-session.spec index 39865a7..794c3b2 100644 --- a/xfce4-session.spec +++ b/xfce4-session.spec @@ -17,7 +17,7 @@ Name: xfce4-session -Version: 4.8.2 +Version: 4.8.3 Release: 0 Summary: Xfce Session Manager License: GPL-2.0+ @@ -30,8 +30,6 @@ Patch0: xfce4-session-simple-splash-remove-shadows.patch Patch1: xfce4-session-fix-gnome-mode.patch # PATCH-FEATURE-UPSTREAM xfce4-session-lock-screen-on-suspend-hibernate.patch bxo#6019 gber@opensuse.org -- Try to lock the screen when hibernating/suspending Patch2: xfce4-session-lock-screen-on-suspend-hibernate.patch -# PATCH-FEATURE-UPSTREAM xfce4-session-fix-libgmodule-underlinking.patch bxo#8340 gber@opensuse.org -- Link explicitly against libgmodule -Patch3: xfce4-session-fix-libgmodule-underlinking.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook_4 BuildRequires: intltool @@ -94,7 +92,6 @@ This package provides the upstream look and feel for the Xfce Session Manager. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build xdt-autogen @@ -122,17 +119,13 @@ rm -rf %{buildroot} %post %run_suseconfig -m gtk2 /sbin/ldconfig -%if 0%{?suse_version} >= 1140 %desktop_database_post %icon_theme_cache_post -%endif %postun /sbin/ldconfig -%if 0%{?suse_version} >= 1140 %desktop_database_postun %icon_theme_cache_postun -%endif %files -f %{name}.lang %defattr(-,root,root)