Author: ryan52
Update of /cvs/pkgs/rpms/ldm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1852
Modified Files:
ldm.spec
Log Message:
merge changes from F-10
Index: ldm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldm/devel/ldm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ldm.spec 31 Oct 2008 21:20:24 -0000 1.16
+++ ldm.spec 31 Jan 2009 22:00:43 -0000 1.17
@@ -1,17 +1,18 @@
Name: ldm
-Version: 2.0.16
-%define _datestamp .20081030.15
+Version: 2.0.30
+%define _datestamp .20090127.13
#Release: 2%{_datestamp}%{?dist}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: LTSP Display Manager
Group: User Interface/X
License: GPLv2+
URL:
https://code.launchpad.net/~ltsp-upstream/ltsp/ldm-trunk
Source0: ldm-%{version}.tar.bz2
+Patch0: ldm-2.0.30-nbd-update.patch
# Artwork by Maureen Duffy <duffy(a)redhat.com>
-Source1: ldm-k12linux-theme-1.0.1.tar.bz2
-Patch0: ldm-rearrange-stuff.patch
+%define theme_version 1.0.2
+Source1: k12linux-theme-%{theme_version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel
@@ -38,6 +39,7 @@
%build
+export CFLAGS="$CFLAGS -DK12LINUX"
%configure
make %{?_smp_mflags}
@@ -47,7 +49,7 @@
make install DESTDIR=$RPM_BUILD_ROOT
cd $RPM_BUILD_ROOT/%{_datadir}/ldm/themes
tar xfvj %SOURCE1
- mv ldm-k12linux-theme-1.0.1 k12linux
+ mv k12linux-theme-%{theme_version} k12linux
ln -s k12linux default
cd -
@@ -59,12 +61,27 @@
install -m 0755 ldminfod/ldminfod $RPM_BUILD_ROOT%{_sbindir}/ldminfod
install -m 0644 ldminfod/xinetd.d/ldminfod
$RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ldminfod
+rm -rf $RPM_BUILD_ROOT%{_datadir}/ldm/themes/ltsp
+
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ltsp
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/ldm-global-dmrc <<EOL
+[Desktop]
+#Session=gnome
+#Session=kde
+#Session=xfce4
+#Session=sugar
+#Language=ja_JP.utf8
+#Language=en_US.utf8
+EOL
+chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/ltsp/ldm-global-dmrc
+
%clean
rm -rf $RPM_BUILD_ROOT
%files -f ldm.lang
%defattr(-,root,root,-)
%doc COPYING README
+%{_bindir}/ldm-dialog
%{_sbindir}/ldm
%{_libexecdir}/ldm/
%{_datadir}/ldm/
@@ -75,9 +92,40 @@
%files -n ldminfod
%{_sbindir}/ldminfod
%config(noreplace) %{_sysconfdir}/xinetd.d/ldminfod
+%config(noreplace) %{_sysconfdir}/ltsp/ldm-global-dmrc
%changelog
-* Fri Oct 31 2008 Warren Togami <wtogami(a)redhat.com. - 2.0.16-1
+* Wed Jan 28 2009 Warren Togami <wtogami(a)redhat.com> - 2.0.30-2
+- Fix nbd update checker
+
+* Wed Jan 22 2009 Warren Togami <wtogami(a)redhat.com> - 2.0.30-1
+- NBD update checker, reboots client automatically if needed
+
+* Wed Dec 24 2008 Warren Togami <wtogami(a)redhat.com> - 2.0.27-1
+- More bug fixes
+
+* Thu Dec 12 2008 Warren Togami <wtogami(a)redhat.com> - 2.0.25-1
+- More bug fixes
+
+* Fri Dec 12 2008 Warren Togami <wtogami(a)redhat.com> - 2.0.24-1
+- Minor bug fixes
+
+* Fri Dec 12 2008 Warren Togami <wtogami(a)redhat.com> - 2.0.23-1
+- LDM_DIRECTX=true was broken, now fixed
+
+* Thu Dec 11 2008 Warren Togami <wtogami(a)redhat.com> - 2.0.22-1
+- Show good names in Session menu
+- Use and write to user .dmrc
+ It is now possible to set a default session that is not GNOME.
+ Set LDM_GLOBAL_DMRC=/etc/ltsp/ldm-global-dmrc in lts.conf
+ and specify your choice in /etc/ltsp/ldm-global-dmrc on the server.
+
+* Thu Nov 13 2008 Warren Togami <wtogami(a)redhat.com> - 2.0.18-1
+- Fix race condition in a clean way without the ugly hack.
+- Improve logging.
+- Many little bug fixes and code cleanups.
+
+* Fri Oct 31 2008 Warren Togami <wtogami(a)redhat.com> - 2.0.16-1
- UGLY HACK: Workaround race condition where keyboard layout setting would often fail
because it was being set before X was done initializing.