Commit d1bc1bb1 authored by Rex Dieter's avatar Rex Dieter
Browse files

rebase patches (thanks poma)

parent 5ea6c6ac
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
@@ -883,7 +883,7 @@ main (int argc, char **argv)
@@ -924,7 +924,7 @@
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 -up lightdm-1.6.0/doc/Makefile.am.gtkdoc_dup_flags lightdm-1.6.0/doc/Makefile.am
diff -up lightdm-1.6.0/doc/Makefile.in.gtkdoc_dup_flags lightdm-1.6.0/doc/Makefile.in
--- lightdm-1.6.0/doc/Makefile.in.gtkdoc_dup_flags 2013-04-14 17:35:01.000000000 -0500
+++ lightdm-1.6.0/doc/Makefile.in 2013-04-25 06:59:00.731913912 -0500
@@ -571,7 +571,7 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_
scanobj_options="--verbose"; \
fi; \
fi; \
- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
+ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" \
gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
else \
for i in $(SCANOBJ_FILES) ; do \
diff -up lightdm-1.6.0/gtk-doc.make.gtkdoc_dup_flags lightdm-1.6.0/gtk-doc.make
--- lightdm-1.6.0/gtk-doc.make.gtkdoc_dup_flags 2013-04-14 17:34:57.000000000 -0500
+++ lightdm-1.6.0/gtk-doc.make 2013-04-25 06:58:23.395380683 -0500
@@ -108,7 +108,7 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_
scanobj_options="--verbose"; \
fi; \
fi; \
- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
+ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" \
gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
else \
for i in $(SCANOBJ_FILES) ; do \
diff -up lightdm-1.6.0/src/accounts.c.no_dmrc_save lightdm-1.6.0/src/accounts.c
--- lightdm-1.6.0/src/accounts.c.no_dmrc_save 2013-03-05 20:40:10.000000000 -0600
+++ lightdm-1.6.0/src/accounts.c 2013-05-20 17:50:19.421437397 -0500
@@ -134,7 +134,7 @@ save_string_to_dmrc (const gchar *userna
@@ -131,7 +131,7 @@
dmrc = dmrc_load (username);
g_key_file_set_string (dmrc, group, key, value);
......
......@@ -13,7 +13,7 @@ diff -up lightdm-1.7.9/data/lightdm.conf.fedora_config lightdm-1.7.9/data/lightd
#guest-account-script=guest-account
#log-directory=/var/log/lightdm
#run-directory=/var/run/lightdm
@@ -69,7 +69,7 @@
@@ -69,7 +67,7 @@
#
[SeatDefaults]
#type=xlocal
......@@ -22,16 +22,18 @@ diff -up lightdm-1.7.9/data/lightdm.conf.fedora_config lightdm-1.7.9/data/lightd
#xserver-layout=
#xserver-config=
#xserver-allow-tcp=false
@@ -79,7 +79,7 @@
@@ -77,9 +75,7 @@
#xdmcp-manager=
#xdmcp-port=177
#xdmcp-key=
#unity-compositor-command=unity-system-compositor
#unity-compositor-timeout=60
-#unity-compositor-command=unity-system-compositor
-#unity-compositor-timeout=60
-#greeter-session=example-gtk-gnome
+greeter-session=lightdm-greeter
#greeter-hide-users=false
#greeter-allow-guest=true
#greeter-show-manual-login=false
@@ -87,7 +87,7 @@
@@ -87,7 +83,7 @@
#user-session=default
#allow-guest=true
#guest-session=UNIMPLEMENTED
......
......@@ -9,7 +9,7 @@
Name: lightdm
Summary: Lightweight Display Manager
Version: 1.7.9
Release: 1%{?dist}
Release: 2%{?dist}
# library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+
License: (LGPLv2 or LGPLv3) and GPLv3+
......@@ -33,8 +33,6 @@ Patch11: lightdm-1.2.2-nodaemon_option.patch
Patch12: lightdm-1.6.0-no_dmrc_save.patch
## upstreamable patches
# gtkdoc introdpsection dup's CFLAGS/LDFLAGS, breaks in a hardened build
Patch51: lightdm-1.6.0-gtkdoc_dup_flags.patch
BuildRequires: gettext
BuildRequires: gnome-common
......@@ -135,7 +133,6 @@ Requires: %{name}-qt%{?_isa} = %{version}-%{release}
%patch10 -p1 -b .fedora_config
%patch11 -p1 -b .nodaemon_option
%patch12 -p1 -b .no_dmrc_save
%patch51 -p1 -b .gtkdoc_dup_flags
# rpath hack
sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
......@@ -267,6 +264,9 @@ fi
%changelog
* Thu Aug 08 2013 Rex Dieter <rdieter@fedoraproject.org> 1.7.9-2
- rebase patches (thanks poma)
* Sat Aug 03 2013 Rex Dieter <rdieter@fedoraproject.org> 1.7.9-1
- lightdm-1.7.9 (#975998)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment