1
0
forked from pool/xfce4-session

Accepting request 57405 from X11:xfce

Accepted submit request 57405 from user gberh

OBS-URL: https://build.opensuse.org/request/show/57405
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfce4-session?expand=0&rev=27
This commit is contained in:
Marcus Rückert 2011-01-14 16:34:29 +00:00 committed by Git OBS Bridge
parent 437276f6f7
commit 46f073b0e3
2 changed files with 60 additions and 17 deletions

View File

@ -1,3 +1,39 @@
-------------------------------------------------------------------
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
- show compiler output
-------------------------------------------------------------------
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
- fixed typo
-------------------------------------------------------------------
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
- 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

View File

@ -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,19 +58,21 @@ 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
Group: System/GUI/XFCE
Summary: Upstream branding of xfce4-session
Supplements: packageand(%{name}:branding-upstream)
Provides: %{name}-branding = %{version}
Conflicts: otherproviders(%{name}-branding)
%if 0%{?suse_version} >= 1120
# 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.
BuildArch: noarch
%endif
%description branding-upstream
xfce4-session is the session manager for the Xfce desktop environment.
This package provides the upstream look and feel for the Xfce Session Manager.
%prep
%setup -q
@ -79,14 +80,21 @@ xfce4-session is the session manager for the Xfce desktop environment.
%build
%configure \
--docdir=%{_defaultdocdir}/%{name} \
--disable-static \
--enable-session-screenshots
make %{?_smp_mflags}
make %{?_smp_mflags} V=1
%install
%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}
%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 +107,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 +119,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 +131,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