lxde/lxde-common
SHA256
7
0
Fork 0
forked from pool/lxde-common
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxde-common?expand=0&rev=36

Browse Source
This commit is contained in:
andrea florio
2010-03-01 11:36:08 +00:00
committed by Git OBS Bridge
parent 134c38db0e
commit 4129396ad6
4 changed files with 162 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
lxde-common-0.5.0-pcmanfm2.patch Normal file
View File

@@ -0,0 +1,141 @@
diff -uNr old-lxde-common-0.5.0//autostart lxde-common-0.5.0/autostart
--- old-lxde-common-0.5.0//autostart 2009-07-14 13:39:53.000000000 +0200
+++ lxde-common-0.5.0/autostart 2010-03-01 12:27:34.375252635 +0100
@@ -1,3 +1,3 @@
@xscreensaver -no-splash
@lxpanel --profile LXDE
-@pcmanfm -d
+@pcmanfm --desktop
diff -uNr old-lxde-common-0.5.0//configure lxde-common-0.5.0/configure
--- old-lxde-common-0.5.0//configure 2009-12-10 18:22:09.000000000 +0100
+++ lxde-common-0.5.0/configure 2010-03-01 12:36:00.693000757 +0100
@@ -2385,7 +2385,7 @@
fi
-ac_config_files="$ac_config_files Makefile startlxde lxde-logout LXDE.desktop lxde-logout.desktop lxpanel/panel openbox/rc.xml openbox-lxde pcmanfm/main.lxde man/Makefile"
+ac_config_files="$ac_config_files Makefile startlxde lxde-logout LXDE.desktop lxde-logout.desktop lxpanel/panel openbox/rc.xml openbox-lxde pcmanfm/pcmanfm.conf man/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -3097,7 +3097,7 @@
"lxpanel/panel") CONFIG_FILES="$CONFIG_FILES lxpanel/panel" ;;
"openbox/rc.xml") CONFIG_FILES="$CONFIG_FILES openbox/rc.xml" ;;
"openbox-lxde") CONFIG_FILES="$CONFIG_FILES openbox-lxde" ;;
- "pcmanfm/main.lxde") CONFIG_FILES="$CONFIG_FILES pcmanfm/main.lxde" ;;
+ "pcmanfm/pcmanfm.conf") CONFIG_FILES="$CONFIG_FILES pcmanfm/pcmanfm.conf" ;;
"man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
diff -uNr old-lxde-common-0.5.0//configure.ac lxde-common-0.5.0/configure.ac
--- old-lxde-common-0.5.0//configure.ac 2009-12-10 18:22:05.000000000 +0100
+++ lxde-common-0.5.0/configure.ac 2010-03-01 12:35:09.761002895 +0100
@@ -48,7 +48,7 @@
lxpanel/panel
openbox/rc.xml
openbox-lxde
- pcmanfm/main.lxde
+ pcmanfm/pcmanfm.conf
man/Makefile
])
diff -uNr old-lxde-common-0.5.0//Makefile.am lxde-common-0.5.0/Makefile.am
--- old-lxde-common-0.5.0//Makefile.am 2009-12-08 14:32:41.000000000 +0100
+++ lxde-common-0.5.0/Makefile.am 2010-03-01 12:25:18.802253362 +0100
@@ -33,7 +33,7 @@
pcmanfmdir=$(datadir)/lxde/pcmanfm
pcmanfm_DATA= \
- pcmanfm/main.lxde
+ pcmanfm/pcmanfm.conf
EXTRA_DIST = \
autostart \
@@ -45,7 +45,7 @@
openbox/rc.xml.in \
openbox/menu.xml \
openbox-lxde.in \
- pcmanfm/main.lxde.in \
+ pcmanfm/pcmanfm.conf.in \
$(lxpanel_DATA) \
lxpanel/panel.in
diff -uNr old-lxde-common-0.5.0//Makefile.in lxde-common-0.5.0/Makefile.in
--- old-lxde-common-0.5.0//Makefile.in 2009-12-10 18:22:09.000000000 +0100
+++ lxde-common-0.5.0/Makefile.in 2010-03-01 12:25:18.804252569 +0100
@@ -40,7 +40,7 @@
$(srcdir)/openbox-lxde.in $(srcdir)/startlxde.in \
$(top_srcdir)/configure $(top_srcdir)/lxpanel/panel.in \
$(top_srcdir)/openbox/rc.xml.in \
- $(top_srcdir)/pcmanfm/main.lxde.in AUTHORS COPYING ChangeLog \
+ $(top_srcdir)/pcmanfm/pcmanfm.conf.in AUTHORS COPYING ChangeLog \
INSTALL NEWS compile depcomp install-sh missing mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -52,7 +52,7 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES = startlxde lxde-logout LXDE.desktop \
lxde-logout.desktop lxpanel/panel openbox/rc.xml openbox-lxde \
- pcmanfm/main.lxde
+ pcmanfm/pcmanfm.conf
CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
@@ -244,7 +244,7 @@
pcmanfmdir = $(datadir)/lxde/pcmanfm
pcmanfm_DATA = \
- pcmanfm/main.lxde
+ pcmanfm/pcmanfm.conf
EXTRA_DIST = \
autostart \
@@ -256,7 +256,7 @@
openbox/rc.xml.in \
openbox/menu.xml \
openbox-lxde.in \
- pcmanfm/main.lxde.in \
+ pcmanfm/pcmanfm.conf.in \
$(lxpanel_DATA) \
lxpanel/panel.in
@@ -312,7 +312,7 @@
cd $(top_builddir) && $(SHELL) ./config.status $@
openbox-lxde: $(top_builddir)/config.status $(srcdir)/openbox-lxde.in
cd $(top_builddir) && $(SHELL) ./config.status $@
-pcmanfm/main.lxde: $(top_builddir)/config.status $(top_srcdir)/pcmanfm/main.lxde.in
+pcmanfm/pcmanfm.conf: $(top_builddir)/config.status $(top_srcdir)/pcmanfm/pcmanfm.conf.in
cd $(top_builddir) && $(SHELL) ./config.status $@
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
diff -uNr old-lxde-common-0.5.0//pcmanfm/main.lxde.in lxde-common-0.5.0/pcmanfm/main.lxde.in
--- old-lxde-common-0.5.0//pcmanfm/main.lxde.in 2008-04-20 10:24:58.000000000 +0200
+++ lxde-common-0.5.0/pcmanfm/main.lxde.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-[Desktop]
-show_wallpaper=1
-wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg
diff -uNr old-lxde-common-0.5.0//pcmanfm/pcmanfm.conf.in lxde-common-0.5.0/pcmanfm/pcmanfm.conf.in
--- old-lxde-common-0.5.0//pcmanfm/pcmanfm.conf.in 1970-01-01 01:00:00.000000000 +0100
+++ lxde-common-0.5.0/pcmanfm/pcmanfm.conf.in 2010-03-01 12:25:18.805252627 +0100
@@ -0,0 +1,20 @@
+[config]
+bm_open_method=0
+su_cmd=xdg-su -c '%s'
+
+[desktop]
+wallpaper_mode=1
+wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg
+desktop_bg=#000000
+desktop_fg=#ffffff
+desktop_shadow=#000000
+
+[ui]
+always_show_tabs=0
+hide_close_btn=0
+win_width=640
+win_height=480
+view_mode=0
+show_hidden=0
+sort_type=0
+sort_by=0

14
lxde-common-startlxde.diff
View File

@@ -1,6 +1,18 @@
diff -uNr old-lxde-common-0.5.0//startlxde.in lxde-common-0.5.0/startlxde.in
--- old-lxde-common-0.5.0//startlxde.in 2009-09-04 11:46:53.000000000 +0200
+++ lxde-common-0.5.0/startlxde.in 2010-02-09 17:36:12.345510727 +0100
+++ lxde-common-0.5.0/startlxde.in 2010-03-01 12:20:16.771002969 +0100
@@ -6,9 +6,9 @@
# Ensure the existance of pcmanfm config file
PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm"
-if [ ! -f "$PCMANFM_CONF_DIR/main.lxde" ]; then
+if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then
mkdir -p "$PCMANFM_CONF_DIR"
- cp @prefix@/share/lxde/pcmanfm/main.lxde "$PCMANFM_CONF_DIR/main.lxde"
+ cp @prefix@/share/lxde/pcmanfm/pcmanfm.conf "$PCMANFM_CONF_DIR/pcmanfm.conf"
fi
# Ensure the existance of openbox config file
@@ -21,8 +21,28 @@
# Clean up after GDM (GDM sets the number of desktops to one)
xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null

5
lxde-common.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Mar 1 11:37:31 UTC 2010 - andrea@opensuse.org
- added lxde-common-0.5.0-pcmanfm2.patch to switch to pcmanfm2
-------------------------------------------------------------------
Tue Feb 9 12:40:40 UTC 2010 - andrea@opensuse.org

4
lxde-common.spec
View File

@@ -26,6 +26,7 @@ Source0: %name-%version.tar.bz2
Source1: lxde-new-wallpapers.tar.bz2
Source2: lxde-lock-screen.desktop
Patch0: %name-startlxde.diff
Patch1: %name-0.5.0-pcmanfm2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf automake gtk2-devel intltool pkg-config update-desktop-files
BuildRequires: docbook-utils docbook-xsl-stylesheets fdupes libxslt
@@ -57,6 +58,7 @@ lxde-common-branding and prefer openSUSE defaults settings.
%prep
%setup -q -n %name-%version
%patch0 -p1
%patch1 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS"
@@ -98,7 +100,7 @@ rm -rf %buildroot
%defattr(-,root,root)
%_bindir/lxde-logout
%dir %_datadir/lxde/pcmanfm
%_datadir/lxde/pcmanfm/main.lxde
%_datadir/lxde/pcmanfm/pcmanfm.conf
%dir %_datadir/lxde/openbox
%_datadir/lxde/openbox/*.xml
%dir %_datadir/lxpanel