rpms/lxde-common/devel lxde-common-0.5.0-fix-session-startup.patch, NONE, 1.1 lxde-common-0.5.0-pulseaudio.patch, NONE, 1.1 lxde-common-0.5.0-vendor.patch, NONE, 1.1 lxde-common.spec, 1.14, 1.15 lxde-lock-screen.desktop, 1.1, 1.2 lxde-common-0.3.2.1-gdm-number-of-desktops.patch, 1.2, NONE lxde-common-0.4-lxde-logout.desktop.patch, 1.2, NONE lxde-common-0.4-pulseaudio.patch, 1.1, NONE
Christoph Wickert
cwickert at fedoraproject.org
Sat Dec 12 00:24:39 UTC 2009
Author: cwickert
Update of /cvs/pkgs/rpms/lxde-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28439
Modified Files:
lxde-common.spec lxde-lock-screen.desktop
Added Files:
lxde-common-0.5.0-fix-session-startup.patch
lxde-common-0.5.0-pulseaudio.patch
lxde-common-0.5.0-vendor.patch
Removed Files:
lxde-common-0.3.2.1-gdm-number-of-desktops.patch
lxde-common-0.4-lxde-logout.desktop.patch
lxde-common-0.4-pulseaudio.patch
Log Message:
* Fri Dec 11 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.0-1
- Update to 0.5.0
lxde-common-0.5.0-fix-session-startup.patch:
startlxde.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE lxde-common-0.5.0-fix-session-startup.patch ---
--- trunk/lxde-common/startlxde.in 2009/09/03 00:34:22 1964
+++ trunk/lxde-common/startlxde.in 2009/12/10 18:54:36 2187
@@ -25,4 +25,4 @@
export SAL_USE_VCLPLUGIN=gtk
# Start the LXDE session
-exec @prefix@/bin/lxsession -s LXDE
+exec @prefix@/bin/lxsession -s LXDE -e LXDE
lxde-common-0.5.0-pulseaudio.patch:
autostart | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE lxde-common-0.5.0-pulseaudio.patch ---
--- lxde-common-0.5.0/autostart.orig 2009-12-11 02:15:10.000000000 +0100
+++ lxde-common-0.5.0/autostart 2009-12-11 02:16:33.000000000 +0100
@@ -1,3 +1,4 @@
- at xscreensaver -no-splash
@lxpanel --profile LXDE
@pcmanfm -d
+ at xscreensaver -no-splash
+ at pulseaudio -D
lxde-common-0.5.0-vendor.patch:
desktop.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE lxde-common-0.5.0-vendor.patch ---
--- lxde-common-0.5.0/desktop.conf.orig 2009-12-12 00:07:25.000000000 +0100
+++ lxde-common-0.5.0/desktop.conf 2009-12-12 00:07:59.000000000 +0100
@@ -3,7 +3,7 @@
[GTK]
sNet/ThemeName=Clearlooks
-sNet/IconThemeName=nuoveXT2
+sNet/IconThemeName=Fedora
sGtk/FontName=Sans 10
iGtk/ToolbarStyle=3
iGtk/ButtonImages=1
Index: lxde-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/devel/lxde-common.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- lxde-common.spec 26 Oct 2009 23:42:43 -0000 1.14
+++ lxde-common.spec 12 Dec 2009 00:24:39 -0000 1.15
@@ -1,31 +1,29 @@
# Review: https://bugzilla.redhat.com/show_bug.cgi?id=442270
Name: lxde-common
-Version: 0.4.2
-Release: 2%{?dist}
+Version: 0.5.0
+Release: 1%{?dist}
Summary: Default configuration files for LXDE
Group: User Interface/Desktops
License: GPLv2+
URL: http://lxde.sourceforge.net/
-Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
Source1: lxde-lock-screen.desktop
-# fix lxde-logout.desktop
-Patch6: %{name}-0.4-lxde-logout.desktop.patch
+# http://lxde.svn.sourceforge.net/viewvc/lxde/trunk/lxde-common/startlxde.in?r1=1964&r2=2187
+Patch0: lxde-common-0.5.0-fix-session-startup.patch
# Distro specific patches
Patch10: %{name}-0.3.2.1-pcmanfm-config.patch
Patch11: %{name}-0.4-lxpanel-config.patch
Patch12: %{name}-0.4-openbox-menu.patch
Patch13: %{name}-0.3.2.1-logout-banner.patch
-Patch14: %{name}-0.4-olpc-keyboard-shortcuts.patch
-# Pulseaudio
-Patch4: %{name}-0.4-pulseaudio.patch
-# Because of new gdm, committed to upstream SVN
-Patch5: %{name}-0.3.2.1-gdm-number-of-desktops.patch
+Patch14: %{name}-0.5.0-pulseaudio.patch
+Patch15: %{name}-0.5.0-vendor.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
-Requires: lxsession lxpanel pcmanfm openbox xdg-utils
+Requires: lxsession >= 0.4.0
+Requires: lxpanel pcmanfm openbox xdg-utils
Requires: lxmenu-data lxde-settings-daemon
# Use vendor's artwork
Requires: system-logos
@@ -33,7 +31,7 @@ Requires: system-logos
Requires: desktop-backgrounds-basic
%else
Requires: desktop-backgrounds-compat
-# needed for new gdm fix
+# needed because of new gdm
Requires: xorg-x11-utils
%endif
Obsoletes: %{name}-data <= 0.3.2.1-5
@@ -50,17 +48,13 @@ Desktop Environment.
%prep
%setup -q
+%patch0 -p2 -b .session-startup
%patch10 -p1 -b .orig
%patch11 -p1 -b .orig
%patch12 -p1 -b .orig
%patch13 -p1 -b .logout-banner
-#%patch14 -p1 -b .olpc
-%patch4 -p1 -b .pulseaudio
-%patch6 -p1 -b .desktop
-%if 0%{?fedora} > 8
-%patch5 -p1 -b .gdm-desktops
-%endif
-
+%patch14 -p1 -b .pulseaudio
+%patch15 -p1 -b .vendor
%build
%configure
@@ -70,13 +64,12 @@ Desktop Environment.
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
desktop-file-install \
+ --remove-key=Encoding \
--dir=%{buildroot}%{_datadir}/applications \
lxde-logout.desktop
desktop-file-install \
--dir=%{buildroot}%{_datadir}/applications \
%{SOURCE1}
-# the icon theme is packaged in a different package
-rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/
%clean
@@ -88,11 +81,11 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS COPYING
%dir %{_sysconfdir}/xdg/lxsession/LXDE/
%config(noreplace) %{_sysconfdir}/xdg/lxsession/LXDE/autostart
-%config(noreplace) %{_sysconfdir}/xdg/lxsession/LXDE/config
+%config(noreplace) %{_sysconfdir}/xdg/lxsession/LXDE/desktop.conf
%{_bindir}/startlxde
%{_bindir}/lxde-logout
%{_bindir}/openbox-lxde
-%{_datadir}/lxde/*
+%{_datadir}/lxde/
%{_datadir}/lxpanel/profile/LXDE/
%{_mandir}/man1/*.1.gz
%{_datadir}/xsessions/LXDE.desktop
@@ -100,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Dec 11 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.0-1
+- Update to 0.5.0
+
* Tue Oct 27 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
- Final tweaks for the LXDE Spin
Index: lxde-lock-screen.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/devel/lxde-lock-screen.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lxde-lock-screen.desktop 13 Jun 2009 17:52:30 -0000 1.1
+++ lxde-lock-screen.desktop 12 Dec 2009 00:24:39 -0000 1.2
@@ -1,6 +1,4 @@
-
[Desktop Entry]
-Encoding=UTF-8
Type=Application
Name=Lock Screen
Name[de_DE]=Bildschirm sperren
--- lxde-common-0.3.2.1-gdm-number-of-desktops.patch DELETED ---
--- lxde-common-0.4-lxde-logout.desktop.patch DELETED ---
--- lxde-common-0.4-pulseaudio.patch DELETED ---
More information about the fedora-extras-commits
mailing list