[lightdm] 1.6.0-3

[Rex Dieter]

commit bc63ac9d91525b4abc43a119e8535df26cc7751c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Apr 25 07:03:51 2013 -0500

    1.6.0-3
    
    - lightdm package should be built with PIE flags (#955147)
    - apply systemd patch unconditionally

 lightdm-1.6.0-gtkdoc_dup_flags.patch |   25 +++++++++++++++++++++++++
 lightdm.spec                         |   14 ++++++++++----
 2 files changed, 35 insertions(+), 4 deletions(-)
---
diff --git a/lightdm-1.6.0-gtkdoc_dup_flags.patch b/lightdm-1.6.0-gtkdoc_dup_flags.patch
new file mode 100644
index 0000000..5db6212
--- /dev/null
+++ b/lightdm-1.6.0-gtkdoc_dup_flags.patch
@@ -0,0 +1,25 @@
+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 --git a/lightdm.spec b/lightdm.spec
index ab6ce06..668c08a 100644
--- a/lightdm.spec
+++ b/lightdm.spec
@@ -3,10 +3,12 @@
 %define systemd 1
 %endif
 
+%global _hardened_build 1
+
 Name:    lightdm
 Summary: Lightweight Display Manager
 Version: 1.6.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+
 License: (LGPLv2 or LGPLv3) and GPLv3+
@@ -30,6 +32,8 @@ Patch11: lightdm-1.2.2-nodaemon_option.patch
 ## upstreamable patches
 # initial support for org.freedesktop.login1 powerOff/Reboot actions
 Patch50: lightdm-1.5.1-systemd_login1_power.patch
+# 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
@@ -131,10 +135,8 @@ Requires: %{name}-qt%{?_isa} = %{version}-%{release}
 %patch0 -p1 -b .lock-screen
 %patch10 -p1 -b .fedora_config
 %patch11 -p1 -b .nodaemon_option
-%if 0%{?systemd}
-# FIXME: keep patch conditional, not 100% sure the fallback to ConsoleKit works yet -- rex
 %patch50 -p1 -b .systemd_login1_power
-%endif
+%patch51 -p1 -b .gtkdoc_dup_flags
 
 # rpath hack
 sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
@@ -262,6 +264,10 @@ exit 0
 
 
 %changelog
+* Thu Apr 25 2013 Rex Dieter <rdieter at fedoraproject.org> 1.6.0-3
+- lightdm package should be built with PIE flags (#955147)
+- apply systemd patch unconditionally
+
 * Sun Apr 14 2013 Rex Dieter <rdieter at fedoraproject.org> 1.6.0-2
 - lightdm does not honor UID_MIN from /etc/login.defs (#907312)