Hello community, here is the log from the commit of package xfce4-desktop checked in at Fri Feb 2 15:58:15 CET 2007. -------- --- xfce4-desktop/xfce4-desktop.changes 2007-01-22 08:56:13.000000000 +0100 +++ /mounts/work_src_done/STABLE/xfce4-desktop/xfce4-desktop.changes 2007-02-01 17:14:55.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Feb 1 17:00:12 CET 2007 - prusnak@suse.cz + +- removed duplicate copyright header from spec file [#238045] +- removed sessions for display managers in /etc + (SUSE uses only /usr/share/xsessions) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-desktop.spec ++++++ --- /var/tmp/diff_new_pack.u32534/_old 2007-02-02 15:57:14.000000000 +0100 +++ /var/tmp/diff_new_pack.u32534/_new 2007-02-02 15:57:14.000000000 +0100 @@ -11,15 +11,6 @@ # norootforbuild Name: xfce4-desktop - # -# spec file for package xfce4-desktop (Version 4.2.3) -# -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. -# -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# BuildRequires: gtk2-devel startup-notification update-desktop-files BuildRequires: xfce4-session-devel >= 4.3 BuildRequires: xfce-mcs-manager-devel >= 4.3 @@ -27,18 +18,18 @@ BuildRequires: thunar-devel Summary: Desktop manager for the XFce Desktop Environment Version: 4.4.0 -Release: 1 +Release: 2 License: GNU General Public License (GPL) URL: http://www.xfce.org/ Source0: xfdesktop-%{version}.tar.bz2 Source1: xfce-utils-%{version}.tar.bz2 +Patch0: xfce4-desktop-cpp.diff Group: System/GUI/Other BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: gtk2 Requires: xfce4-session >= 4.3 Requires: xfce4-panel >= 4.3 Requires: cpp -Patch0: xfce4-desktop-cpp.diff %description xfce4-desktop contains a desktop manager for the XFce Desktop @@ -56,7 +47,7 @@ %prep %setup -q -n xfdesktop-%{version} -b1 cd ../xfce-utils-%{version} -%patch0 -p1 +%patch0 cd - %build @@ -79,13 +70,16 @@ --mandir=%{_mandir} \ --sysconfdir=%{_sysconfdir} \ --enable-gdm \ - --with-gdm-prefix=/etc/opt/gnome + --with-gdm-prefix=%{_sysconfdir} make %install make DESTDIR=$RPM_BUILD_ROOT install cd ../xfce-utils-%{version} make DESTDIR=$RPM_BUILD_ROOT install +rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/dm +rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/gdm +rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/wmsession.d %clean rm -rf $RPM_BUILD_ROOT @@ -100,7 +94,6 @@ %{_datadir}/xsessions %dir %{_datadir}/xfce4-menueditor %{_datadir}/xfce4-menueditor/xfce4-menueditor.ui -%config(noreplace) %{_sysconfdir}/opt/gnome %{_datadir}/applications/* %{_datadir}/icons/* %{_datadir}/pixmaps/* @@ -111,6 +104,10 @@ %{_sysconfdir}/xdg/xfce4 %changelog -n xfce4-desktop +* Thu Feb 01 2007 - prusnak@suse.cz +- removed duplicate copyright header from spec file [#238045] +- removed sessions for display managers in /etc + (SUSE uses only /usr/share/xsessions) * Sun Jan 21 2007 - bwalle@suse.de - upgraded to 4.4.0 * Mon Mar 27 2006 - pnemec@suse.cz ++++++ xfce4-desktop-cpp.diff ++++++ --- /var/tmp/diff_new_pack.u32534/_old 2007-02-02 15:57:14.000000000 +0100 +++ /var/tmp/diff_new_pack.u32534/_new 2007-02-02 15:57:14.000000000 +0100 @@ -1,6 +1,5 @@ -diff -Nur xfce-utils-4.3.99.2.orig/scripts/xinitrc xfce-utils-4.3.99.2/scripts/xinitrc ---- xfce-utils-4.3.99.2.orig/scripts/xinitrc 2006-11-04 19:06:59.000000000 +0100 -+++ xfce-utils-4.3.99.2/scripts/xinitrc 2006-12-23 23:28:47.000000000 +0100 +--- scripts/xinitrc ++++ scripts/xinitrc @@ -48,7 +48,7 @@ test -r $HOME/.Xresources && cat $HOME/.Xresources >> $XRESOURCES ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org