From 40d3613cddbfeeb15a803aef20cff264b7c378fd77648e859b8e653c0da99da8 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Mon, 5 Oct 2015 12:30:05 +0000 Subject: [PATCH] Accepting request 336534 from home:jubalh:branches:X11:windowmanagers bsc#900820: Always use default openSUSE wallpaper for theme 'SUSE'. OBS-URL: https://build.opensuse.org/request/show/336534 OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/WindowMaker?expand=0&rev=38 --- WindowMaker.changes | 5 +++++ WindowMaker.spec | 8 +++++++- theme.tar.bz2 | 4 ++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/WindowMaker.changes b/WindowMaker.changes index 894cb64..f2927a9 100644 --- a/WindowMaker.changes +++ b/WindowMaker.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 5 09:24:02 UTC 2015 - mvetter@suse.com + +- bsc#900820: Always use default openSUSE wallpaper for theme 'SUSE'. + ------------------------------------------------------------------- Mon Sep 21 11:07:06 UTC 2015 - mvetter@suse.com diff --git a/WindowMaker.spec b/WindowMaker.spec index 2028274..e50278b 100644 --- a/WindowMaker.spec +++ b/WindowMaker.spec @@ -51,10 +51,12 @@ BuildRequires: libtool BuildRequires: libXft-devel %endif BuildRequires: update-desktop-files +BuildRequires: wallpaper-branding-openSUSE BuildRequires: xorg-x11-devel +Requires: wallpaper-branding-openSUSE +Requires: xdg-menu Provides: windowmanager Provides: wmaker -Requires: xdg-menu %description Window Maker is an X11 window manager originally designed to provide @@ -147,6 +149,10 @@ make DESTDIR=$RPM_BUILD_ROOT install tar -xvjf %SOURCE2 -C $RPM_BUILD_ROOT/usr/share/%{name}/Themes/ find $RPM_BUILD_ROOT/usr/share/%{name}/Themes -type f -exec chmod 644 {} \; find $RPM_BUILD_ROOT/usr/share/%{name}/Themes -type d -exec chmod 755 {} \; +# use default openSUSE wallpaper in SUSE theme +pushd %{buildroot}/usr/share/%{name}/Themes/SUSE.themed/ +ln -sf /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg default.jpg +popd #---------------------------------------------------------------------- # not packaged rm -f $RPM_BUILD_ROOT/%{_mandir}/{cs,ru,sk}/man1/* diff --git a/theme.tar.bz2 b/theme.tar.bz2 index 6f5a6c6..b1d9754 100644 --- a/theme.tar.bz2 +++ b/theme.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85ab533c5c018d0b8144f29138c3b35ee7cba4c3445246ae8a82b73b128b4ff8 -size 1928246 +oid sha256:064d9208d71b035c1ddac8825cf322d033438f803972157f0d16ad7f5bab2604 +size 740