rpms/lxde-common/F-10 lxde-common-0.4-lxpanel-config.patch, 1.1, 1.2 lxde-common.spec, 1.3, 1.4 sources, 1.3, 1.4

[Christoph Wickert]

Author: cwickert

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

Modified Files:
	lxde-common-0.4-lxpanel-config.patch lxde-common.spec sources 
Log Message:
* Mon May 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.1-1
- Update to 0.4.1


lxde-common-0.4-lxpanel-config.patch:

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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lxde-common-0.4-lxpanel-config.patch	3 May 2009 09:38:18 -0000	1.1
+++ lxde-common-0.4-lxpanel-config.patch	23 May 2009 00:59:44 -0000	1.2
@@ -9,7 +9,7 @@ diff -dur lxde-common-0.4.orig/lxpanel/c
  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
++++ lxde-common-0.4/lxpanel/panel.in	2009-05-18 01:49:31.000000000 +0200
 @@ -13,9 +13,9 @@
      alpha=0
      setdocktype=1
@@ -53,11 +53,16 @@ diff -dur lxde-common-0.4.orig/lxpanel/p
          }
      }
  }
-@@ -139,3 +143,7 @@
-     }
+@@ -131,11 +135,6 @@
  }
  
-+Plugin {
+ Plugin {
+-    type = launchbar
+-    Config {
+-        Button {
+-            id=lxde-logout.desktop
+-        }
+-    }
 +    type = volumealsa
-+}
-+
+ }
+ 


Index: lxde-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/F-10/lxde-common.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- lxde-common.spec	3 May 2009 09:38:19 -0000	1.3
+++ lxde-common.spec	23 May 2009 00:59:44 -0000	1.4
@@ -1,5 +1,7 @@
+# Review: https://bugzilla.redhat.com/show_bug.cgi?id=442270
+
 Name:           lxde-common
-Version:        0.4
+Version:        0.4.1
 Release:        1%{?dist}
 Summary:        Default configuration files for LXDE
 
@@ -30,10 +32,11 @@ Requires:       desktop-backgrounds-comp
 # needed for new gdm workaround
 Requires:       wmctrl
 %endif
-Provides:       %{name}-data = %{version}-%{release}
-# needed because the lxde-common-data required its main package with full n-v-r
-Provides:       %{name}-data = 0.3.2.1-4
-Obsoletes:      %{name}-data <= 0.3.2.1-4
+Obsoletes:      %{name}-data <= 0.3.2.1-5
+# needed because the lxde-common and lxde-common-data 
+# required each other with full n-v-r on F-11
+Provides:       %{name} = 0.3.2.1-4.fc11
+Provides:       %{name}-data = 0.3.2.1-4.fc11
 BuildArch:      noarch
 
 %description
@@ -86,6 +89,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon May 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.1-1
+- Update to 0.4.1
+
+* Mon May 11 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4-2
+- Fix Provides to allow proper upgrade
+
 * Tue Apr 28 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4-1
 - Update to 0.4
 - Require lxmenu-data and lxde-settings-daemon


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	3 May 2009 09:38:19 -0000	1.3
+++ sources	23 May 2009 00:59:44 -0000	1.4
@@ -1 +1 @@
-aa16d649ecb9b42ac52eec5c125b7084  lxde-common-0.4.tar.bz2
+1d71d77d331b56ab26b0c13b709d032e  lxde-common-0.4.1.tar.bz2