rpms/lxde-common/F-10 lxde-common-0.4-olpc-keyboard-shortcuts.patch, NONE, 1.1 lxde-lock-screen.desktop, NONE, 1.1 .cvsignore, 1.3, 1.4 lxde-common-0.4-lxpanel-config.patch, 1.2, 1.3 lxde-common.spec, 1.4, 1.5 sources, 1.4, 1.5
Christoph Wickert
cwickert at fedoraproject.org
Sat Jul 25 03:17:21 UTC 2009
Author: cwickert
Update of /cvs/pkgs/rpms/lxde-common/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1419
Modified Files:
.cvsignore lxde-common-0.4-lxpanel-config.patch
lxde-common.spec sources
Added Files:
lxde-common-0.4-olpc-keyboard-shortcuts.patch
lxde-lock-screen.desktop
Log Message:
* Sat Jul 25 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
- Update to 0.4.2
- Disable OLPC keyboard shortcuts for now, they interfere with OpenOffice
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
lxde-common-0.4-olpc-keyboard-shortcuts.patch:
rc.xml.in | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 47 insertions(+)
--- NEW FILE lxde-common-0.4-olpc-keyboard-shortcuts.patch ---
--- lxde-common-0.4.orig/openbox/rc.xml.in 2008-04-26 04:32:26.000000000 +0200
+++ lxde-common-0.4/openbox/rc.xml.in 2009-06-13 22:57:54.000000000 +0200
@@ -288,6 +288,53 @@
</action>
</keybind>
+ <!--keybindings for OLPC -->
+ <keybind key="C-F9">
+ <action name="Execute">
+ <command>olpc-brightness down</command>
+ </action>
+ </keybind>
+
+ <keybind key="C-F10">
+ <action name="Execute">
+ <command>olpc-brightness up</command>
+ </action>
+ </keybind>
+
+ <keybind key="C-F11">
+ <action name="Execute">
+ <command>amixer set Master 3dB- -q</command>
+ </action>
+ </keybind>
+
+ <keybind key="C-F12">
+ <action name="Execute">
+ <command>amixer set Master 3dB+ -q</command>
+ </action>
+ </keybind>
+
+ <keybind key="XF86Search">
+ <action name="Execute">
+ <startupnotify>
+ <enabled>true</enabled>
+ <name>PCManFM</name>
+ </startupnotify>
+ <command>pcmanfm -f</command>
+ </action>
+ </keybind>
+
+ <keybind key="XF86Messenger">
+ <action name="ShowMenu">
+ <command>client-list-combined-menu</command>
+ </action>
+ </keybind>
+
+ <keybind key="XF86TaskPane">
+ <action name="Execute">
+ <command>lxpanelctl menu</command>
+ </action>
+ </keybind>
+
</keyboard>
--- NEW FILE lxde-lock-screen.desktop ---
[Desktop Entry]
Encoding=UTF-8
Type=Application
Name=Lock Screen
Name[de_DE]=Bildschirm sperren
Icon=system-lock-screen
Exec=xdg-screensaver lock
Comment=Lock Screen
Comment[de_DE]=Bildschirm vor unbefugtem Zugriff sperren
StartupNotify=false
NoDisplay=true
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 3 May 2009 09:38:17 -0000 1.3
+++ .cvsignore 25 Jul 2009 03:17:21 -0000 1.4
@@ -1 +1 @@
-lxde-common-0.4.tar.bz2
+lxde-common-0.4.2.tar.bz2
lxde-common-0.4-lxpanel-config.patch:
config | 2 +-
panel.in | 21 ++++++++++++++++-----
2 files changed, 17 insertions(+), 6 deletions(-)
Index: lxde-common-0.4-lxpanel-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/F-10/lxde-common-0.4-lxpanel-config.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lxde-common-0.4-lxpanel-config.patch 23 May 2009 00:59:44 -0000 1.2
+++ lxde-common-0.4-lxpanel-config.patch 25 Jul 2009 03:17:21 -0000 1.3
@@ -8,8 +8,8 @@ diff -dur lxde-common-0.4.orig/lxpanel/c
+Terminal=lxterminal -e
Logout=lxde-logout
diff -dur lxde-common-0.4.orig/lxpanel/panel.in lxde-common-0.4/lxpanel/panel.in
---- lxde-common-0.4.orig/lxpanel/panel.in 2008-06-16 10:10:24.000000000 +0200
-+++ lxde-common-0.4/lxpanel/panel.in 2009-05-18 01:49:31.000000000 +0200
+--- lxde-common-0.4.orig/lxpanel/panel.in
++++ lxde-common-0.4/lxpanel/panel.in
@@ -13,9 +13,9 @@
alpha=0
setdocktype=1
@@ -27,7 +27,7 @@ diff -dur lxde-common-0.4.orig/lxpanel/p
type = menu
Config {
- image=@prefix@/share/lxde/images/lxde-icon.png
-+ image=fedora-logo-icon.png
++ image=start-here.png
system {
}
separator {
@@ -53,16 +53,25 @@ diff -dur lxde-common-0.4.orig/lxpanel/p
}
}
}
-@@ -131,11 +135,6 @@
+@@ -122,6 +126,10 @@
}
Plugin {
-- type = launchbar
-- Config {
-- Button {
-- id=lxde-logout.desktop
-- }
-- }
+ type = volumealsa
- }
-
++}
++
++Plugin {
+ type = dclock
+ Config {
+ ClockFmt=%R
+@@ -134,6 +142,9 @@
+ type = launchbar
+ Config {
+ Button {
++ id=lxde-lock-screen.desktop
++ }
++ Button {
+ id=lxde-logout.desktop
+ }
+ }
+
Index: lxde-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/F-10/lxde-common.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- lxde-common.spec 23 May 2009 00:59:44 -0000 1.4
+++ lxde-common.spec 25 Jul 2009 03:17:21 -0000 1.5
@@ -1,7 +1,7 @@
# Review: https://bugzilla.redhat.com/show_bug.cgi?id=442270
Name: lxde-common
-Version: 0.4.1
+Version: 0.4.2
Release: 1%{?dist}
Summary: Default configuration files for LXDE
@@ -9,11 +9,15 @@ Group: User Interface/Desktops
License: GPLv2+
URL: http://lxde.sourceforge.net/
Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.bz2
+Source1: lxde-lock-screen.desktop
+# fix lxde-logout.desktop
+Patch6: %{name}-0.4-lxde-logout.desktop.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
+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
@@ -21,6 +25,7 @@ Patch4: %{name}-0.4-pulseaudio.p
Patch5: %{name}-0.3.2.1-gdm-number-of-desktops.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: desktop-file-utils
Requires: lxsession lxpanel pcmanfm openbox xdg-utils
Requires: lxmenu-data lxde-settings-daemon
# Use vendor's artwork
@@ -44,13 +49,26 @@ This package contains the configuration
Desktop Environment.
+%package -n lxde-icon-theme
+Summary: Default icon theme for LXDE
+Group: User Interface/Desktops
+License: LGPLv3
+URL: http://nuovext.pwsp.net/
+
+%description -n lxde-icon-theme
+nuoveXT is a very complete set of icons for Linux, Mac OS X and Windows. It is
+also the default icon-theme of LXDE, the Lightweight X11 Desktop Environment.
+
+
%prep
%setup -q
%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
@@ -63,16 +81,35 @@ Desktop Environment.
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
-# the icon theme is packaged in a different package
-rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/nuoveXT2/
# only used by obsolete lxsession, not lxsession-lite
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/lxsession/LXDE/default
+desktop-file-install \
+ --dir=%{buildroot}%{_datadir}/applications \
+ lxde-logout.desktop
+desktop-file-install \
+ --dir=%{buildroot}%{_datadir}/applications \
+ %{SOURCE1}
%clean
rm -rf $RPM_BUILD_ROOT
+%post -n lxde-icon-theme
+touch --no-create %{_datadir}/icons/nuoveXT2 &>/dev/null || :
+
+
+%postun -n lxde-icon-theme
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/nuoveXT2 &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/nuoveXT2 &>/dev/null || :
+fi
+
+
+%posttrans -n lxde-icon-theme
+gtk-update-icon-cache %{_datadir}/icons/nuoveXT2 &>/dev/null || :
+
+
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING
@@ -86,9 +123,26 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/lxpanel/profile/LXDE/
%{_mandir}/man1/*.1.gz
%{_datadir}/xsessions/LXDE.desktop
+%{_datadir}/applications/lxde-*.desktop
+
+%files -n lxde-icon-theme
+%doc icon-theme/AUTHORS icon-theme/COPYING
+%defattr(-,root,root,-)
+%{_datadir}/icons/nuoveXT2/
%changelog
+* Sat Jul 25 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-1
+- Update to 0.4.2
+- Disable OLPC keyboard shortcuts for now, they interfere with OpenOffice
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat Jun 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.1-3
+- Add XO keyboard shortcuts
+
+* Sat Jun 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.1-2
+- Include logout and screenlock buttons (#503919)
+
* Mon May 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.1-1
- Update to 0.4.1
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 23 May 2009 00:59:44 -0000 1.4
+++ sources 25 Jul 2009 03:17:21 -0000 1.5
@@ -1 +1 @@
-1d71d77d331b56ab26b0c13b709d032e lxde-common-0.4.1.tar.bz2
+81978c149ef7f349d904c4796d623ee6 lxde-common-0.4.2.tar.bz2
More information about the fedora-extras-commits
mailing list