forked from pool/xfce4-session
Accepting request 1064405 from X11:xfce
OBS-URL: https://build.opensuse.org/request/show/1064405 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfce4-session?expand=0&rev=87
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
70c713277e
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:38badb500b272012f494543a60a9c0563c381647cc95bed73b68aec0b0b89a7f
|
||||
size 853627
|
||||
3
xfce4-session-4.18.1.tar.bz2
Normal file
3
xfce4-session-4.18.1.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1c5a957eeef259db3e8bbd9bb50c2b120146141e99b17a271e58c40fd825c5cf
|
||||
size 872771
|
||||
@ -1,43 +1,17 @@
|
||||
diff -rub a/scripts/startxfce4.in b/scripts/startxfce4.in
|
||||
--- a/scripts/startxfce4.in 2019-05-13 13:08:40.936637683 +0800
|
||||
+++ b/scripts/startxfce4.in 2019-05-13 13:16:44.378397419 +0800
|
||||
@@ -66,13 +66,22 @@
|
||||
|
||||
if test "x$XDG_DATA_DIRS" = "x"
|
||||
@@ -76,6 +76,10 @@
|
||||
then
|
||||
- if test "x@_datadir_@" = "x/usr/local/share" -o "x@_datadir_@" = "x/usr/share"; then
|
||||
+ if test "x@_datadir_@" = "x/usr/local/share" -o test "x@_datadir_@" = "x/usr/share"; then
|
||||
XDG_DATA_DIRS="/usr/local/share:/usr/share"
|
||||
else
|
||||
XDG_DATA_DIRS="@_datadir_@:/usr/local/share:/usr/share"
|
||||
fi
|
||||
else
|
||||
+ case $XDG_DATA_DIRS in
|
||||
+ *:@_datadir_@:*)
|
||||
+ ;;
|
||||
+ *)
|
||||
XDG_DATA_DIRS="$XDG_DATA_DIRS:@_datadir_@"
|
||||
+ esac
|
||||
+fi
|
||||
fi
|
||||
+if test -d "@_datadir_@/xfce"
|
||||
+then
|
||||
+ XDG_DATA_DIRS="@_datadir_@/xfce:$XDG_DATA_DIRS"
|
||||
fi
|
||||
+ XDG_DATA_DIRS="@_datadir_@/xfce:$XDG_DATA_DIRS"
|
||||
+fi
|
||||
export XDG_DATA_DIRS
|
||||
|
||||
@@ -84,7 +93,12 @@
|
||||
XDG_CONFIG_DIRS="/etc/xdg:@_sysconfdir_@/xdg"
|
||||
fi
|
||||
else
|
||||
+ case $XDG_CONFIG_DIRS in
|
||||
+ *:@_sysconfdir_@/xdg:*)
|
||||
+ ;;
|
||||
+ *)
|
||||
XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:@_sysconfdir_@/xdg"
|
||||
+esac
|
||||
fi
|
||||
export XDG_CONFIG_DIRS
|
||||
|
||||
if test "x$XDG_CONFIG_DIRS" = "x"
|
||||
diff -rub a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in
|
||||
--- a/scripts/xinitrc.in.in 2019-05-13 13:08:40.936637683 +0800
|
||||
+++ b/scripts/xinitrc.in.in 2019-05-13 13:20:51.177252943 +0800
|
||||
|
||||
@ -1,43 +1,17 @@
|
||||
diff -rub a/scripts/startxfce4.in b/scripts/startxfce4.in
|
||||
--- a/scripts/startxfce4.in 2016-05-03 05:02:14.000000000 +0800
|
||||
+++ b/scripts/startxfce4.in 2019-05-20 18:52:01.014092674 +0800
|
||||
@@ -66,13 +66,22 @@
|
||||
|
||||
if test "x$XDG_DATA_DIRS" = "x"
|
||||
@@ -76,6 +76,10 @@
|
||||
then
|
||||
- if test "x@_datadir_@" = "x/usr/local/share" -o "x@_datadir_@" = "x/usr/share"; then
|
||||
+ if test "x@_datadir_@" = "x/usr/local/share" -o test "x@_datadir_@" = "x/usr/share"; then
|
||||
XDG_DATA_DIRS="/usr/local/share:/usr/share"
|
||||
else
|
||||
XDG_DATA_DIRS="@_datadir_@:/usr/local/share:/usr/share"
|
||||
fi
|
||||
else
|
||||
+ case $XDG_DATA_DIRS in
|
||||
+ *:@_datadir_@:*)
|
||||
+ ;;
|
||||
+ *)
|
||||
XDG_DATA_DIRS="$XDG_DATA_DIRS:@_datadir_@"
|
||||
+esac
|
||||
+fi
|
||||
fi
|
||||
+if test -d "@_datadir_@/xfce"
|
||||
+then
|
||||
+ XDG_DATA_DIRS="@_datadir_@/xfce:$XDG_DATA_DIRS"
|
||||
fi
|
||||
+ XDG_DATA_DIRS="@_datadir_@/xfce:$XDG_DATA_DIRS"
|
||||
+fi
|
||||
export XDG_DATA_DIRS
|
||||
|
||||
@@ -84,7 +93,12 @@
|
||||
XDG_CONFIG_DIRS="/etc/xdg:@_sysconfdir_@/xdg"
|
||||
fi
|
||||
else
|
||||
+ case $XDG_CONFIG_DIRS in
|
||||
+ *:@_sysconfdir_@/xdg:*)
|
||||
+ ;;
|
||||
+ *)
|
||||
XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:@_sysconfdir_@/xdg"
|
||||
+ esac
|
||||
fi
|
||||
export XDG_CONFIG_DIRS
|
||||
|
||||
if test "x$XDG_CONFIG_DIRS" = "x"
|
||||
diff -rub a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in
|
||||
--- a/scripts/xinitrc.in.in 2019-05-11 04:05:58.000000000 +0800
|
||||
+++ b/scripts/xinitrc.in.in 2019-05-20 18:55:49.566603360 +0800
|
||||
|
||||
@ -1,3 +1,29 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 10 12:27:40 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
|
||||
|
||||
- Update to version 4.18.1
|
||||
* Update copyright year
|
||||
* Fix bus name acquisition/ownership (#54, !34)
|
||||
* Use XfceScreensaver from Libxfce4ui (!35)
|
||||
* build: Fix previous commit
|
||||
* build: Fix autotools warnings
|
||||
* Avoid duplicating directories in the tail of $XDG_* envs (#111, !21)
|
||||
* settings: Fix memory leak
|
||||
* libxfsm: Fix wrong return value
|
||||
* Fix memory leaks when opening xfce4-session-settings
|
||||
* Fix blurry session snapshots (!33)
|
||||
* Fix blurry icons in autostart tab when UI scale > 1 (!33)
|
||||
* build: Fix GTK deprecation warnings (!32)
|
||||
* build: Fix some other GDK deprecation warnings (!32)
|
||||
* build: Fix gdk_error_trap_push/pop() deprecation warnings (!32)
|
||||
* build: Let xdt-depends.m4 macros set GLib macros (!32)
|
||||
* build: Remove GDK_VERSION_MIN_REQUIRED/MAX_ALLOWED (!32)
|
||||
* Make use of translations for run hooks (Fixes #156)
|
||||
* Translation Updates
|
||||
- Regenerate xfce4-session-adapt-session-scripts-git.patch and
|
||||
xfce4-session-adapt-session-scripts.patch
|
||||
- Remove two stray comments about add-light-locker-support patches
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 22 13:18:02 UTC 2022 - Manfred Hollstein <manfred.h@gmx.net>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package xfce4-session
|
||||
#
|
||||
# Copyright (c) 2020-2022 SUSE LLC
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
%bcond_with git
|
||||
Name: xfce4-session
|
||||
Version: 4.18.0
|
||||
Version: 4.18.1
|
||||
Release: 0
|
||||
Summary: Xfce Session Manager
|
||||
License: GPL-2.0-only
|
||||
@ -28,11 +28,9 @@ Source0: https://archive.xfce.org/src/xfce/xfce4-session/4.18/%{name}-%{v
|
||||
%if %{with git}
|
||||
# PATCH-FIX-OPENSUSE xfce4-session-adapt-session-scripts-git.patch bnc#789057 maurizio.galli@gmail.com-- Adapt upstream sessions script to openSUSE.
|
||||
Patch0: xfce4-session-adapt-session-scripts-git.patch
|
||||
# PATCH-FIX-OPENSUSE add-light-locker-support.patch maurizio.galli@gmail.com -- add light-locker to xflock4 script.
|
||||
%else
|
||||
# PATCH-FIX-OPENSUSE xfce4-session-adapt-session-scripts.patch bnc#789057 gber@opensuse.org -- Adapt upstream sessions script to openSUSE.
|
||||
Patch1: xfce4-session-adapt-session-scripts.patch
|
||||
# PATCH-FIX-OPENSUSE add-light-locker-support.patch -- add light-locker to xflock4 script.
|
||||
%endif
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: iceauth
|
||||
@ -49,7 +47,7 @@ BuildRequires: pkgconfig(gtk+-3.0) >= 3.24.0
|
||||
BuildRequires: pkgconfig(ice)
|
||||
BuildRequires: pkgconfig(libwnck-3.0) >= 3.10
|
||||
BuildRequires: pkgconfig(libxfce4panel-2.0)
|
||||
BuildRequires: pkgconfig(libxfce4ui-2) >= 4.15.1
|
||||
BuildRequires: pkgconfig(libxfce4ui-2) >= 4.18.2
|
||||
BuildRequires: pkgconfig(libxfce4util-1.0) >= 4.15.2
|
||||
BuildRequires: pkgconfig(libxfconf-0) >= 4.12.0
|
||||
BuildRequires: pkgconfig(polkit-gobject-1) >= 0.102
|
||||
@ -62,14 +60,14 @@ Requires: xfconf
|
||||
# bnc#845264
|
||||
Requires: iceauth
|
||||
Requires(post): update-alternatives
|
||||
Requires(postun): update-alternatives
|
||||
Requires(postun):update-alternatives
|
||||
Recommends: %{name}-doc = %{version}
|
||||
Recommends: %{name}-lang = %{version}
|
||||
# minimal packages for an Xfce session
|
||||
Recommends: xfwm4
|
||||
Recommends: xfdesktop
|
||||
Recommends: thunar
|
||||
Recommends: xfce4-panel
|
||||
Recommends: xfdesktop
|
||||
# xfce4-about needs to be dragged at a low level
|
||||
Recommends: libxfce4ui-tools
|
||||
Obsoletes: libxfsm-4_6-0 < %{version}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user