rpms/lxde-common/F-13 lxde-common-0.5.5-pcmanfm2-finally-re-renamed-to-pcmanfm.patch, NONE, 1.1 lxde-common-0.5.1-pulseaudio.patch, 1.1, 1.2 lxde-common.spec, 1.18, 1.19

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/lxde-common/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13759/F-13

Modified Files:
	lxde-common-0.5.1-pulseaudio.patch lxde-common.spec 
Added Files:
	lxde-common-0.5.5-pcmanfm2-finally-re-renamed-to-pcmanfm.patch 
Log Message:
* Sun Jun 13 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.4-2
- Adjusting autostart to respect pcmanfm 0.9.7 side rename
  (that pcmanfm2 binary was renamed to pcmanfm) (#603468)
- Explicitly call autotools before configure


lxde-common-0.5.5-pcmanfm2-finally-re-renamed-to-pcmanfm.patch:
 autostart |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE lxde-common-0.5.5-pcmanfm2-finally-re-renamed-to-pcmanfm.patch ---
commit 908f14c74766eb237afda780237db67e7798da0b
Author: Andrea Florio <anubis at suse-netbook.site>
Date:   Tue May 25 23:56:07 2010 +0200

    pcmanfm2 has been finally re-named as pcmanfm

diff --git a/autostart b/autostart
index 5c5aee3..d5b6514 100644
--- a/autostart
+++ b/autostart
@@ -1,3 +1,3 @@
 @lxpanel --profile LXDE
- at pcmanfm2 --desktop --profile lxde
+ at pcmanfm --desktop --profile lxde
 @xscreensaver -no-splash

lxde-common-0.5.1-pulseaudio.patch:
 autostart |    1 +
 1 file changed, 1 insertion(+)

Index: lxde-common-0.5.1-pulseaudio.patch
===================================================================
RCS file: /cvs/extras/rpms/lxde-common/F-13/lxde-common-0.5.1-pulseaudio.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lxde-common-0.5.1-pulseaudio.patch	25 Mar 2010 16:10:13 -0000	1.1
+++ lxde-common-0.5.1-pulseaudio.patch	13 Jun 2010 16:46:47 -0000	1.2
@@ -2,6 +2,6 @@
 +++ lxde-common-0.5.0/autostart	2010-03-25 15:16:14.000000000 +0100
 @@ -1,3 +1,4 @@
  @lxpanel --profile LXDE
- @pcmanfm2 --desktop --profile lxde
+ @pcmanfm --desktop --profile lxde
  @xscreensaver -no-splash
 + at pulseaudio -D


Index: lxde-common.spec
===================================================================
RCS file: /cvs/extras/rpms/lxde-common/F-13/lxde-common.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- lxde-common.spec	29 Apr 2010 11:34:08 -0000	1.18
+++ lxde-common.spec	13 Jun 2010 16:46:47 -0000	1.19
@@ -2,7 +2,7 @@
 
 Name:           lxde-common
 Version:        0.5.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Default configuration files for LXDE
 
 Group:          User Interface/Desktops
@@ -26,6 +26,12 @@ Patch5:         lxde-common-0.5.1-switch
 Patch7:         lxde-common-0.5.1-Properly-set-XDG_MENU_PREFIX.patch
 # http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxde-common;a=commit;h=bf7093b8c45c7a38a2f42ddb61135fca7566ff5e
 Patch8:         lxde-common-0.5.1-Fix-config-file-of-pcmanfm2.patch
+# http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxde-common;a=commit;h=908f14c74766eb237afda780237db67e7798da0b
+# pcmanfm 0.9.7 finally re-renamed pcmanfm2 binary to "pcmanfm"
+# Adjusting contents in autostart file
+# bug 603468
+# This patch contains patch-to-patch part for Patch8
+Patch9:         lxde-common-0.5.5-pcmanfm2-finally-re-renamed-to-pcmanfm.patch
 # Distro specific patches
 Patch10:        %{name}-0.5.1-pcmanfm-config.patch
 Patch11:        %{name}-0.5.0-lxpanel-config.patch
@@ -71,6 +77,8 @@ Desktop Environment.
 %patch5 -p1 -b .pcmanfm2
 %patch7 -p1 -b .menu-prefix
 %patch8 -p1 -b .fix-pcmanfm2
+%patch9 -p1 -b .pcmanfm2_2_pcmanfm
+
 %patch10 -p1 -b .orig
 %patch11 -p1 -b .orig
 %patch12 -p1 -b .orig
@@ -78,6 +86,10 @@ Desktop Environment.
 %patch14 -p1 -b .pulseaudio
 %patch15 -p1 -b .vendor
 
+# Calling autotools must be done before executing
+# configure if needed
+autoreconf -fi
+
 %build
 %configure
 
@@ -119,6 +131,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jun 13 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.4-2
+- Adjusting autostart to respect pcmanfm 0.9.7 side rename
+  (that pcmanfm2 binary was renamed to pcmanfm) (#603468)
+- Explicitly call autotools before configure
+
 * Thu Apr 29 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.4-1
 - Bump version to 0.5.4 to indicate changes for pcmanfm2
 - Adjustments for recent Goddard artwork changes