Hello community, here is the log from the commit of package xdg-utils for openSUSE:Factory checked in at 2012-07-02 12:55:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xdg-utils (Old) and /work/SRC/openSUSE:Factory/.xdg-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdg-utils", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/xdg-utils/xdg-utils.changes 2012-06-28 17:22:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xdg-utils.new/xdg-utils.changes 2012-07-02 12:55:56.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Jun 29 00:27:04 CEST 2012 - [email protected] + +- update to snapshot from 20120310 + * many local patches are gone, since they were merged + * fixes many issues (see bnc#749612, bnc#703396, bnc#752977) + * see ChangeLog for updates +- clean the specfile a bit + +------------------------------------------------------------------- Old: ---- CVE-2008-0386.diff xdg-kde4-upstream.patch xdg-screensaver-gnome-dbus.diff xdg-screensaver-sleep.diff xdg-su.diff xdg-terminal xdg-utils-1.0.2-bnc591714.patch xdg-utils-1.0.2-lxde-support.patch xdg-utils-1.0.2.tar.bz2 New: ---- install-some-more-scripts.diff xdg-utils-20120310.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdg-utils.spec ++++++ --- /var/tmp/diff_new_pack.Uapgsg/_old 2012-07-02 12:55:58.000000000 +0200 +++ /var/tmp/diff_new_pack.Uapgsg/_new 2012-07-02 12:55:58.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xdg-utils # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,36 +15,29 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: xdg-utils BuildRequires: make +BuildRequires: xmlto +BuildRequires: xz +# for xmlto to be able to generate text from html +BuildRequires: w3m +Summary: Utilities to uniformly interface desktop environments License: MIT Group: System/GUI/Other -Summary: Utilities to uniformly interface desktop environments -Version: 1.0.2 -Release: 96 +Version: 20120310 +Release: 0 BuildArch: noarch Url: http://portland.freedesktop.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -# http://portland.freedesktop.org/download/xdg-utils-%{version}.tgz -Source0: xdg-utils-%{version}.tar.bz2 -Source1: http://cgit.freedesktop.org/xdg/xdg-utils/plain/scripts/xdg-terminal -Patch0: xdg-su.diff +# http://portland.freedesktop.org/download/xdg-utils-%%{version}.tgz +Source0: xdg-utils-%{version}.tar.xz +Patch0: install-some-more-scripts.diff Patch1: xfce-su.diff -Patch2: CVE-2008-0386.diff -Patch3: xdg-kde4-upstream.patch -# PATCH-FEATURE-UPSTREAM xdg-utils-1.0.2-lxde-support.patch fdo#26058 [email protected] -# this patch add lxde support to xdg-su and other scripts -Patch4: %name-1.0.2-lxde-support.patch -# PATCH-FIX-UPSTREAM xdg-utils-1.0.2-bnc591714.patch fdo#27551 [email protected] -# this patch fix bnc#591714 -Patch5: %name-1.0.2-bnc591714.patch -Patch6: xdg-screensaver-sleep.diff -Patch7: xdg-screensaver-gnome-dbus.diff Patch8: xdg-screensaver-gnome-perl.diff -Requires: perl, perl-Net-DBus, perl-X11-Protocol +Requires: perl +Requires: perl-Net-DBus +Requires: perl-X11-Protocol %description The xdg-utils package is a set of simple scripts that provide basic @@ -65,52 +58,41 @@ %prep %setup -q -n %name-%{version} -%patch0 -%patch1 -%patch2 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -%patch7 -%patch8 +%patch0 -p1 +%patch1 -p1 +%patch8 -p1 %build %configure +(cd scripts; make scripts) make %{?_smp_flags} %install make DESTDIR=$RPM_BUILD_ROOT install -%__install -D -m0755 "%{SOURCE1}" "%{buildroot}%{_bindir}/xdg-terminal" - %clean %{?buildroot:%__rm -rf "%{buildroot}"} %files %defattr(-,root,root) %doc LICENSE README TODO ChangeLog +%{_bindir}/xdg-desktop-icon +%{_bindir}/xdg-desktop-menu +%{_bindir}/xdg-email +%{_bindir}/xdg-icon-resource +%{_bindir}/xdg-mime +%{_bindir}/xdg-open +%{_bindir}/xdg-su +%{_bindir}/xdg-screensaver +%{_bindir}/xdg-settings %{_bindir}/xdg-terminal -#/usr/bin/xdg-copy -/usr/bin/xdg-desktop-icon -/usr/bin/xdg-desktop-menu -/usr/bin/xdg-email -/usr/bin/xdg-icon-resource -#/usr/bin/xdg-menu -/usr/bin/xdg-mime -/usr/bin/xdg-open -/usr/bin/xdg-su -/usr/bin/xdg-screensaver -#%{_mandir}/man1/xdg-copy.1* -#%{_mandir}/man1/xdg-desktop.1* %{_mandir}/man1/xdg-desktop-icon.1* %{_mandir}/man1/xdg-desktop-menu.1* %{_mandir}/man1/xdg-email.1* %{_mandir}/man1/xdg-icon-resource.1* -#%{_mandir}/man1/xdg-menu.1* %{_mandir}/man1/xdg-mime.1* %{_mandir}/man1/xdg-open.1* -%{_mandir}/man1/xdg-su.1* %{_mandir}/man1/xdg-screensaver.1* +%{_mandir}/man1/xdg-settings.1* %changelog ++++++ install-some-more-scripts.diff ++++++ --- scripts/Makefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -20,11 +20,11 @@ SCRIPTS = \ xdg-open \ xdg-email \ xdg-screensaver \ - xdg-settings -# xdg-su + xdg-settings \ + xdg-su \ + xdg-terminal # xdg-copy \ # xdg-file-dialog -# xdg-terminal MANPAGES= $(SCRIPTS:%=man/%.1) WEBPAGES= $(SCRIPTS:%=%.html) ++++++ xdg-screensaver-gnome-perl.diff ++++++ --- /var/tmp/diff_new_pack.Uapgsg/_old 2012-07-02 12:55:58.000000000 +0200 +++ /var/tmp/diff_new_pack.Uapgsg/_new 2012-07-02 12:55:58.000000000 +0200 @@ -1,10 +1,14 @@ Source of the patch: http://patch-tracker.debian.org/patch/series/view/xdg-utils/1.1.0~rc1+git20111210-6/xdg-screensaver-new-gnome.diff ---- scripts/xdg-screensaver 2012-05-21 12:58:36.269876261 +0200 -+++ scripts/xdg-screensaver 2012-05-21 13:01:12.328342683 +0200 -@@ -617,14 +617,54 @@ +--- + scripts/xdg-screensaver.in | 56 ++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 48 insertions(+), 8 deletions(-) + +--- a/scripts/xdg-screensaver.in ++++ b/scripts/xdg-screensaver.in +@@ -435,14 +435,54 @@ screensaver_gnome_screensaver() # http://people.gnome.org/~mccann/gnome-screensaver/docs/gnome-screensaver.html case "$1" in - suspend) + suspend) - screensaver_suspend_loop \ - dbus-send --session \ - --dest=org.gnome.ScreenSaver \ ++++++ xfce-su.diff ++++++ --- /var/tmp/diff_new_pack.Uapgsg/_old 2012-07-02 12:55:58.000000000 +0200 +++ /var/tmp/diff_new_pack.Uapgsg/_new 2012-07-02 12:55:58.000000000 +0200 @@ -1,6 +1,10 @@ ---- scripts/xdg-su -+++ scripts/xdg-su -@@ -366,6 +366,16 @@ +--- + scripts/xdg-su.in | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +--- a/scripts/xdg-su.in ++++ b/scripts/xdg-su.in +@@ -93,6 +93,16 @@ su_generic() fi } @@ -17,7 +21,7 @@ [ x"$1" != x"" ] || exit_failure_syntax user= -@@ -427,6 +437,10 @@ +@@ -154,6 +164,10 @@ case "$DE" in su_generic ;; @@ -26,5 +30,5 @@ + ;; + *) - [ x"$user" = x"" ] && user=root + [ x"$user" = x"" ] && user=root exit_failure_operation_impossible "no graphical method available for invoking '$cmd' as '$user'" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
