[lightdm] rebase nodaemon_option.patch
Rex Dieter
rdieter at fedoraproject.org
Wed Aug 28 00:47:57 UTC 2013
commit 18f83744a5545273857d9e1c3b34ad793377ba27
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Tue Aug 27 19:47:47 2013 -0500
rebase nodaemon_option.patch
...n_option.patch => lightdm-nodaemon_option.patch | 8 ++++----
lightdm.spec | 7 +++++--
2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/lightdm-1.2.2-nodaemon_option.patch b/lightdm-nodaemon_option.patch
similarity index 52%
rename from lightdm-1.2.2-nodaemon_option.patch
rename to lightdm-nodaemon_option.patch
index 8e708fb..b634d1c 100644
--- a/lightdm-1.2.2-nodaemon_option.patch
+++ b/lightdm-nodaemon_option.patch
@@ -1,7 +1,7 @@
-diff -up lightdm-1.2.2/src/lightdm.c.nodaemon_option lightdm-1.2.2/src/lightdm.c
---- lightdm-1.2.2/src/lightdm.c.nodaemon_option 2012-04-18 18:29:23.000000000 -0500
-+++ lightdm-1.2.2/src/lightdm.c 2012-04-25 14:58:20.947571800 -0500
-@@ -924,7 +924,7 @@
+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");
diff --git a/lightdm.spec b/lightdm.spec
index 7d331ed..d6f805b 100644
--- a/lightdm.spec
+++ b/lightdm.spec
@@ -9,7 +9,7 @@
Name: lightdm
Summary: Lightweight Display Manager
Version: 1.7.11
-Release: 1%{?dist}
+Release: 2%{?dist}
# library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+
License: (LGPLv2 or LGPLv3) and GPLv3+
@@ -27,7 +27,7 @@ Patch0: lightdm-lock-screen-before-switch.patch
## Downstream patches:
Patch10: lightdm-1.7.9-fedora_config.patch
# hack in support for --nodaemon option
-Patch11: lightdm-1.2.2-nodaemon_option.patch
+Patch11: lightdm-nodaemon_option.patch
# disable saving to ~/.dmrc
Patch12: lightdm-1.6.0-no_dmrc_save.patch
@@ -261,6 +261,9 @@ fi
%changelog
+* Tue Aug 27 2013 Rex Dieter <rdieter at fedoraproject.org> 1.7.11-2
+- rebase nodaemon_option.patch
+
* Mon Aug 26 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.7.11-1
- Update to 1.7.11
More information about the scm-commits
mailing list