Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=wipv.git;a=commitdiff;h=c04fde33ae634fea214767d61e5260dfa5dfcf26
commit c04fde33ae634fea214767d61e5260dfa5dfcf26
Author: bouleetbil <bouleet...@frogdev.info>
Date: Thu Jul 29 00:28:51 2010 +0200
lxdm-0.2.0-1-x86_64
*version bump
*use Fsed instead patch for use tty12
*now it's /usr/sbin/lxdm and not /usr/bin/lxdm
diff --git a/source/x11-extra/lxdm/FrugalBuild
b/source/x11-extra/lxdm/FrugalBuild
index 9175fa8..6f14e8e 100644
--- a/source/x11-extra/lxdm/FrugalBuild
+++ b/source/x11-extra/lxdm/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: bouleetbil <bouleet...@frogdev.info>
pkgname=lxdm
-pkgver=0.1.0
-pkgrel=6
+pkgver=0.2.0
+pkgrel=1
pkgdesc="LXDM - GUI login manager for LXDE"
depends=('gtk+2>=2.20.1' 'glibc' 'consolekit-x11' 'iso-codes')
rodepends=('lxde-common' 'gtk+2-theme-frugalware')
@@ -15,20 +15,20 @@ archs=('i686' 'ppc' 'x86_64')
_F_sourceforge_dirname="lxde"
Finclude sourceforge
url="http://lxde.org/";
-source=($source lxdm.conf lxdm pam tty.diff)
-sha1sums=('cedaba940130d95661703af035e5f67884fe85b8' \
- '36e7090c7f0499c62822a4e0d3714ed36e8f9793' \
- '1fb545d317d43390582312a24ca68935e4d8f16b' \
+source=($source conf.diff pam lxdm)
+sha1sums=('dc42a8435f53b8b07a2312d09681126300fbf9fe' \
+ '477bef4bb4e5c5d4598d8d054ae354794777adc9' \
'057e8138c508174812fe1210ea8253f822d60c0e' \
- '65bb70f723e130e4c012d03d86549f601f364fc6')
+ 'de20a394901337c298922e0ccf0cd5ac9e4f5c07')
backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm')
build() {
+ Fcd
+ #use tty12 by default
+ Fsed "tty = 7" "tty = 12" src/lxdm.c
Fbuild
- Frm etc/lxdm/lxdm.conf
- Fcp lxdm.conf etc/lxdm/lxdm.conf
- Frm usr/bin/lxdm
- Fcp lxdm usr/bin/lxdm
+ Frm usr/sbin/lxdm
+ Fcp lxdm usr/sbin/lxdm
Frm etc/pam.d/lxdm
Fcp pam etc/pam.d/lxdm
}
diff --git a/source/x11-extra/lxdm/conf.diff b/source/x11-extra/lxdm/conf.diff
new file mode 100644
index 0000000..496e7bb
--- /dev/null
+++ b/source/x11-extra/lxdm/conf.diff
@@ -0,0 +1,17 @@
+--- lxdm.orig/data/lxdm.conf.in 2010-02-23 23:32:31.000000000 +0100
++++ lxdm/data/lxdm.conf.in 2010-02-24 00:52:27.000000000 +0100
+@@ -5,11 +5,11 @@
+ greet...@full_libexecdir@/lxdm-greeter-gtk
+
+ [server]
+-# arg=/usr/bin/X -nr vt1
++#arg=/usr/bin/X -nr vt12
+
+ [display]
+ gtk_theme=Clearlooks
+-bg=/usr/share/backgrounds/default.png
++bg=/usr/share/lxde/wallpapers/frugalware.png
+ bottom_pane=1
+ lang=1
+ theme=Industrial
+
diff --git a/source/x11-extra/lxdm/lxdm b/source/x11-extra/lxdm/lxdm
index 8e6482b..d6602e4 100755
--- a/source/x11-extra/lxdm/lxdm
+++ b/source/x11-extra/lxdm/lxdm
@@ -20,4 +20,4 @@ if [ -n "$PREFERRED" ]; then
export PREFERRED
fi
-exec /usr/bin/lxdm-binary >/dev/null 2>&1
+exec /usr/sbin/lxdm-binary >/dev/null 2>&1
diff --git a/source/x11-extra/lxdm/lxdm.conf b/source/x11-extra/lxdm/lxdm.conf
deleted file mode 100644
index 425dd2a..0000000
--- a/source/x11-extra/lxdm/lxdm.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-[base]
-#autologin=foo
-#session=/usr/bin/startlxde
-greeter=/usr/bin/lxdm-greeter-gtk
-
-[server]
-# Custom X parameters
-arg=/usr/bin/X -nolisten tcp
-
-[display]
-# Custom background image
-bg=/usr/share/lxde/wallpapers/frugalware.png
-lang=1
-bottom_pane=1
-
-# Custom GTK+ theme, you can put the name of any other theme.
-gtk_theme=Frugalware
-
-[input]
diff --git a/source/x11-extra/lxdm/lxdm.install
b/source/x11-extra/lxdm/lxdm.install
index b5f7c5e..e7a9f8d 100644
--- a/source/x11-extra/lxdm/lxdm.install
+++ b/source/x11-extra/lxdm/lxdm.install
@@ -1,6 +1,7 @@
post_install()
{
- sed 's|^#desktop="/usr/bin/lxdm"$|desktop="/usr/bin/lxdm"|' -i
/etc/sysconfig/desktop
+ sed 's|"/usr/bin/lxdm"$|"/usr/sbin/lxdm"|' -i /etc/sysconfig/desktop
+ sed 's|^#desktop="/usr/sbin/lxdm"$|desktop="/usr/sbin/lxdm"|' -i
/etc/sysconfig/desktop
}
post_upgrade()
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
