commit xfce4-desktop for openSUSE:Factory
Hello community, here is the log from the commit of package xfce4-desktop for openSUSE:Factory checked in at Mon Mar 9 00:30:56 CET 2009. -------- --- xfce4-desktop/xfce4-desktop.changes 2008-11-19 11:53:43.000000000 +0100 +++ /mounts/work_src_done/STABLE/xfce4-desktop/xfce4-desktop.changes 2009-02-27 14:23:00.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Feb 27 14:22:22 CET 2009 - prusnak@suse.cz + +- updated to 4.6.0 (Xfce 4.6.0 release) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xfce-utils-4.4.3.tar.bz2 xfce-utils-cpp.patch xfdesktop-4.4.3.tar.bz2 xfdesktop-backdrops.patch xfdesktop-compiler-warning.diff xfdesktop-eject.patch xfdesktop-no-yast-desktop-files.patch New: ---- xfce-utils-4.6.0-cpp.patch xfce-utils-4.6.0.tar.bz2 xfdesktop-4.6.0-backdrops.patch xfdesktop-4.6.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-desktop.spec ++++++ --- /var/tmp/diff_new_pack.M12909/_old 2009-03-09 00:30:36.000000000 +0100 +++ /var/tmp/diff_new_pack.M12909/_new 2009-03-09 00:30:36.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package xfce4-desktop (Version 4.4.3) +# spec file for package xfce4-desktop (Version 4.6.0) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 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 @@ -19,30 +19,21 @@ Name: xfce4-desktop -BuildRequires: gtk2-devel startup-notification update-desktop-files -BuildRequires: xfce4-session-devel >= 4.3 -BuildRequires: xfce-mcs-manager-devel >= 4.3 -BuildRequires: xfce4-panel-devel >= 4.4.1 -BuildRequires: thunar-devel Summary: Desktop manager for the Xfce Desktop Environment -Version: 4.4.3 +Version: 4.6.0 Release: 2 License: GPL v2 or later Url: http://www.xfce.org/ Source0: xfdesktop-%{version}.tar.bz2 Source1: xfce-utils-%{version}.tar.bz2 -Patch0: xfce-utils-cpp.patch -Patch1: xfdesktop-eject.patch -Patch2: xfdesktop-backdrops.patch -Patch3: xfdesktop-no-yast-desktop-files.patch -Patch4: xfdesktop-compiler-warning.diff +Patch0: xfdesktop-%{version}-backdrops.patch +Patch1: xfce-utils-%{version}-cpp.patch Group: System/GUI/XFCE BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: gtk2 -Requires: xfce4-session >= 4.3 -Requires: xfce4-panel >= 4.3 -Requires: cpp -Requires: %{name}-branding >= 4.4 +BuildRequires: dbus-1-glib-devel exo-devel gtk2-devel libglade2-devel libwnck-devel libxfce4menu-devel libxfconf-devel thunar-devel xfce4-panel-devel xfce4-session-devel +BuildRequires: intltool perl-XML-Parser startup-notification update-desktop-files +Requires: gtk2 xfce4-session xfce4-panel cpp +Requires: %{name}-branding >= %{version} %description xfce4-desktop contains a desktop manager for the XFce Desktop @@ -63,7 +54,7 @@ Group: System/GUI/XFCE Provides: %{name}-branding = %{version} Conflicts: otherproviders(%{name}-branding) -Supplements: packageand(branding-upstream:%{name}) +Supplements: packageand(%{name}:branding-upstream) #BRAND: ... %description branding-upstream @@ -81,12 +72,9 @@ %prep %setup -q -n xfdesktop-%{version} -b1 -%patch1 -%patch2 -%patch3 -%patch4 -p1 -cd ../xfce-utils-%{version} %patch0 +cd ../xfce-utils-%{version} +%patch1 %build %configure \ @@ -105,18 +93,14 @@ make DESTDIR=$RPM_BUILD_ROOT install pushd ../xfce-utils-%{version} make DESTDIR=$RPM_BUILD_ROOT install +popd +%find_lang xfdesktop +%find_lang xfce-utils xfdesktop.lang rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/dm rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/gdm rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/wmsession.d rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/switchdesk -popd -%find_lang xfdesktop -%find_lang xfce-utils xfdesktop.lang -%suse_update_desktop_file -i xfce-backdrop-settings X-XFCE Settings DesktopSettings -%suse_update_desktop_file -i xfce-menueditor X-XFCE Application Settings DesktopSettings -# those are not real desktop files -#suse_update_desktop_file -i xfce4-menu X-XFCE -#suse_update_desktop_file -i xfce X-XFCE +rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/modules/*.la %clean rm -rf $RPM_BUILD_ROOT @@ -127,8 +111,8 @@ %{_bindir}/* %{_datadir}/xfce4/ %{_datadir}/xsessions/xfce.desktop -%dir %{_datadir}/xfce4-menueditor -%{_datadir}/xfce4-menueditor/xfce4-menueditor.ui +#%dir %{_datadir}/xfce4-menueditor +#%{_datadir}/xfce4-menueditor/xfce4-menueditor.ui %{_datadir}/applications/* %{_datadir}/icons/* %{_datadir}/pixmaps/* @@ -137,18 +121,22 @@ %{_libexecdir}/xfce4/panel-plugins/xfce4-menu-plugin %{_mandir}/man1/* %dir %{_sysconfdir}/xdg/xfce4 -%{_sysconfdir}/xdg/xfce4/Xft.xrdb +%dir %{_sysconfdir}/xdg/menus +%dir %{_datadir}/desktop-directories %{_sysconfdir}/xdg/xfce4/xinitrc -%dir %{_sysconfdir}/xdg/xfce4/desktop -%{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml* +%{_sysconfdir}/xdg/autostart/*.desktop +%{_datadir}/desktop-directories/*.directory -%files -n %{name}-branding-upstream +%files branding-upstream %defattr(-,root,root) %dir %{_datadir}/wallpapers %{_datadir}/wallpapers/* -%{_sysconfdir}/xdg/xfce4/desktop/menu.xml* +%{_sysconfdir}/xdg/menus/xfce-applications.menu +%{_sysconfdir}/xdg/xfce4/Xft.xrdb %changelog +* Fri Feb 27 2009 prusnak@suse.cz +- updated to 4.6.0 (Xfce 4.6.0 release) * Tue Nov 18 2008 pnemec@suse.cz - call update_desktop_file macro on desktop files [bnc#445722] * Wed Oct 29 2008 bwalle@suse.de ++++++ xfce-utils-4.6.0-cpp.patch ++++++ --- scripts/xinitrc +++ scripts/xinitrc @@ -48,7 +48,7 @@ test -r "$HOME/.Xresources" && XRESOURCES="$XRESOURCES $HOME/.Xresources" # load all X resources (adds /dev/null to avoid an empty list that would hang the process) -cat /dev/null $XRESOURCES | xrdb -nocpp -merge - +cat /dev/null $XRESOURCES | xrdb -merge - # load local modmap test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap ++++++ xfce-utils-4.4.3.tar.bz2 -> xfce-utils-4.6.0.tar.bz2 ++++++ ++++ 92901 lines of diff (skipped) ++++++ xfdesktop-4.6.0-backdrops.patch ++++++ --- backdrops/Makefile.am +++ backdrops/Makefile.am @@ -1,7 +1,7 @@ # backdrops/Makefile.am # -backdropsdir = $(datadir)/xfce4/backdrops +backdropsdir = $(datadir)/wallpapers backdrops_DATA = \ flower.png \ --- backdrops/Makefile.in +++ backdrops/Makefile.in @@ -282,7 +282,7 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -backdropsdir = $(datadir)/xfce4/backdrops +backdropsdir = $(datadir)/wallpapers backdrops_DATA = \ flower.png \ xfce4gradientcurve.png \ --- common/xfdesktop-common.h +++ common/xfdesktop-common.h @@ -31,7 +31,7 @@ #include <X11/Xlib.h> #define XFDESKTOP_CHANNEL "xfce4-desktop" -#define DEFAULT_BACKDROP DATADIR "/xfce4/backdrops/xfce-stripes.png" +#define DEFAULT_BACKDROP DATADIR "/wallpapers/xfce-smoke.png" #define DEFAULT_BACKDROP_LIST "xfce4/desktop/backdrop.list" #define DEFAULT_ICON_FONT_SIZE 12 #define DEFAULT_ICON_SIZE 32 --- settings/main.c +++ settings/main.c @@ -642,7 +642,7 @@ xfconf_channel_set_string(panel->channel, prop_last, image_file); backdrop_dirs = xfce_resource_lookup_all(XFCE_RESOURCE_DATA, - "xfce4/backdrops/"); + "wallpapers/"); for(i = 0; backdrop_dirs[i]; ++i) { tmp = xfdesktop_image_list_add_dir(ls, backdrop_dirs[i], image_file); ++++++ xfdesktop-4.4.3.tar.bz2 -> xfdesktop-4.6.0.tar.bz2 ++++++ ++++ 268474 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de