rpms/lxde-common/devel lxde-common-0.4-lxde-logout.desktop.patch, NONE, 1.1 lxde-common-0.4-lxpanel-config.patch, 1.2, 1.3 lxde-common.spec, 1.8, 1.9
Christoph Wickert
cwickert at fedoraproject.org
Sat Jun 13 17:40:16 UTC 2009
- Previous message: rpms/kanatest/F-10 .cvsignore, 1.4, 1.5 kanatest.spec, 1.12, 1.13 sources, 1.4, 1.5 kanatest.desktop, 1.2, NONE
- Next message: rpms/libpng/F-10 .cvsignore, 1.19, 1.20 libpng.spec, 1.50, 1.51 sources, 1.19, 1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: cwickert
Update of /cvs/pkgs/rpms/lxde-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8065
Modified Files:
lxde-common-0.4-lxpanel-config.patch lxde-common.spec
Added Files:
lxde-common-0.4-lxde-logout.desktop.patch
Log Message:
* Mon May 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.1-2
- Include logout and screenlock buttons (#503919)
lxde-common-0.4-lxde-logout.desktop.patch:
--- NEW FILE lxde-common-0.4-lxde-logout.desktop.patch ---
--- lxde-common-0.4.orig/lxde-logout.desktop.in 2008-11-11 10:47:06.000000000 +0100
+++ lxde-common-0.4/lxde-logout.desktop.in 2009-06-13 18:44:37.000000000 +0200
@@ -1,9 +1,14 @@
[Desktop Entry]
Encoding=UTF-8
+Type=Application
Name=Logout
+Name[de]=Abmelden
+Name[fr]=Déconnexion
Name[zh_TW]=ç»åº
Name[fi]=Kirjaudu ulos
Comment=Logout, shutdown or reboot
+Comment[de]=Abmelden, herunterfahren oder neu starten
+Comment[fr]=Déconnexion, arrêter ou redémarrer
Comment[zh_TW]=ç»åºãéæ©ãæéæ°éæ©
Comment[fi]=Kirjaudu ulos, sammuta tai käynnistä tietokone uudelleen
Icon=stock_exit
lxde-common-0.4-lxpanel-config.patch:
Index: lxde-common-0.4-lxpanel-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/devel/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 20 May 2009 00:13:43 -0000 1.2
+++ lxde-common-0.4-lxpanel-config.patch 13 Jun 2009 17:39:45 -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
@@ -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/devel/lxde-common.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- lxde-common.spec 20 May 2009 00:13:43 -0000 1.8
+++ lxde-common.spec 13 Jun 2009 17:39:45 -0000 1.9
@@ -2,13 +2,16 @@
Name: lxde-common
Version: 0.4.1
-Release: 1%{?dist}
+Release: 2%{?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
+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
@@ -51,6 +54,7 @@ Desktop Environment.
%patch12 -p1 -b .orig
%patch13 -p1 -b .logout-banner
%patch4 -p1 -b .pulseaudio
+%patch6 -p1 -b .desktop
%if 0%{?fedora} > 8
%patch5 -p1 -b .gdm-desktops
%endif
@@ -67,6 +71,12 @@ make install DESTDIR=$RPM_BUILD_ROOT INS
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
@@ -86,9 +96,13 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/lxpanel/profile/LXDE/
%{_mandir}/man1/*.1.gz
%{_datadir}/xsessions/LXDE.desktop
+%{_datadir}/applications/lxde-*.desktop
%changelog
+* Mon May 18 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
- Previous message: rpms/kanatest/F-10 .cvsignore, 1.4, 1.5 kanatest.spec, 1.12, 1.13 sources, 1.4, 1.5 kanatest.desktop, 1.2, NONE
- Next message: rpms/libpng/F-10 .cvsignore, 1.19, 1.20 libpng.spec, 1.50, 1.51 sources, 1.19, 1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list