rpms/lxde-common/F-12 lxde-common-0.4-lxpanel-config.patch, 1.4, 1.5 lxde-common.spec, 1.13, 1.14

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/lxde-common/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19612

Modified Files:
	lxde-common-0.4-lxpanel-config.patch lxde-common.spec 
Log Message:
* Tue Oct 27 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
- Final tweaks for the LXDE Spin


lxde-common-0.4-lxpanel-config.patch:
 config   |    2 +-
 panel.in |   14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

Index: lxde-common-0.4-lxpanel-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/F-12/lxde-common-0.4-lxpanel-config.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- lxde-common-0.4-lxpanel-config.patch	25 Jul 2009 02:02:13 -0000	1.4
+++ lxde-common-0.4-lxpanel-config.patch	27 Oct 2009 00:16:19 -0000	1.5
@@ -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=start-here.png
++        image=@prefix@/share/icons/Bluecurve/24x24/apps/icon-panel-menu.png
          system {
          }
          separator {
@@ -37,7 +37,7 @@ diff -dur lxde-common-0.4.orig/lxpanel/p
              command=run
          }
          separator {
-@@ -50,10 +51,13 @@
+@@ -50,10 +51,10 @@
      type = launchbar
      Config {
          Button {
@@ -47,24 +47,10 @@ diff -dur lxde-common-0.4.orig/lxpanel/p
          Button {
 -            id=firefox.desktop
 +            id=fedora-lxterminal.desktop
-+        }
-+        Button {
-+            id=mozilla-firefox.desktop
          }
      }
  }
-@@ -122,6 +126,10 @@
- }
- 
- Plugin {
-+    type = volumealsa
-+}
-+
-+Plugin {
-     type = dclock
-     Config {
-         ClockFmt=%R
-@@ -134,6 +142,9 @@
+@@ -134,6 +135,9 @@
      type = launchbar
      Config {
          Button {


Index: lxde-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/F-12/lxde-common.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- lxde-common.spec	25 Jul 2009 02:02:13 -0000	1.13
+++ lxde-common.spec	27 Oct 2009 00:16:19 -0000	1.14
@@ -2,7 +2,7 @@
 
 Name:           lxde-common
 Version:        0.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Default configuration files for LXDE
 
 Group:          User Interface/Desktops
@@ -20,8 +20,7 @@ Patch13:        %{name}-0.3.2.1-logout-b
 Patch14:        %{name}-0.4-olpc-keyboard-shortcuts.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
+# Because of new gdm, committed to upstream SVN
 Patch5:         %{name}-0.3.2.1-gdm-number-of-desktops.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,8 +33,8 @@ Requires:       system-logos
 Requires:       desktop-backgrounds-basic
 %else
 Requires:       desktop-backgrounds-compat
-# needed for new gdm workaround
-Requires:       wmctrl
+# needed for new gdm fix
+Requires:       xorg-x11-utils
 %endif
 Obsoletes:      %{name}-data <= 0.3.2.1-5
 # needed because the lxde-common and lxde-common-data 
@@ -49,17 +48,6 @@ 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
@@ -81,35 +69,20 @@ also the default icon-theme of LXDE, the
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
-# 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}
+# the icon theme is packaged in a different package
+rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/
 
 
 %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
@@ -125,13 +98,11 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_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
+* Tue Oct 27 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-2
+- Final tweaks for the LXDE Spin
+
 * 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