rpms/lxdm/F-13 .cvsignore, 1.5, 1.6 lxdm-0.2.0-config.patch, 1.2, 1.3 lxdm.spec, 1.9, 1.10 sources, 1.5, 1.6

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/lxdm/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9845/F-13

Modified Files:
	.cvsignore lxdm-0.2.0-config.patch lxdm.spec sources 
Log Message:
* Sun May 09 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.0-2
- Patch for SELinux problems (#564320)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxdm/F-13/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	5 Apr 2010 20:38:57 -0000	1.5
+++ .cvsignore	9 May 2010 20:49:23 -0000	1.6
@@ -1 +1 @@
-lxdm-20100405gitd65ce94.tar.bz2
+lxdm-0.2.0.tar.gz

lxdm-0.2.0-config.patch:
 lxdm.conf.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: lxdm-0.2.0-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lxdm/F-13/lxdm-0.2.0-config.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lxdm-0.2.0-config.patch	17 Apr 2010 09:22:31 -0000	1.2
+++ lxdm-0.2.0-config.patch	9 May 2010 20:49:23 -0000	1.3
@@ -1,7 +1,7 @@
 --- lxdm.orig/data/lxdm.conf.in	2010-02-23 23:32:31.000000000 +0100
 +++ lxdm/data/lxdm.conf.in	2010-02-24 00:52:27.000000000 +0100
 @@ -5,11 +5,11 @@
- greeter=@libexecdir@/lxdm-greeter-gtk
+ greeter=@FULL_LIBEXECDIR@/lxdm-greeter-gtk
  
  [server]
 -# arg=/usr/bin/X -nr vt1


Index: lxdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxdm/F-13/lxdm.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- lxdm.spec	17 Apr 2010 09:22:31 -0000	1.9
+++ lxdm.spec	9 May 2010 20:49:23 -0000	1.10
@@ -1,24 +1,18 @@
 # Review at https://bugzilla.redhat.com/show_bug.cgi?id=540034
 
-%global gitdate 20100405
-%global gitversion d65ce94
-%global alphatag .%{gitdate}git%{gitversion}
-
 Name:           lxdm
 Version:        0.2.0
-Release:        0.3%{?alphatag}%{?dist}
+Release:        2%{?dist}
 Summary:        Lightweight X11 Display Manager
 
 Group:          User Interface/Desktops
 License:        GPLv2+ and LGPLv2+
 URL:            http://lxde.org
-#Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
-# Source0 was generated as follows: 
-# git clone git://lxde.git.sourceforge.net/gitroot/lxde/lxdm
-# cd lxdm
-# git archive --format=tar --prefix=%{name}/ %{gitversion} | bzip2 > %{name}-%{gitdate}git%{gitversion}.tar.bz2
-Source0:        %{name}-%{gitdate}git%{gitversion}.tar.bz2
-## distro specific patches ##
+Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
+# http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxdm;a=commit;h=00eb4d081b0f5638ffef41c379db104aa6f80915
+Patch0:         lxdm-0.2.0-selinux.patch
+## Distro specific patches ##
+# Distro artwork, start on vt1
 Patch10:        lxdm-0.2.0-config.patch
 # SELinux, permit graphical root login etc.
 Patch11:        lxdm-svn2262-pam.patch
@@ -29,11 +23,6 @@ BuildRequires:  iso-codes-devel
 BuildRequires:  ConsoleKit-devel
 BuildRequires:  pam-devel
 BuildRequires:  intltool >= 0.40.0
-
-# for autogen.sh
-BuildRequires:	automake
-BuildRequires:	libtool
-
 Requires:       pam
 Requires:       /sbin/shutdown
 Requires:       desktop-backgrounds-compat
@@ -48,17 +37,14 @@ KDM in LXDE distros. It's still in very 
 
 
 %prep
-%setup -qn lxdm
-
-export NOCONFIGURE=yes
-sh autogen.sh
-
+%setup -q
+%patch0 -p1 -b .selinux
+#%patch1 -p1 -b .var-lib
 %patch10 -p1 -b .config
 %patch11 -p1 -b .orig
 
 
 %build
-./autogen.sh
 %configure
 make %{?_smp_mflags} V=1
 
@@ -75,6 +61,8 @@ touch %{buildroot}%{_localstatedir}/run/
 mkdir -p %{buildroot}%{_localstatedir}/log
 touch %{buildroot}%{_localstatedir}/log/%{name}.log
 
+mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}
+
 
 %clean
 rm -rf %{buildroot}
@@ -102,7 +90,15 @@ rm -rf %{buildroot}
 %ghost %{_localstatedir}/run/%{name}.pid
 %ghost %{_localstatedir}/log/%{name}.log
 
+%dir %{_localstatedir}/lib/%{name}
+
 %changelog
+* Sun May 09 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.0-2
+- Patch for SELinux problems (#564320)
+
+* Wed May 05 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.0-1
+- Update to 0.2.0
+
 * Sat Apr 17 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.0-0.3.20100405gitd65ce94
 - Adjustments for recent Goddard artwork changes
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxdm/F-13/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	5 Apr 2010 20:38:57 -0000	1.5
+++ sources	9 May 2010 20:49:23 -0000	1.6
@@ -1 +1 @@
-3f3de11c5503af1c156674c6f4b2095f  lxdm-20100405gitd65ce94.tar.bz2
+e539f81ba691f2b0cb2017b82dfee58f  lxdm-0.2.0.tar.gz