[lightdm/f17] Fix merge from f16

[brummbq]

commit 462ee33ab1dc102f0080ea047f164bb5f1f9b2ad
Author: Gregor Tätzner <gregor at freenet.de>
Date:   Sun Jul 15 20:48:37 2012 +0200

    Fix merge from f16

 ...nfig.patch => lightdm-1.2.2-fedora_config.patch |   18 ++++++++--------
 lightdm.spec                                       |   22 ++++++++++---------
 2 files changed, 21 insertions(+), 19 deletions(-)
---
diff --git a/lightdm-1.3.1-fedora_config.patch b/lightdm-1.2.2-fedora_config.patch
similarity index 63%
rename from lightdm-1.3.1-fedora_config.patch
rename to lightdm-1.2.2-fedora_config.patch
index 5300ad0..1bcbab3 100644
--- a/lightdm-1.3.1-fedora_config.patch
+++ b/lightdm-1.2.2-fedora_config.patch
@@ -1,16 +1,16 @@
-diff -up lightdm-1.3.1/data/lightdm.conf.fedora_config lightdm-1.3.1/data/lightdm.conf
---- lightdm-1.3.1/data/lightdm.conf.fedora_config	2012-05-28 18:27:22.000000000 -0500
-+++ lightdm-1.3.1/data/lightdm.conf	2012-06-27 13:59:13.305441563 -0500
-@@ -20,7 +20,7 @@
+diff -up lightdm-1.2.2/data/lightdm.conf.fedora-config lightdm-1.2.2/data/lightdm.conf
+--- lightdm-1.2.2/data/lightdm.conf.fedora-config	2012-04-18 18:29:23.000000000 -0500
++++ lightdm-1.2.2/data/lightdm.conf	2012-04-25 12:04:46.611821900 -0500
+@@ -18,7 +18,7 @@
+ #greeter-user=lightdm
  #minimum-display-number=0
  #minimum-vt=7
- #lock-memory=true
 -#user-authority-in-system-dir=false
 +user-authority-in-system-dir=true
  #guest-account-script=guest-account
  #log-directory=/var/log/lightdm
  #run-directory=/var/run/lightdm
-@@ -64,14 +64,14 @@
+@@ -62,14 +62,14 @@
  #xdmcp-manager=
  #xdmcp-port=177
  #xdmcp-key=
@@ -27,9 +27,9 @@ diff -up lightdm-1.3.1/data/lightdm.conf.fedora_config lightdm-1.3.1/data/lightd
  #display-setup-script=
  #greeter-setup-script=
  #session-setup-script=
-diff -up lightdm-1.3.1/data/users.conf.fedora_config lightdm-1.3.1/data/users.conf
---- lightdm-1.3.1/data/users.conf.fedora_config	2011-12-08 19:51:23.000000000 -0600
-+++ lightdm-1.3.1/data/users.conf	2012-06-27 13:56:33.355440302 -0500
+diff -up lightdm-1.2.2/data/users.conf.fedora-config lightdm-1.2.2/data/users.conf
+--- lightdm-1.2.2/data/users.conf.fedora-config	2012-04-18 18:29:23.000000000 -0500
++++ lightdm-1.2.2/data/users.conf	2012-04-25 11:58:44.459349541 -0500
 @@ -9,6 +9,6 @@
  # hidden-shells = Shells that indicate a user cannot login
  #
diff --git a/lightdm.spec b/lightdm.spec
index 2e0bb9c..600c818 100644
--- a/lightdm.spec
+++ b/lightdm.spec
@@ -5,9 +5,8 @@ Release: 16%{?dist}
 
 # library/bindings are LGPLv3, the rest GPLv3+
 License: LGPLv3+ and GPLv3+
-#URL:     http://www.freedesktop.org/wiki/Software/LightDM
-URL:     https://launchpad.net/lightdm/
-Source0: https://launchpad.net/lightdm/1.4/%{version}/+download/lightdm-%{version}.tar.gz
+URL:     http://www.freedesktop.org/wiki/Software/LightDM
+Source0: https://launchpad.net/%{name}/1.2/%{version}/+download/%{name}-%{version}.tar.gz
 Source1: lightdm.pam
 # this one probably needs love -- rex
 Source2: lightdm-autologin.pam
@@ -15,13 +14,14 @@ Source3: lightdm-tmpfiles.conf
 
 Patch0: lightdm-lock-screen-before-switch.patch
 ## Downstream patches:
-Patch10: lightdm-1.3.1-fedora_config.patch
+Patch10: lightdm-1.2.2-fedora_config.patch
 # hack in support for --nodaemon option
 Patch11: lightdm-1.2.2-nodaemon_option.patch
 
+BuildRequires: automake libtool
 BuildRequires: gettext
 BuildRequires: gnome-common
-BuildRequires: gtk-doc itstool
+BuildRequires: gtk-doc
 BuildRequires: intltool
 BuildRequires: pam-devel
 BuildRequires: pkgconfig(dbus-glib-1)
@@ -109,8 +109,11 @@ Requires: %{name}-qt%{?_isa} = %{version}-%{release}
 %patch10 -p1 -b .fedora_config
 %patch11 -p1 -b .nodaemon_option
 
-# rpath hack
-sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
+# AUTHORS is (mostly) empty, let's fix this
+echo "Robert Ancell <robert.ancell at canonical.com>" >> AUTHORS
+
+# nuke rpath, among other things
+autoreconf -f -i
 
 
 %build
@@ -145,7 +148,7 @@ mkdir -p %{buildroot}%{_localstatedir}/run/%{name}/authority
 mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
 mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}
 
-%find_lang %{name} --with-gnome
+%find_lang %{name}
 
 
 %pre
@@ -158,8 +161,7 @@ exit 0
 
 
 %files -f %{name}.lang
-%doc COPYING
-%doc ChangeLog NEWS README
+%doc AUTHORS ChangeLog  COPYING NEWS README
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.DisplayManager.conf
 %config(noreplace) %{_sysconfdir}/init/lightdm.conf
 %config(noreplace) %{_sysconfdir}/pam.d/lightdm*