[packages/lightdm] - don't bail out if unknown option is provided (-nodaemon issue in prefdm script) - updated BRs - re

baggins baggins at pld-linux.org
Mon Dec 30 13:53:37 CET 2013


commit f320953a2c06e332abcf3e3ad3195cd8f4822626
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Dec 30 13:52:53 2013 +0100

    - don't bail out if unknown option is provided (-nodaemon issue in prefdm script)
    - updated BRs
    - rel 3

 lightdm-nodaemon_option.patch | 12 ++++++++++++
 lightdm.spec                  |  6 +++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/lightdm.spec b/lightdm.spec
index 416805a..671d44b 100644
--- a/lightdm.spec
+++ b/lightdm.spec
@@ -2,7 +2,7 @@ Summary:	A lightweight display manager
 Summary(hu.UTF-8):	Egy könnyűsúlyú bejelentkezéskezelő
 Name:		lightdm
 Version:	1.7.12
-Release:	2
+Release:	3
 # library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+
 License:	(LGPLv2 or LGPLv3) and GPLv3+
 Group:		X11/Applications
@@ -11,6 +11,7 @@ Source0:	https://launchpad.net/lightdm/1.7/%{version}/+download/%{name}-%{versio
 Source1:	%{name}.pamd
 Patch0:		config.patch
 Patch1:		upstart-path.patch
+Patch2:		lightdm-nodaemon_option.patch
 URL:		http://www.freedesktop.org/wiki/Software/LightDM
 BuildRequires:	QtCore-devel
 BuildRequires:	QtDBus-devel
@@ -28,12 +29,14 @@ BuildRequires:	gtk-doc
 BuildRequires:	gtk-webkit-devel
 BuildRequires:	intltool
 BuildRequires:	itstool
+BuildRequires:	libgcrypt-devel
 BuildRequires:	libtool
 BuildRequires:	libxklavier-devel
 BuildRequires:	pam-devel
 BuildRequires:	perl-XML-Parser
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig
+BuildRequires:	qt4-build
 BuildRequires:	rpmbuild(macros) >= 1.583
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	vala
@@ -125,6 +128,7 @@ Upstart támogatás lightdm-hez.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
diff --git a/lightdm-nodaemon_option.patch b/lightdm-nodaemon_option.patch
new file mode 100644
index 0000000..b634d1c
--- /dev/null
+++ b/lightdm-nodaemon_option.patch
@@ -0,0 +1,12 @@
+diff -up lightdm-1.7.11/src/lightdm.c.nodaemon_option lightdm-1.7.11/src/lightdm.c
+--- lightdm-1.7.11/src/lightdm.c.nodaemon_option	2013-08-25 21:32:17.000000000 -0500
++++ lightdm-1.7.11/src/lightdm.c	2013-08-27 19:46:41.100258556 -0500
+@@ -994,7 +994,7 @@ main (int argc, char **argv)
+         g_printerr (/* Text printed out when an unknown command-line argument provided */
+                     _("Run '%s --help' to see a full list of available command line options."), argv[0]);
+         g_printerr ("\n");
+-        return EXIT_FAILURE;
++    /*  return EXIT_FAILURE; */
+     }
+ 
+     if (show_version)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lightdm.git/commitdiff/f320953a2c06e332abcf3e3ad3195cd8f4822626



More information about the pld-cvs-commit mailing list