Hello community, here is the log from the commit of package xfce4-branding-openSUSE for openSUSE:Factory checked in at 2013-10-31 10:13:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-branding-openSUSE (Old) and /work/SRC/openSUSE:Factory/.xfce4-branding-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xfce4-branding-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-branding-openSUSE/xfce4-branding-openSUSE.changes 2013-10-06 14:34:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-branding-openSUSE.new/xfce4-branding-openSUSE.changes 2013-10-31 10:13:20.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Oct 29 10:20:42 UTC 2013 - gber@opensuse.org + +- improve suse_version overlay system +- add xfce4-power-manager-branding-openSUSE with default actions + for button press events and critical battery levels + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.fgrmGK/_old 2013-10-31 10:13:22.000000000 +0100 +++ /var/tmp/diff_new_pack.fgrmGK/_new 2013-10-31 10:13:22.000000000 +0100 @@ -28,6 +28,7 @@ %define xfce4_notifyd_version %(rpm -q --queryformat '%%{VERSION}' xfce4-notifyd) %define exo_version %(rpm -q --queryformat '%%{VERSION}' %{libexo_libname}) %define xfwm4_version %(rpm -q --queryformat '%%{VERSION}' xfwm4) +%define xfce4_power_manager_version %(rpm -q --queryformat '%%{VERSION}' xfce4-power-manager) %define thunar_volman_version %(rpm -q --queryformat '%%{VERSION}' thunar-volman) %define midori_version %(rpm -q --queryformat '%%{VERSION}' midori) @@ -57,6 +58,7 @@ BuildRequires: thunar-volman BuildRequires: xfce4-notifyd BuildRequires: xfce4-panel +BuildRequires: xfce4-power-manager BuildRequires: xfce4-session BuildRequires: xfce4-settings BuildRequires: xfdesktop @@ -205,6 +207,17 @@ %description -n xfwm4-branding-openSUSE This package provides the openSUSE look and feel for the xfwm4 window manager. +%package -n xfce4-power-manager-branding-openSUSE +Summary: openSUSE Branding of xfce4-power-manager +License: CC-BY-SA-3.0 and GPL-2.0+ +Group: System/GUI/XFCE +Conflicts: otherproviders(xfce4-power-manager-branding) +Provides: xfwm4-branding = %{xfce4_power_manager_version} +Supplements: packageand(xfce4-power-manager:branding-openSUSE) + +%description -n xfce4-power-manager-branding-openSUSE +This package provides the openSUSE look and feel for the Xfce Power Manager. + %package -n thunar-volman-branding-openSUSE Summary: openSUSE Branding of thunar-volman License: CC-BY-SA-3.0 and GPL-2.0+ @@ -242,7 +255,19 @@ EOF %install -for dir in base %{?suse_version}; do +# find overlay directory with the highest version less or equal to +# %%suse_version +for dir in [[:digit:]]*; do + if [ ! -d "${dir}" ]; then + continue + elif [ "${dir}" -le "0%{?suse_version}" ]; then + if [ -z "${overlay_version}" ] ||\ + [ "${dir}" -gt "${overlay_version}" ]; then + overlay_version="${dir}" + fi + fi +done +for dir in base "${overlay_version}"; do if [ -d "${dir}" ]; then ( cd $dir @@ -347,6 +372,14 @@ %dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml %config %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml +%files -n xfce4-power-manager-branding-openSUSE +%defattr(-,root,root) +%doc COPYING +%dir %{_sysconfdir}/xdg/xfce4 +%dir %{_sysconfdir}/xdg/xfce4/xfconf +%dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml +%config %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml + %files -n thunar-volman-branding-openSUSE %defattr(-,root,root) %doc COPYING ++++++ xfce4-branding-openSUSE-4.10.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/1310 new/xfce4-branding-openSUSE-4.10.0/1310 --- old/xfce4-branding-openSUSE-4.10.0/1310 2013-10-31 10:13:22.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/1310 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to 1230 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/1320 new/xfce4-branding-openSUSE-4.10.0/1320 --- old/xfce4-branding-openSUSE-4.10.0/1320 2013-10-31 10:13:22.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/1320 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to 1310 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml --- old/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/xfce4-branding-openSUSE-4.10.0/base/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml 2013-10-29 11:16:26.000000000 +0100 @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<channel name="xfce4-power-manager" version="1.0"> + <property name="xfce4-power-manager" type="empty"> + <property name="lock-screen-suspend-hibernate" type="bool" value="true"/> + <property name="critical-power-action" type="uint" value="2"/> + <property name="power-button-action" type="uint" value="3"/> + <property name="sleep-button-action" type="uint" value="1"/> + <property name="hibernate-button-action" type="uint" value="2"/> + </property> +</channel> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org