[lightdm] lightdm-1.3.1

Wed Jun 27 19:27:10 UTC 2012

commit 72ee6a3e6e1139223a5a6692d3551d94e0d0db2c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Jun 27 14:30:21 2012 -0500

    lightdm-1.3.1

 .gitignore                                         |    2 +-
 ...nfig.patch => lightdm-1.3.1-fedora_config.patch |   18 ++++++------
 lightdm.spec                                       |   29 ++++++++++---------
 sources                                            |    2 +-
 4 files changed, 26 insertions(+), 25 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 5a95a63..38c3d47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/lightdm-1.2.2.tar.gz
+/lightdm-1.3.1.tar.gz
diff --git a/lightdm-1.2.2-fedora_config.patch b/lightdm-1.3.1-fedora_config.patch
similarity index 63%
rename from lightdm-1.2.2-fedora_config.patch
rename to lightdm-1.3.1-fedora_config.patch
index 1bcbab3..5300ad0 100644
--- a/lightdm-1.2.2-fedora_config.patch
+++ b/lightdm-1.3.1-fedora_config.patch
@@ -1,16 +1,16 @@
-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
+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 @@
  #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
-@@ -62,14 +62,14 @@
+@@ -64,14 +64,14 @@
  #xdmcp-manager=
  #xdmcp-port=177
  #xdmcp-key=
@@ -27,9 +27,9 @@ diff -up lightdm-1.2.2/data/lightdm.conf.fedora-config lightdm-1.2.2/data/lightd
  #display-setup-script=
  #greeter-setup-script=
  #session-setup-script=
-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
+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
 @@ -9,6 +9,6 @@
  # hidden-shells = Shells that indicate a user cannot login
  #
diff --git a/lightdm.spec b/lightdm.spec
index 4f8131d..5b5d2c8 100644
--- a/lightdm.spec
+++ b/lightdm.spec
@@ -1,12 +1,13 @@
 Name:    lightdm
 Summary: Lightweight Display Manager
-Version: 1.2.2
-Release: 15%{?dist}
+Version: 1.3.1
+Release: 1%{?dist}
 
 # library/bindings are LGPLv3, the rest GPLv3+
 License: LGPLv3+ and GPLv3+
-URL:     http://www.freedesktop.org/wiki/Software/LightDM
-Source0: https://launchpad.net/%{name}/1.2/%{version}/+download/%{name}-%{version}.tar.gz
+#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
 Source1: lightdm.pam
 # this one probably needs love -- rex
 Source2: lightdm-autologin.pam
@@ -14,14 +15,13 @@ Source3: lightdm-tmpfiles.conf
 
 Patch0: lightdm-lock-screen-before-switch.patch
 ## Downstream patches:
-Patch10: lightdm-1.2.2-fedora_config.patch
+Patch10: lightdm-1.3.1-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
+BuildRequires: gtk-doc itstool
 BuildRequires: intltool
 BuildRequires: pam-devel
 BuildRequires: pkgconfig(dbus-glib-1)
@@ -109,11 +109,8 @@ Requires: %{name}-qt%{?_isa} = %{version}-%{release}
 %patch10 -p1 -b .fedora_config
 %patch11 -p1 -b .nodaemon_option
 
-# 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
+# rpath hack
+sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
 
 
 %build
@@ -148,7 +145,7 @@ mkdir -p %{buildroot}%{_localstatedir}/run/%{name}/authority
 mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
 mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}
 
-%find_lang %{name}
+%find_lang %{name} --with-gnome
 
 
 %pre
@@ -160,7 +157,8 @@ exit 0
 
 
 %files -f %{name}.lang
-%doc AUTHORS ChangeLog  COPYING NEWS README
+%doc COPYING
+%doc ChangeLog 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*
@@ -211,6 +209,9 @@ exit 0
 
 
 %changelog
+* Wed Jun 27 2012 Rex Dieter <rdieter at fedoraproject.org> 1.3.1-1
+- lightdm-1.3.1
+
 * Fri Jun 15 2012 Rex Dieter <rdieter at fedoraproject.org> 1.2.2-15
 - default to alternatives-provided greeter
 
diff --git a/sources b/sources
index 116083b..098b914 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-671c194ee214f14f00c8ccc0f3aacabc  lightdm-1.2.2.tar.gz
+802ca25e115cc81f844874df9a7288b9  lightdm-1.3.1.tar.gz
