diff --git a/xfce4-session-4.4.2.tar.bz2 b/xfce4-session-4.4.2.tar.bz2 deleted file mode 100644 index 8381a91..0000000 --- a/xfce4-session-4.4.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7394906dec7b50789407219f85143ae83b10938949d38adeecdd59eb50c8c1c6 -size 1252395 diff --git a/xfce4-session-4.4.3.tar.bz2 b/xfce4-session-4.4.3.tar.bz2 new file mode 100644 index 0000000..2292132 --- /dev/null +++ b/xfce4-session-4.4.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa23d0e079ea3bf1b7f0e056adc6e28df04581632207face4f851269d92bffdd +size 1276089 diff --git a/xfce4-session-faster-start.patch b/xfce4-session-faster-start.patch new file mode 100644 index 0000000..8d51215 --- /dev/null +++ b/xfce4-session-faster-start.patch @@ -0,0 +1,24 @@ +--- xfce4-session/xfsm-manager.c ++++ xfce4-session/xfsm-manager.c +@@ -454,7 +454,9 @@ + return; + } + +- startup_done = xfsm_startup_continue (previous_id); ++ startup_done = FALSE; ++ while (!startup_done) ++ startup_done = xfsm_startup_continue (previous_id); + + if (startup_done) + { +--- xfce4-session/xfsm-startup.c ++++ xfce4-session/xfsm-startup.c +@@ -374,7 +374,7 @@ + terminal = xfce_rc_read_bool_entry (rc, "Terminal", FALSE); + + /* try to launch the command */ +- if (!xfce_exec (exec, terminal, startup_notify, &error)) ++ if (!xfce_exec (exec, terminal, 0, &error)) + { + g_warning ("Unable to launch \"%s\" (specified by %s): %s", exec, files[n], error->message); + g_error_free (error); diff --git a/xfce4-session.changes b/xfce4-session.changes index c51c6c4..702f74f 100644 --- a/xfce4-session.changes +++ b/xfce4-session.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Wed Oct 29 22:05:46 CET 2008 - bwalle@suse.de + +- update to 4.4.3 + * translation polish + * added icons + +------------------------------------------------------------------- +Thu Aug 21 14:25:30 CEST 2008 - prusnak@suse.cz + +- added patch for parallel start (faster-start.patch) + +------------------------------------------------------------------- +Tue Dec 4 11:54:15 CET 2007 - prusnak@suse.cz + +- use %find_lang macro + ------------------------------------------------------------------- Mon Dec 3 22:14:40 CET 2007 - bwalle@suse.de diff --git a/xfce4-session.spec b/xfce4-session.spec index feaacf7..da9deda 100644 --- a/xfce4-session.spec +++ b/xfce4-session.spec @@ -1,30 +1,39 @@ # -# spec file for package xfce4-session (Version 4.4.2) +# spec file for package xfce4-session (Version 4.4.3) # -# Copyright (c) 2007 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. +# Copyright (c) 2008 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + Name: xfce4-session BuildRequires: dbus-1-devel gtk2-devel libxml2-devel perl-XML-Parser startup-notification update-desktop-files xorg-x11 %if %suse_version > 1010 BuildRequires: dbus-1-glib-devel %endif -BuildRequires: xfce-mcs-manager-devel >= 4.3 +BuildRequires: intltool xfce-mcs-manager-devel >= 4.3 Requires: fortune Summary: Xfce Session manager -Version: 4.4.2 +Version: 4.4.3 Release: 1 License: GPL v2 or later Url: http://www.xfce.org/ Source0: %{name}-%{version}.tar.bz2 Source1: xfce4-session-ubuntu-icons.tar.bz2 Patch0: xfce4-session-suspend_hibernate.patch +Patch1: xfce4-session-faster-start.patch Group: System/GUI/XFCE BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -42,6 +51,7 @@ Authors: Brian Tarricone %package devel +License: GPL v2 or later Summary: Xfce Session manager Group: System/GUI/XFCE Requires: %{name} = %{version} @@ -64,6 +74,7 @@ Authors: %prep %setup -q %patch0 -p1 +%patch1 %build %configure \ @@ -72,6 +83,7 @@ make %{?jobs:-j%jobs} %install make DESTDIR=$RPM_BUILD_ROOT install +%find_lang %{name} mkdir -p $RPM_BUILD_ROOT/%{_datadir} # the icons for the hibernate and standby buttons cd $RPM_BUILD_ROOT/%{_datadir} @@ -82,14 +94,13 @@ rm -f $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/scalable/apps/xfsm-shutdown.svg %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f %name.lang %defattr(-,root,root) %doc AUTHORS BUGS COPYING ChangeLog ChangeLog.pre-xfce-devel NEWS README TODO %{_sysconfdir}/xdg/xfce4-session/ %{_bindir}/* %{_libdir}/xfce4/ %{_libdir}/libxfsm-* -%{_datadir}/locale/*/*/* %{_mandir}/*/* %{_datadir}/themes/* %{_datadir}/applications/* @@ -99,7 +110,7 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/balou-install-theme %{_libexecdir}/xfsm-shutdown-helper %if %suse_version < 1030 -%dir /etc/xdg/autostart +%dir %{_sysconfdir}/xdg/autostart %endif %{_sysconfdir}/xdg/autostart/xfce4-tips-autostart.desktop @@ -113,35 +124,43 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/xfce4/*/* %changelog -* Mon Dec 03 2007 - bwalle@suse.de +* Wed Oct 29 2008 bwalle@suse.de +- update to 4.4.3 + * translation polish + * added icons +* Thu Aug 21 2008 prusnak@suse.cz +- added patch for parallel start (faster-start.patch) +* Tue Dec 04 2007 prusnak@suse.cz +- use %%find_lang macro +* Mon Dec 03 2007 bwalle@suse.de - update to 4.4.2 o Updated and new translations -* Sat Jun 23 2007 - bwalle@suse.de +* Sat Jun 23 2007 bwalle@suse.de - replaced group 'System/GUI/Other' by 'System/GUI/XFCE' -* Tue May 22 2007 - prusnak@suse.cz +* Tue May 22 2007 prusnak@suse.cz - include 3 files to package - sync with BuildService -* Mon Apr 16 2007 - bwalle@suse.de +* Sun Apr 15 2007 bwalle@suse.de - fix build -* Tue Apr 10 2007 - bwalle@suse.de +* Tue Apr 10 2007 bwalle@suse.de - update to 4.4.1 (no upstream changelog for this subpackage) -* Sat Mar 03 2007 - aj@suse.de +* Sat Mar 03 2007 aj@suse.de - /etc/xdg/autostart is part of filesystem now. -* Sun Jan 21 2007 - bwalle@suse.de +* Sun Jan 21 2007 bwalle@suse.de - upgraded to 4.4.0 -* Wed Feb 08 2006 - pnemec@suse.cz +* Wed Feb 08 2006 pnemec@suse.cz - added xfce4-desktop and xfwm to requires -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Sat Jan 21 2006 - cthiel@suse.de +* Sat Jan 21 2006 cthiel@suse.de - really update to 4.2.3 -* Mon Jan 16 2006 - pnemec@suse.cz +* Mon Jan 16 2006 pnemec@suse.cz - update to 4.2.3 -* Wed Sep 14 2005 - cthiel@suse.de +* Wed Sep 14 2005 cthiel@suse.de - specfile cleanup -* Mon Aug 01 2005 - cthiel@suse.de +* Mon Aug 01 2005 cthiel@suse.de - fixed Requires -* Wed May 18 2005 - cthiel@suse.de +* Wed May 18 2005 cthiel@suse.de - update to 4.2.2 -* Tue Apr 12 2005 - cthiel@suse.de +* Tue Apr 12 2005 cthiel@suse.de - initial version