packages: lxdm/lxdm.spec, lxdm/lxdm-pl.po.patch (REMOVED) - up to 0.4.1, ad...

[glen]

Author: glen                         Date: Mon Aug 15 07:35:26 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.4.1, added upstart config

---- Files affected:
packages/lxdm:
   lxdm.spec (1.12 -> 1.13) , lxdm-pl.po.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/lxdm/lxdm.spec
diff -u packages/lxdm/lxdm.spec:1.12 packages/lxdm/lxdm.spec:1.13
--- packages/lxdm/lxdm.spec:1.12	Sun Jul 10 21:56:29 2011
+++ packages/lxdm/lxdm.spec	Mon Aug 15 09:35:20 2011
@@ -1,18 +1,18 @@
 # $Revision$, $Date$
 Summary:	Light weight X11 display manager
 Name:		lxdm
-Version:	0.3.0
-Release:	6
+Version:	0.4.1
+Release:	1
 License:	GPL v3
 Group:		X11/Applications
 Source0:	http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz
-# Source0-md5:	1d0688e088edab7c3c563263eb2f9654
+# Source0-md5:	8da1cfc2be6dc9217c85a7cf51e1e821
 Source1:	%{name}.pamd
 Source2:	%{name}.init
 Source3:	%{name}.Xsession
+Source4:	%{name}.upstart
 Patch0:		%{name}-setuid.patch
-Patch1:		%{name}-pl.po.patch
-Patch2:		greeter-skip-services.patch
+Patch1:		greeter-skip-services.patch
 URL:		http://wiki.lxde.org/en/LXDM
 BuildRequires:	ConsoleKit-devel
 BuildRequires:	gettext-devel
@@ -46,7 +46,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 rm -f data/lxdm.conf
@@ -57,11 +56,12 @@
 rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d}
 
-cp -a %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/lxdm
+install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,init,pam.d}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/lxdm
+cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/init/%{name}.conf
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/lxdm
-install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/lxdm/Xsession
+install -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/Xsession
 
 %find_lang %{name}
 
@@ -71,26 +71,28 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS README TODO
-%dir %{_sysconfdir}/lxdm
-%attr(755,root,root) %config %{_sysconfdir}/lxdm/LoginReady
-%attr(755,root,root) %config %{_sysconfdir}/lxdm/PostLogin
-%attr(755,root,root) %config %{_sysconfdir}/lxdm/PostLogout
-%attr(755,root,root) %config %{_sysconfdir}/lxdm/PreLogin
-%attr(755,root,root) %config %{_sysconfdir}/lxdm/PreReboot
-%attr(755,root,root) %config %{_sysconfdir}/lxdm/PreShutdown
-%attr(755,root,root) %config %{_sysconfdir}/lxdm/Xsession
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lxdm/lxdm.conf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/lxdm
-%attr(755,root,root) %{_sbindir}/lxdm
-%attr(755,root,root) %{_sbindir}/lxdm-binary
-%attr(755,root,root) %{_libexecdir}/lxdm-greeter-gtk
-%attr(755,root,root) %{_libdir}/lxdm-greeter-gdk
-%attr(755,root,root) %{_libdir}/lxdm-numlock
-%{_datadir}/lxdm
+%dir %{_sysconfdir}/%{name}
+%attr(755,root,root) %config %{_sysconfdir}/%{name}/LoginReady
+%attr(755,root,root) %config %{_sysconfdir}/%{name}/PostLogin
+%attr(755,root,root) %config %{_sysconfdir}/%{name}/PostLogout
+%attr(755,root,root) %config %{_sysconfdir}/%{name}/PreLogin
+%attr(755,root,root) %config %{_sysconfdir}/%{name}/PreReboot
+%attr(755,root,root) %config %{_sysconfdir}/%{name}/PreShutdown
+%attr(755,root,root) %config %{_sysconfdir}/%{name}/Xsession
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/%{name}
+%attr(755,root,root) %{_bindir}/%{name}-config
+%attr(755,root,root) %{_sbindir}/%{name}
+%attr(755,root,root) %{_sbindir}/%{name}-binary
+%attr(755,root,root) %{_libexecdir}/%{name}-greeter-gtk
+%attr(755,root,root) %{_libdir}/%{name}-greeter-gdk
+%attr(755,root,root) %{_libdir}/%{name}-numlock
+%{_datadir}/%{name}
 
 %files init
 %defattr(644,root,root,755)
-%attr(754,root,root) /etc/rc.d/init.d/lxdm
+%attr(754,root,root) /etc/rc.d/init.d/%{name}
+%config(noreplace) %verify(not md5 mtime size) /etc/init/%{name}.conf
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -98,6 +100,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2011/08/15 07:35:20  glen
+- up to 0.4.1, added upstart config
+
 Revision 1.12  2011/07/10 19:56:29  glen
 - there is no epoch, drop bogus open dependency
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lxdm/lxdm.spec?r1=1.12&r2=1.13&f=u