[lxdm] - Update to GIT snapshot of 20100921 (fixes #635396)
Christoph Wickert
cwickert at fedoraproject.org
Mon Sep 20 22:47:18 UTC 2010
commit d1751432b98380ecc6da48916aea29f08b1fac0e
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date: Tue Sep 21 00:47:03 2010 +0200
- Update to GIT snapshot of 20100921 (fixes #635396)
.gitignore | 1 +
lxdm.spec | 41 +++++++++++++++++++++++++++++++++--------
sources | 2 +-
3 files changed, 35 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 39fd4be..994dcdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
lxdm-0.2.0.tar.gz
+/lxdm-20100921gitcf9b2cbb.tar.bz2
diff --git a/lxdm.spec b/lxdm.spec
index 82de7c8..5e85af5 100644
--- a/lxdm.spec
+++ b/lxdm.spec
@@ -1,14 +1,33 @@
# Review at https://bugzilla.redhat.com/show_bug.cgi?id=540034
+%global git_snapshot 1
+%global git_rev cf9b2cbb7be8ec1a01530d1f37b7d6f48f0e5fd0
+%global git_date 20100921
+
+%if 0%{?git_snapshot}
+%global git_short %(echo %{git_rev} | cut -c-8)
+%global git_version %{git_date}git%{git_short}
+%endif
+
+# Source0 was generated as follows:
+# git clone git://lxde.git.sourceforge.net/gitroot/lxde/%{name}
+# cd %{name}
+# git archive --format=tar --prefix=%{name}/ %{git_short} | bzip2 > %{name}-%{?git_version}.tar.bz2
+
Name: lxdm
-Version: 0.2.0
-Release: 4%{?dist}
+Version: 0.3.0
+Release: 0.1%{?git_snapshot:.%{?git_version}}%{?dist}
Summary: Lightweight X11 Display Manager
Group: User Interface/Desktops
License: GPLv2+ and LGPLv2+
URL: http://lxde.org
+%if 0%{?git_snapshot}
+Source0: %{name}-%{?git_version}.tar.bz2
+%else
Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
+%endif
+
# http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxdm;a=commit;h=00eb4d081b0f5638ffef41c379db104aa6f80915
Patch0: lxdm-0.2.0-selinux.patch
# http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxdm;a=commit;h=08bc773ed867bd65c8b36f16795193afebe4a77e
@@ -45,17 +64,18 @@ KDM in LXDE distros. It's still in very early stage of development.
%prep
-%setup -q
-%patch0 -p1 -b .selinux
-%patch1 -p1 -b .some-env-set-bug
-%patch2 -p1 -b .fix-left-env-bug
-%patch3 -p1 -b .add-debug-option
-%patch4 -p1 -b .fix-env-XAUTHORITY
+%setup -q %{?git_snapshot:-n %{name}}
+#%patch0 -p1 -b .selinux
+#%patch1 -p1 -b .some-env-set-bug
+#%patch2 -p1 -b .fix-left-env-bug
+#%patch3 -p1 -b .add-debug-option
+#%patch4 -p1 -b .fix-env-XAUTHORITY
%patch10 -p1 -b .config
%patch11 -p1 -b .orig
%build
+%{?git_snapshot:sh autogen.sh}
%configure
make %{?_smp_mflags} V=1
@@ -94,6 +114,8 @@ rm -rf %{buildroot}
%{_sbindir}/%{name}
%{_sbindir}/lxdm-binary
%{_libexecdir}/lxdm-greeter-gtk
+%{_libexecdir}/lxdm-greeter-gdk
+%{_libexecdir}/lxdm-numlock
%{_datadir}/%{name}/
%dir %{_localstatedir}/run/%{name}
%dir %{_localstatedir}/lib/%{name}
@@ -101,6 +123,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Sep 21 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.0-0.1.20100921gitcf9b2cbb
+- Update to GIT snapshot of 20100921 (fixes #635396)
+
* Tue May 18 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.0-4
- Fix env XAUTHORITY bug
diff --git a/sources b/sources
index 4bafadc..2eea9ec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e539f81ba691f2b0cb2017b82dfee58f lxdm-0.2.0.tar.gz
+5aed341d7784a26dd71a3143fc223609 lxdm-20100921gitcf9b2cbb.tar.bz2
More information about the scm-commits
mailing list