From 71f7106b0414e7d01b8d7b3bf583a5ed68983ce8cb2ce93bc77913bee9371765 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 8 Dec 2010 13:30:09 +0000 Subject: [PATCH 1/7] Updating link to change in openSUSE:Factory/xfce4-session revision 26.0 OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=d89eb2ec5c37dd7c8f37ecf791548df8 --- xfce4-session.spec | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/xfce4-session.spec b/xfce4-session.spec index f547f4b..40fc2dd 100644 --- a/xfce4-session.spec +++ b/xfce4-session.spec @@ -1,7 +1,22 @@ # +# spec file for package xfce4-session (Version 4.7.2) +# +# Copyright (c) 2010 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/ # + + Name: xfce4-session Version: 4.7.2 Release: 1 From 4ba9f1035e15c1be0a95132fb14b7d4382e93bc79026897f6eb5ce02d33988cd Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Mon, 27 Dec 2010 15:49:14 +0000 Subject: [PATCH 2/7] - correct url, groups - improve summaries/descriptions - remove unsupported locales - do not install documentation in /usr/share/doc - moved xfce4-tips-autostart.desktop into the branding supackage in order to allow disabling startup tips as part of the branding - remove all libtool files OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=40 --- xfce4-session.changes | 11 +++++++++++ xfce4-session.spec | 30 +++++++++++++++++++----------- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/xfce4-session.changes b/xfce4-session.changes index b41075c..c3da5a0 100644 --- a/xfce4-session.changes +++ b/xfce4-session.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Dec 27 15:17:25 UTC 2010 - gber@opensuse.org + +- correct url, groups +- improve summaries/descriptions +- remove unsupported locales +- do not install documentation in /usr/share/doc +- moved xfce4-tips-autostart.desktop into the branding supackage in + order to allow disabling startup tips as part of the branding +- remove all libtool files + ------------------------------------------------------------------- Sun Dec 5 22:06:58 UTC 2010 - prusnak@opensuse.org diff --git a/xfce4-session.spec b/xfce4-session.spec index 40fc2dd..4c40896 100644 --- a/xfce4-session.spec +++ b/xfce4-session.spec @@ -15,14 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: xfce4-session Version: 4.7.2 Release: 1 License: GPLv2+ Summary: Xfce Session manager -Url: http://www.xfce.org/ +Url: http://www.xfce.org/projects/xfce4-session/ Group: System/GUI/XFCE Source: %{name}-%{version}.tar.bz2 Patch0: xfce4-session-4.7.1-fix-missing-include.patch @@ -38,6 +36,7 @@ BuildRequires: update-desktop-files BuildRequires: xorg-x11 Requires: %{name}-branding >= %{version} Requires: xfce-utils +Requires: xfconf Recommends: fortune BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -46,8 +45,8 @@ xfce4-session is the session manager for the Xfce desktop environment. %package devel License: GPLv2+ -Summary: Xfce Session manager -Group: System/GUI/XFCE +Summary: Development files for xfce4-session +Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: pkgconfig(dbus-glib-1) Requires: pkgconfig(libwnck-1.0) @@ -59,9 +58,11 @@ Requires: pkgconfig(libxfconf-0) %description devel xfce4-session is the session manager for the Xfce desktop environment. +This package contains development files needed to develop custom splash themes. + %package branding-upstream License: GPLv2+ -Summary: Xfce Session manager +Summary: Xfce Session manager upstream branding Group: System/GUI/XFCE Supplements: packageand(%{name}:branding-upstream) Provides: %{name}-branding = %{version} @@ -73,20 +74,28 @@ BuildArch: noarch %description branding-upstream xfce4-session is the session manager for the Xfce desktop environment. +This package contains the upstream branding. + %prep %setup -q %patch0 -p1 %build %configure \ + --docdir=%{_defaultdocdir}/%{name} \ --disable-static \ --enable-session-screenshots make %{?_smp_mflags} %install %make_install +%suse_update_desktop_file xfce-session-settings +%suse_update_desktop_file xfce4-session-logout +install -p -m 644 AUTHORS BUGS COPYING ChangeLog NEWS README TODO \ + %{buildroot}/%{_defaultdocdir}/%{name} +rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} %find_lang %{name} -rm -f %{buildroot}%{_libdir}/*.la %{buildroot}%{_libdir}/xfce4/splash/engines/*.la +rm -f %{buildroot}%{_libdir}/*.la %{buildroot}%{_libdir}/xfce4/session/splash-engines/*.la %clean rm -rf %{buildroot} @@ -99,7 +108,7 @@ rm -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root) -%doc AUTHORS BUGS COPYING ChangeLog NEWS README TODO +%doc %{_defaultdocdir}/%{name} %{_bindir}/xfce4-session %{_bindir}/xfce4-session-logout %{_bindir}/xfce4-session-settings @@ -111,8 +120,6 @@ rm -rf %{buildroot} %{_datadir}/applications/* %{_datadir}/icons/*/* %{_datadir}/xfce4/ -%{_datadir}/doc/xfce4-session -%{_sysconfdir}/xdg/autostart/xfce4-tips-autostart.desktop %files devel %defattr(-,root,root) @@ -125,6 +132,7 @@ rm -rf %{buildroot} %dir %{_sysconfdir}/xdg/xfce4 %dir %{_sysconfdir}/xdg/xfce4/xfconf %dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml -%{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml +%config %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml +%config %{_sysconfdir}/xdg/autostart/xfce4-tips-autostart.desktop %changelog From 20a75c27b7e8bf7e409ff3091d489e6be9c1ac2ff2cd9d20e3928cefab7a7338 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Mon, 27 Dec 2010 16:14:46 +0000 Subject: [PATCH 3/7] - add proper BRAND comment OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=41 --- xfce4-session.changes | 5 +++++ xfce4-session.spec | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/xfce4-session.changes b/xfce4-session.changes index c3da5a0..10c95c0 100644 --- a/xfce4-session.changes +++ b/xfce4-session.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 27 16:12:03 UTC 2010 - gber@opensuse.org + +- add proper BRAND comment + ------------------------------------------------------------------- Mon Dec 27 15:17:25 UTC 2010 - gber@opensuse.org diff --git a/xfce4-session.spec b/xfce4-session.spec index 4c40896..3bd9e0d 100644 --- a/xfce4-session.spec +++ b/xfce4-session.spec @@ -67,6 +67,11 @@ Group: System/GUI/XFCE Supplements: packageand(%{name}:branding-upstream) Provides: %{name}-branding = %{version} Conflicts: otherproviders(%{name}-branding) +# BRAND: xfce4-session.xml: Control session parameters such as the tools and +# BRAND: applications started by default or the splash theme. +# BRAND: xfce4-tips-autostart.desktop: Control whether xfce4-tips is started +# BRAND: by default. +%config %{_sysconfdir}/xdg/autostart/xfce4-tips-autostart.desktop %if 0%{?suse_version} >= 1120 BuildArch: noarch %endif From 724732d76bbba57afc3e436d6f392160b3891db7a02c4986da9a67be8e3e68af Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Mon, 27 Dec 2010 16:29:02 +0000 Subject: [PATCH 4/7] - fixed typo OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=42 --- xfce4-session.changes | 5 +++++ xfce4-session.spec | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/xfce4-session.changes b/xfce4-session.changes index 10c95c0..3b0df91 100644 --- a/xfce4-session.changes +++ b/xfce4-session.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 27 16:27:39 UTC 2010 - gber@opensuse.org + +- fixed typo + ------------------------------------------------------------------- Mon Dec 27 16:12:03 UTC 2010 - gber@opensuse.org diff --git a/xfce4-session.spec b/xfce4-session.spec index 3bd9e0d..3db2e21 100644 --- a/xfce4-session.spec +++ b/xfce4-session.spec @@ -71,7 +71,6 @@ Conflicts: otherproviders(%{name}-branding) # BRAND: applications started by default or the splash theme. # BRAND: xfce4-tips-autostart.desktop: Control whether xfce4-tips is started # BRAND: by default. -%config %{_sysconfdir}/xdg/autostart/xfce4-tips-autostart.desktop %if 0%{?suse_version} >= 1120 BuildArch: noarch %endif From 2fb1ac4aca677426ab2d72b63b80ecf3977327f6115d432431e333e9dd936425 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Mon, 27 Dec 2010 17:25:21 +0000 Subject: [PATCH 5/7] - use %%suse_update_desktop_file for files in /etc/xdg/autostart OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=43 --- xfce4-session.changes | 5 +++++ xfce4-session.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/xfce4-session.changes b/xfce4-session.changes index 3b0df91..92a2b7b 100644 --- a/xfce4-session.changes +++ b/xfce4-session.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 27 17:21:49 UTC 2010 - gber@opensuse.org + +- use %%suse_update_desktop_file for files in /etc/xdg/autostart + ------------------------------------------------------------------- Mon Dec 27 16:27:39 UTC 2010 - gber@opensuse.org diff --git a/xfce4-session.spec b/xfce4-session.spec index 3db2e21..d004b49 100644 --- a/xfce4-session.spec +++ b/xfce4-session.spec @@ -95,6 +95,7 @@ make %{?_smp_mflags} %make_install %suse_update_desktop_file xfce-session-settings %suse_update_desktop_file xfce4-session-logout +%suse_update_desktop_file xfce4-tips-autostart install -p -m 644 AUTHORS BUGS COPYING ChangeLog NEWS README TODO \ %{buildroot}/%{_defaultdocdir}/%{name} rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} From 5ccdba7395b2304b30d47dd6aa44d80b2e2756c7829d8ca6b8265bb5f841fe89 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Mon, 27 Dec 2010 18:10:20 +0000 Subject: [PATCH 6/7] - show compiler output OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=44 --- xfce4-session.changes | 5 +++++ xfce4-session.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/xfce4-session.changes b/xfce4-session.changes index 92a2b7b..417d7c9 100644 --- a/xfce4-session.changes +++ b/xfce4-session.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 27 18:08:49 UTC 2010 - gber@opensuse.org + +- show compiler output + ------------------------------------------------------------------- Mon Dec 27 17:21:49 UTC 2010 - gber@opensuse.org diff --git a/xfce4-session.spec b/xfce4-session.spec index d004b49..a3e521e 100644 --- a/xfce4-session.spec +++ b/xfce4-session.spec @@ -89,7 +89,7 @@ This package contains the upstream branding. --docdir=%{_defaultdocdir}/%{name} \ --disable-static \ --enable-session-screenshots -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install %make_install From a0a3c88cc8c7a36b1cd451ec3eb6d08e731c39c714e5a5e53b0bf8b0c7d404b9 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Wed, 5 Jan 2011 18:07:31 +0000 Subject: [PATCH 7/7] - use consistent wording for branding packages OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=45 --- xfce4-session.changes | 5 +++++ xfce4-session.spec | 10 ++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/xfce4-session.changes b/xfce4-session.changes index 417d7c9..278ce4b 100644 --- a/xfce4-session.changes +++ b/xfce4-session.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 5 14:24:30 UTC 2011 - gber@opensuse.org + +- use consistent wording for branding packages + ------------------------------------------------------------------- Mon Dec 27 18:08:49 UTC 2010 - gber@opensuse.org diff --git a/xfce4-session.spec b/xfce4-session.spec index a3e521e..b7e9143 100644 --- a/xfce4-session.spec +++ b/xfce4-session.spec @@ -61,9 +61,7 @@ xfce4-session is the session manager for the Xfce desktop environment. This package contains development files needed to develop custom splash themes. %package branding-upstream -License: GPLv2+ -Summary: Xfce Session manager upstream branding -Group: System/GUI/XFCE +Summary: Upstream branding of xfce4-session Supplements: packageand(%{name}:branding-upstream) Provides: %{name}-branding = %{version} Conflicts: otherproviders(%{name}-branding) @@ -71,14 +69,10 @@ Conflicts: otherproviders(%{name}-branding) # BRAND: applications started by default or the splash theme. # BRAND: xfce4-tips-autostart.desktop: Control whether xfce4-tips is started # BRAND: by default. -%if 0%{?suse_version} >= 1120 BuildArch: noarch -%endif %description branding-upstream -xfce4-session is the session manager for the Xfce desktop environment. - -This package contains the upstream branding. +This package provides the upstream look and feel for the Xfce Session Manager. %prep %setup -q