rpms/lxde-common/F-11 lxde-common-0.3.2.1-logout-banner.patch, NONE, 1.1 lxde-common-0.3.2.1-pcmanfm-config.patch, NONE, 1.1 lxde-common-0.4-lxpanel-config.patch, NONE, 1.1 lxde-common-0.4-openbox-menu.patch, NONE, 1.1 lxde-common-0.4-pulseaudio.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 lxde-common.spec, 1.3, 1.4 sources, 1.2, 1.3 lxde-common-0.3.2.1-lxpanel-config.patch, 1.2, NONE lxde-common-0.3.2.1-openbox.patch, 1.1, NONE lxde-common-0.3.2.1-pcmanfm.patch, 1.1, NONE lxde-common-0.3.2.1-pulseaudio.patch, 1.1, NONE lxde-common-0.3.2.1-vendor.patch, 1.1, NONE
Christoph Wickert
cwickert at fedoraproject.org
Wed Apr 29 18:41:56 UTC 2009
Author: cwickert
Update of /cvs/pkgs/rpms/lxde-common/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1469
Modified Files:
.cvsignore lxde-common.spec sources
Added Files:
lxde-common-0.3.2.1-logout-banner.patch
lxde-common-0.3.2.1-pcmanfm-config.patch
lxde-common-0.4-lxpanel-config.patch
lxde-common-0.4-openbox-menu.patch
lxde-common-0.4-pulseaudio.patch
Removed Files:
lxde-common-0.3.2.1-lxpanel-config.patch
lxde-common-0.3.2.1-openbox.patch
lxde-common-0.3.2.1-pcmanfm.patch
lxde-common-0.3.2.1-pulseaudio.patch
lxde-common-0.3.2.1-vendor.patch
Log Message:
* Tue Apr 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4-1
- Update to 0.4
- Require lxmenu-data and lxde-settings-daemon
- Drop obsolete config file /etc/xdg/lxsession/LXDE/default
lxde-common-0.3.2.1-logout-banner.patch:
--- NEW FILE lxde-common-0.3.2.1-logout-banner.patch ---
--- lxde-common-0.3.2.1.orig/lxde-logout.in 2008-04-20 10:26:19.000000000 +0200
+++ lxde-common-0.3.2.1/lxde-logout.in 2008-11-30 17:08:25.000000000 +0100
@@ -1,2 +1,2 @@
#!/bin/sh
-lxsession-logout --banner "@prefix@/share/lxde/images/logout-banner.png" --side=top
+lxsession-logout --banner "@prefix@/share/pixmaps/fedora-logo-small.png" --side=top
lxde-common-0.3.2.1-pcmanfm-config.patch:
--- NEW FILE lxde-common-0.3.2.1-pcmanfm-config.patch ---
diff -dur lxde-common-0.3.2.1.orig/pcmanfm/main.lxde.in lxde-common-0.3.2.1/pcmanfm/main.lxde.in
--- lxde-common-0.3.2.1.orig/pcmanfm/main.lxde.in 2008-04-20 10:24:58.000000000 +0200
+++ lxde-common-0.3.2.1/pcmanfm/main.lxde.in 2008-05-06 02:13:16.000000000 +0200
@@ -1,3 +1,6 @@
[Desktop]
show_wallpaper=1
-wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg
+wallpaper=@prefix@/share/backgrounds/images/default.png
+
+[General]
+terminal=lxterminal
lxde-common-0.4-lxpanel-config.patch:
--- NEW FILE lxde-common-0.4-lxpanel-config.patch ---
diff -dur lxde-common-0.4.orig/lxpanel/config lxde-common-0.4/lxpanel/config
--- lxde-common-0.4.orig/lxpanel/config 2008-06-16 10:10:24.000000000 +0200
+++ lxde-common-0.4/lxpanel/config 2009-04-28 22:11:13.000000000 +0200
@@ -1,4 +1,4 @@
[Command]
FileManager=pcmanfm %s
-Terminal=xterm -e
+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-04-29 00:27:56.000000000 +0200
@@ -13,9 +13,9 @@
alpha=0
setdocktype=1
setpartialstrut=1
- usefontcolor=1
+ usefontcolor=0
fontcolor=#ffffff
- background=1
+ background=0
backgroundfile=@prefix@/share/lxpanel/images/background.png
}
@@ -29,12 +29,13 @@
Plugin {
type = menu
Config {
- image=@prefix@/share/lxde/images/lxde-icon.png
+ image=fedora-logo-icon.png
system {
}
separator {
}
item {
+ image=gnome-run
command=run
}
separator {
@@ -50,10 +51,13 @@
type = launchbar
Config {
Button {
- id=pcmanfm.desktop
+ id=fedora-pcmanfm.desktop
}
Button {
- id=firefox.desktop
+ id=fedora-lxterminal.desktop
+ }
+ Button {
+ id=mozilla-firefox.desktop
}
}
}
@@ -139,3 +143,7 @@
}
}
+Plugin {
+ type = volumealsa
+}
+
lxde-common-0.4-openbox-menu.patch:
--- NEW FILE lxde-common-0.4-openbox-menu.patch ---
--- lxde-common-0.4.orig/openbox/menu.xml 2008-07-16 04:20:32.000000000 +0200
+++ lxde-common-0.4/openbox/menu.xml 2009-04-28 23:25:47.000000000 +0200
@@ -2,38 +2,49 @@
<openbox_menu xmlns="http://openbox.org/3.4/menu">
-<menu id="apps-menu" label="Applications">
+<menu id="apps-menu" label="Applications" execute="/usr/share/openbox/xdg-menu applications"/>
+<menu id="prefs-menu" label="Preferences" execute="/usr/share/openbox/xdg-menu preferences"/>
+<menu id="admin-menu" label="Administration" execute="/usr/share/openbox/xdg-menu system-settings"/>
+
+<menu id="root-menu" label="LXDE">
+ <separator label="LXDE" />
+ <menu id="apps-menu" />
<item label="PCManFM">
<action name="Execute">
<startupnotify><enabled>yes</enabled><icon>pcmanfm</icon></startupnotify>
<command>pcmanfm</command></action>
</item>
- <item label="Xterm">
- <action name="Execute"><command>xterm</command></action>
+ <item label="LXTerminal">
+ <action name="Execute"><command>lxterminal</command></action>
</item>
<item label="Firefox">
<action name="Execute"><command>firefox</command></action>
</item>
-</menu>
-
-<menu id="root-menu" label="LXDE">
- <separator label="LXDE" />
- <menu id="apps-menu" />
- <separator />
+ <separator />
<menu id="client-list-menu" />
<separator />
- <item label="Desktop Settings">
+ <menu id="prefs-menu" />
+ <menu id="admin-menu"/>
+<!-- <item label="ObConf">
<action name="Execute">
- <startupnotify><enabled>yes</enabled></startupnotify>
- <command>pcmanfm --show-pref 2</command>
+ <startupnotify><enabled>yes</enabled><icon>openbox</icon></startupnotify>
+ <command>obconf</command>
+ </action>
+ </item> -->
+ <separator />
+ <item label="Run Command">
+ <action name="Execute">
+ <startupnotify><enabled>yes</enabled><icon>gtk-run</icon></startupnotify>
+ <command>lxpanelctl run</command>
</action>
</item>
- <item label="Window Management Settings">
+ <item label="Find Files">
<action name="Execute">
- <startupnotify><enabled>yes</enabled><icon>openbox</icon></startupnotify>
- <command>obconf</command>
+ <startupnotify><enabled>yes</enabled><icon>gtk-find</icon></startupnotify>
+ <command>pcmanfm -f</command>
</action>
</item>
+ <separator />
<item label="Reload Config Files">
<action name="Reconfigure" />
</item>
@@ -43,4 +54,4 @@
</item>
</menu>
-</openbox_menu>
\ Kein Zeilenumbruch am Dateiende.
+</openbox_menu>
lxde-common-0.4-pulseaudio.patch:
--- NEW FILE lxde-common-0.4-pulseaudio.patch ---
--- lxde-common-0.4.orig/autostart 2008-11-28 16:09:00.000000000 +0100
+++ lxde-common-0.4/autostart 2009-04-28 23:52:51.000000000 +0200
@@ -1,4 +1,5 @@
@lxde-settings-daemon
+ at pulseaudio -D
@xscreensaver -no-splash
@lxpanel --profile LXDE
@pcmanfm -d
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 10 Oct 2008 23:51:57 -0000 1.2
+++ .cvsignore 29 Apr 2009 18:41:54 -0000 1.3
@@ -1 +1 @@
-lxde-common-0.3.2.1.tar.bz2
+lxde-common-0.4.tar.bz2
Index: lxde-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/F-11/lxde-common.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- lxde-common.spec 6 Mar 2009 00:37:13 -0000 1.3
+++ lxde-common.spec 29 Apr 2009 18:41:55 -0000 1.4
@@ -1,29 +1,28 @@
Name: lxde-common
-Version: 0.3.2.1
-Release: 4%{?dist}
-Summary: Settings manager for LXDE
+Version: 0.4
+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
-Patch0: %{name}-0.3.2.1-lxpanel-config.patch
-Patch1: %{name}-0.3.2.1-openbox.patch
-Patch2: %{name}-0.3.2.1-pcmanfm.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
+# Pulseaudio
+Patch4: %{name}-0.4-pulseaudio.patch
# Because of new gdm
# http://icculus.org/cgi-bin/ezmlm/ezmlm-cgi?24:mss:5608:200804:keopkmedognljeggknac
-Patch4: %{name}-0.3.2.1-gdm-number-of-desktops.patch
-# Vendor specific patches
-Patch10: %{name}-0.3.2.1-vendor.patch
-# Pulseaudio
-Patch11: %{name}-0.3.2.1-pulseaudio.patch
+Patch5: %{name}-0.3.2.1-gdm-number-of-desktops.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: pkgconfig glib2-devel libX11-devel
-Requires: lxsession lxpanel pcmanfm openbox xdg-utils
-Requires: %{name}-data = %{version}-%{release}
+Requires: lxsession lxpanel lxmenu-data pcmanfm openbox xdg-utils
+Requires: lxde-settings-daemon >= %{version}
# Use vendor's artwork
-Requires: gtk-nodoka-engine fedora-icon-theme system-logos
+Requires: system-logos
%if 0%{?fedora} < 9
Requires: desktop-backgrounds-basic
%else
@@ -31,37 +30,29 @@ Requires: desktop-backgrounds-comp
# needed for new gdm workaround
Requires: wmctrl
%endif
-
-
-%description
-This package the settings-manger for LXDE, the Lightweight X11 Desktop
-Environment.
-
-%package data
-Summary: Default configuration files for LXDE
-Group: User Interface/Desktops
-Requires: %{name} = %{version}-%{release}
+Provides: %{name}-data = %{version}-%{release}
+Obsoletes: %{name}-data <= 0.3.2.1-5
BuildArch: noarch
-%description data
+%description
This package contains the configuration files for LXDE, the Lightweight X11
Desktop Environment.
+
%prep
%setup -q
-%patch0 -p1 -b .orig
-%patch1 -p1 -b .orig
-%patch2 -p1 -b .orig
+%patch10 -p1 -b .orig
+%patch11 -p1 -b .orig
+%patch12 -p1 -b .orig
+%patch13 -p1 -b .logout-banner
+%patch4 -p1 -b .pulseaudio
%if 0%{?fedora} > 8
-%patch4 -p1 -b .gdm-desktops
+%patch5 -p1 -b .gdm-desktops
%endif
-%patch10 -p1 -b .vendor
-%patch11 -p1 -b .pulseaudio
%build
%configure
-make %{?_smp_mflags}
%install
@@ -69,6 +60,8 @@ 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
%clean
@@ -79,30 +72,26 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%dir %{_sysconfdir}/xdg/lxsession/LXDE/
-%{_bindir}/lxde-settings
-
-%files data
-%defattr(-,root,root,-)
-%dir %{_sysconfdir}/xdg/lxsession/LXDE/
-%config(noreplace) %{_sysconfdir}/xdg/lxsession/LXDE/default
%config(noreplace) %{_sysconfdir}/xdg/lxsession/LXDE/autostart
%config(noreplace) %{_sysconfdir}/xdg/lxsession/LXDE/config
-
%{_bindir}/startlxde
%{_bindir}/lxde-logout
%{_bindir}/openbox-lxde
-
-%{_datadir}/lxde/
+%{_datadir}/lxde/*
%{_datadir}/lxpanel/profile/LXDE/
%{_mandir}/man1/*.1.gz
-%{_usr}/share/xsessions/LXDE.desktop
-
+%{_datadir}/xsessions/LXDE.desktop
%changelog
+* Tue Apr 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4-1
+- Update to 0.4
+- Require lxmenu-data and lxde-settings-daemon
+- Drop obsolete config file /etc/xdg/lxsession/LXDE/default
+
* Fri Mar 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.2.1-4
- Workaround for new gdm
-- Addd Pulseaudio support
+- Add Pulseaudio support
- Add mixer plugin to the panel
- Require xdg-utils
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 10 Oct 2008 23:51:57 -0000 1.2
+++ sources 29 Apr 2009 18:41:55 -0000 1.3
@@ -1 +1 @@
-f30eee998071ace04e7be33aa8ac6a5b lxde-common-0.3.2.1.tar.bz2
+aa16d649ecb9b42ac52eec5c125b7084 lxde-common-0.4.tar.bz2
--- lxde-common-0.3.2.1-lxpanel-config.patch DELETED ---
--- lxde-common-0.3.2.1-openbox.patch DELETED ---
--- lxde-common-0.3.2.1-pcmanfm.patch DELETED ---
--- lxde-common-0.3.2.1-pulseaudio.patch DELETED ---
--- lxde-common-0.3.2.1-vendor.patch DELETED ---
More information about the fedora-extras-commits
mailing list