Fri Mar 6 00:37:14 UTC 2009

Author: cwickert

Update of /cvs/pkgs/rpms/lxde-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25317

Modified Files:
	lxde-common-0.3.2.1-lxpanel-config.patch lxde-common.spec 
Added Files:
	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 
Removed Files:
	lxde-common-0.3.0.1-default-wallpaper.patch 
	lxde-common-0.3.2.1-lxpanel-mixer.patch 
	lxde-common-0.3.2.1-lxpanel-no-background-by-default.patch 
	lxde-common-0.3.2.1-lxpanel-starthere.patch 
	lxde-common-0.3.2.1-lxterminal.patch 
	lxde-common-0.3.2.1-vendor-artwork.patch noautobuild 
Log Message:
* Fri Mar 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.2.1-4
- Workaround for new gdm
- Addd Pulseaudio support
- Add mixer plugin to the panel
- Require xdg-utils


lxde-common-0.3.2.1-openbox.patch:

--- NEW FILE lxde-common-0.3.2.1-openbox.patch ---
--- lxde-common-0.3.2.1.orig/openbox/menu.xml	2008-04-20 10:26:09.000000000 +0200
+++ lxde-common-0.3.2.1/openbox/menu.xml	2008-11-30 16:42:01.000000000 +0100
@@ -2,36 +2,52 @@
 
 <openbox_menu xmlns="http://openbox.org/3.4/menu">
 
-<menu id="apps-menu" label="Applications">
+<menu id="applications-menu" label="Applications" execute="/usr/share/openbox/xdg-menu applications"/>
+<menu id="preferences-menu" label="Preferences" execute="/usr/share/openbox/xdg-menu preferences"/> 
+<menu id="administration-menu" label="Administration" execute="/usr/share/openbox/xdg-menu system-settings"/>
+
+<menu id="root-menu" label="LXDE">
+  <separator label="LXDE" />
+  <menu id="applications-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="ObConf">
+  <menu id="preferences-menu" />
+  <menu id="administration-menu"/>
+<!--  <item label="ObConf">
     <action name="Execute">
       <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="Find Files">
+    <action name="Execute">
+      <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>
-  <separator />
   <item label="Exit">
     <action name="Execute"><command>lxde-logout</command></action>
   </item>

lxde-common-0.3.2.1-pcmanfm.patch:

--- NEW FILE lxde-common-0.3.2.1-pcmanfm.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
+
+[General]
+terminal=lxterminal

lxde-common-0.3.2.1-pulseaudio.patch:

--- NEW FILE lxde-common-0.3.2.1-pulseaudio.patch ---
--- lxde-common-0.3.2.1.orig/autostart	2008-04-20 10:26:19.000000000 +0200
+++ lxde-common-0.3.2.1/autostart	2008-11-30 19:03:47.000000000 +0100
@@ -1,4 +1,5 @@
 @lxde-settings
+ at pulseaudio -D
 @xscreensaver -no-splash
 @lxpanel --profile LXDE
 @pcmanfm -d
--- lxde-common-0.3.2.1.orig/default	2008-04-20 13:20:53.000000000 +0200
+++ lxde-common-0.3.2.1/default	2008-11-30 19:04:34.000000000 +0100
@@ -1,4 +1,5 @@
 lxde-settings
+pulseaudio -D
 smproxy
 xscreensaver -no-splash
 openbox --config-file $XDG_CONFIG_HOME/openbox/lxde-rc.xml
--- lxde-common-0.3.2.1.orig/default.in	2008-04-20 10:26:19.000000000 +0200
+++ lxde-common-0.3.2.1/default.in	2008-11-30 19:04:52.000000000 +0100
@@ -1,4 +1,5 @@
 lxde-settings
+pulseaudio -D
 smproxy
 xscreensaver -no-splash
 openbox --config-file $XDG_CONFIG_HOME/openbox/lxde-rc.xml

lxde-common-0.3.2.1-vendor.patch:

--- NEW FILE lxde-common-0.3.2.1-vendor.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.orig/lxde-settings/config	2008-04-20 10:26:08.000000000 +0200
+++ lxde-common-0.3.2.1/lxde-settings/config	2008-10-10 00:25:20.000000000 +0200
@@ -4,8 +4,8 @@
 #iNet/DndDragThreshold
 #iNet/CursorBlink
 #iNet/CursorBlinkTime
-sNet/ThemeName=Clearlooks
-sNet/IconThemeName=nuoveXT2
+sNet/ThemeName=Nodoka
+sNet/IconThemeName=Fedora
 #iGtk/CanChangeAccels=0
 #cGtk/ColorPalette
 sGtk/FontName=Sans 10
--- lxde-common-0.3.2.1.orig/lxpanel/panel.in	2008-04-20 12:09:34.000000000 +0200
+++ lxde-common-0.3.2.1/lxpanel/panel.in	2008-05-06 02:52:48.000000000 +0200
@@ -29,7 +29,7 @@
 Plugin {
     type = menu
     Config {
-        image=@prefix@/share/lxpanel/images/my-computer.png
+        image=@prefix@/share/icons/Fedora/24x24/places/start-here.png
         system {
         }
         separator {
--- lxde-common-0.3.2.1.orig/pcmanfm/main.lxde.in	2008-03-19 07:36:29.000000000 +0100
+++ lxde-common-0.3.2.1/pcmanfm/main.lxde.in	2008-04-13 05:25:51.000000000 +0200
@@ -1,6 +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.3.2.1-lxpanel-config.patch:

Index: lxde-common-0.3.2.1-lxpanel-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/devel/lxde-common-0.3.2.1-lxpanel-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lxde-common-0.3.2.1-lxpanel-config.patch	10 Oct 2008 23:51:57 -0000	1.1
+++ lxde-common-0.3.2.1-lxpanel-config.patch	6 Mar 2009 00:37:13 -0000	1.2
@@ -1,5 +1,25 @@
+--- lxde-common-0.3.2.1.orig/lxpanel/config	2008-04-20 11:25:36.000000000 +0200
++++ lxde-common-0.3.2.1/lxpanel/config	2008-05-06 02:03:45.000000000 +0200
+@@ -1,4 +1,4 @@
+ [Command]
+ FileManager=pcmanfm %s
+-Terminal=xterm -e
++Terminal=lxterminal -e
+ 
 --- lxde-common-0.3.2.1.orig/lxpanel/panel.in	2008-04-20 12:09:34.000000000 +0200
-+++ lxde-common-0.3.2.1/lxpanel/panel.in	2008-05-06 02:55:12.000000000 +0200
++++ lxde-common-0.3.2.1/lxpanel/panel.in	2008-10-10 01:11:31.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
+ }
+ 
 @@ -35,6 +35,7 @@
          separator {
          }
@@ -8,7 +28,7 @@
              command=run
          }
          separator {
-@@ -50,13 +50,13 @@
+@@ -50,13 +51,13 @@
      type = launchbar
      Config {
          Button {
@@ -16,7 +36,8 @@
 +            id=fedora-pcmanfm.desktop
          }
          Button {
-             id=gnome-terminal.desktop
+-            id=gnome-terminal.desktop
++            id=fedora-lxterminal.desktop
          }
          Button {
 -            id=firefox.desktop
@@ -24,3 +45,11 @@
          }
      }
  }
+@@ -133,3 +134,7 @@
+     }
+ }
+ 
++Plugin {
++    type = volumealsa
++}
++


Index: lxde-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/devel/lxde-common.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lxde-common.spec	1 Nov 2008 02:53:36 -0000	1.2
+++ lxde-common.spec	6 Mar 2009 00:37:13 -0000	1.3
@@ -1,30 +1,29 @@
 Name:           lxde-common
 Version:        0.3.2.1
 Release:        4%{?dist}
-Summary:        Default configuration files for LXDE
-Summary(de):    Konfigurationsdateien fÃ¼r LXDE
+Summary:        Settings manager 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-lxpanel-mixer.patch
-Patch2:         %{name}-0.3.2.1-lxterminal.patch
-Patch3:         %{name}-0.3.2.1-lxpanel-no-background-by-default.patch
+Patch1:         %{name}-0.3.2.1-openbox.patch
+Patch2:         %{name}-0.3.2.1-pcmanfm.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.0.1-default-wallpaper.patch
-Patch11:         %{name}-0.3.2.1-vendor-artwork.patch
-Patch12:         %{name}-0.3.2.1-lxpanel-starthere.patch
+Patch10:         %{name}-0.3.2.1-vendor.patch
+# Pulseaudio
+Patch11:         %{name}-0.3.2.1-pulseaudio.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pkgconfig glib2-devel libX11-devel
-Requires:       lxsession lxpanel pcmanfm openbox
+Requires:       lxsession lxpanel pcmanfm openbox xdg-utils
+Requires:       %{name}-data = %{version}-%{release}
 # Use vendor's artwork
-Requires:       gtk-nodoka-engine fedora-icon-theme
+Requires:       gtk-nodoka-engine fedora-icon-theme system-logos
 %if 0%{?fedora} < 9
 Requires:       desktop-backgrounds-basic
 %else
@@ -35,26 +34,29 @@
 
 
 %description
-This package contains the configuration files for LXDE, the Lightweight X11 
-Desktop Environment.
+This package the settings-manger for LXDE, the Lightweight X11 Desktop 
+Environment.
 
-%description -l de
-Dieses Paket enthÃ¤lt die Konfigurationsdateien fÃ¼r LXDE, die leichtgewichtige 
-X11 Desktop Umgebung.
+%package        data
+Summary:        Default configuration files for LXDE
+Group:          User Interface/Desktops
+Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
 
+%description    data
+This package contains the configuration files for LXDE, the Lightweight X11 
+Desktop Environment.
 
 %prep
 %setup -q
-%patch0 -p1 -b .panel-config
-%patch1 -p1 -b .mixer
-%patch2 -p1 -b .lxterminal
-%patch3 -p1 -b .no-background
-%if 0%{?fedora} < 9
+%patch0 -p1 -b .orig
+%patch1 -p1 -b .orig
+%patch2 -p1 -b .orig
+%if 0%{?fedora} > 8
 %patch4 -p1 -b .gdm-desktops
 %endif
-%patch10 -p1 -b .default-wallpaper
-%patch11 -p1 -b .vendor
-%patch12 -p1 -b .starthere
+%patch10 -p1 -b .vendor
+%patch11 -p1 -b .pulseaudio
 
 
 %build
@@ -77,13 +79,17 @@
 %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}/lxde-settings
 %{_bindir}/openbox-lxde
 
 %{_datadir}/lxde/
@@ -92,12 +98,16 @@
 %{_usr}/share/xsessions/LXDE.desktop
 
 
+
 %changelog
-* Sat Nov 01 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.2.1-4
+* Fri Mar 06 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.2.1-4
 - Workaround for new gdm
+- Addd Pulseaudio support
+- Add mixer plugin to the panel
+- Require xdg-utils
 
 * Fri Oct 10 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.2.1-3
-- Require fedora-icon-theme and fedora-logos
+- Require fedora-icon-theme and system-logos
 
 * Thu Oct 09 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.2.1-2
 - Rebase patches for rpm's new fuzz=0 behaviour


--- lxde-common-0.3.0.1-default-wallpaper.patch DELETED ---


--- lxde-common-0.3.2.1-lxpanel-mixer.patch DELETED ---


--- lxde-common-0.3.2.1-lxpanel-no-background-by-default.patch DELETED ---


--- lxde-common-0.3.2.1-lxpanel-starthere.patch DELETED ---


--- lxde-common-0.3.2.1-lxterminal.patch DELETED ---


--- lxde-common-0.3.2.1-vendor-artwork.patch DELETED ---


--- noautobuild DELETED ---


