rpms/lxdm/devel lxdm-0.1.0-dsofix.patch, NONE, 1.1 lxdm-0.2.0-config.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 lxdm.spec, 1.3, 1.4 sources, 1.3, 1.4 lxdm-svn2145-tty1-patch, 1.1, NONE

Wed Feb 24 00:08:40 UTC 2010

Author: cwickert

Update of /cvs/pkgs/rpms/lxdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20600

Modified Files:
	.cvsignore lxdm.spec sources 
Added Files:
	lxdm-0.1.0-dsofix.patch lxdm-0.2.0-config.patch 
Removed Files:
	lxdm-svn2145-tty1-patch 
Log Message:
* Fri Jan 08 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-1
- Update to 0.1.0
- Change license to GPLv2+ and LGPLv2+
- Use tty1 by default
- PAM fixes for SELinux (#552885)


lxdm-0.1.0-dsofix.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE lxdm-0.1.0-dsofix.patch ---
--- lxdm-0.1.0.orig/src/Makefile.in	2009-12-29 14:58:55.000000000 +0100
+++ lxdm-0.1.0/src/Makefile.in	2010-02-18 23:30:45.000000000 +0100
@@ -112,7 +112,7 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -lX11
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@

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

--- NEW FILE lxdm-0.2.0-config.patch ---
--- 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,14 +5,14 @@
 greeter=@libexecdir@/lxdm-greeter-gtk
 
 [server]
-# arg=/usr/bin/X -nr vt1
+arg=/usr/bin/X -nr vt1
 
 [display]
 gtk_theme=Clearlooks
 bg=/usr/share/backgrounds/default.png
 bottom_pane=1
 lang=1
-theme=Industrial
+# theme=Industrial
 
 [input]
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxdm/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	8 Jan 2010 15:45:04 -0000	1.3
+++ .cvsignore	24 Feb 2010 00:08:38 -0000	1.4
@@ -1 +1 @@
-lxdm-0.1.0.tar.gz
+lxdm-20100223gitdf819fd.tar.bz2


Index: lxdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxdm/devel/lxdm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- lxdm.spec	8 Jan 2010 15:45:05 -0000	1.3
+++ lxdm.spec	24 Feb 2010 00:08:39 -0000	1.4
@@ -1,24 +1,36 @@
 # Review at https://bugzilla.redhat.com/show_bug.cgi?id=540034
 
-#%global alphatag 20091231svn2262
+%global gitdate 20100223
+%global gitversion df819fd
+%global alphatag %{gitdate}git%{gitversion}
 
 Name:           lxdm
-Version:        0.1.0
-Release:        0.1%{?dist}
+Version:        0.2.0
+Release:        0.1.%{alphatag}%{?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:        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 reset --hard %{gitversion} 
+# ./autogen.sh
+# cd ..
+# tar -cjf %{name}-%{alphatag}.tar.bz2 lxdm --exclude=.git
+Source0:        %{name}-%{alphatag}.tar.bz2
+# https://bugzilla.redhat.com/show_bug.cgi?id=564995
+Patch4:         lxdm-0.1.0-dsofix.patch
 ## distro specific patches ##
-# we use tty1 by default
-Patch10:        lxdm-svn2145-tty1-patch
+Patch10:        lxdm-0.2.0-config.patch
 # SELinux, permit graphical root login etc.
 Patch11:        lxdm-svn2262-pam.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.12.0
+BuildRequires:  iso-codes-devel
 BuildRequires:  ConsoleKit-devel
 BuildRequires:  intltool >= 0.40.0
 Requires:       pam
@@ -35,8 +47,10 @@ KDM in LXDE distros. It's still in very 
 
 
 %prep
-%setup -q
-%patch10 -p1 -b .tty7
+%setup -qn lxdm
+
+%patch4 -p1 -b .dsofix
+%patch10 -p1 -b .config
 %patch11 -p1 -b .orig
 
 
@@ -49,6 +63,7 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 %find_lang %{name}
+
 # these files are not in the package, but should be owned by lxdm 
 touch %{buildroot}%{_sysconfdir}/%{name}/xinitrc
 mkdir -p %{buildroot}%{_localstatedir}/run
@@ -56,6 +71,10 @@ touch %{buildroot}%{_localstatedir}/run/
 mkdir -p %{buildroot}%{_localstatedir}/log
 touch %{buildroot}%{_localstatedir}/log/%{name}.log
 
+# needed to interact with plymouth. 
+# Already owned by gdm, but we need to own it too
+mkdir -p %{buildroot}%{_localstatedir}/spool/gdm/
+
 
 %clean
 rm -rf %{buildroot}
@@ -70,15 +89,21 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/%{name}/Xsession
 %config(noreplace) %{_sysconfdir}/%{name}/lxdm.conf
 %config(noreplace) %{_sysconfdir}/pam.d/%{name}
-%{_bindir}/%{name}
-%{_bindir}/lxdm-binary
-%{_bindir}/lxdm-greeter-gtk
+%{_sbindir}/%{name}
+%{_sbindir}/lxdm-binary
+%{_libexecdir}/lxdm-greeter-gtk
 %{_datadir}/%{name}/
 %ghost %{_localstatedir}/run/%{name}.pid
 %ghost %{_localstatedir}/log/%{name}.log
-
+%dir %{_localstatedir}/spool/gdm/
 
 %changelog
+* Wed Feb 24 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.0-0.1.20100223gitdf819fd
+- Update to latest git
+- BR iso-codes-devel
+- Don't hardcode tty1 in the source, use lxdm.conf instead
+- Add patch to fix DSO linking (#564995)
+
 * Fri Jan 08 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-1
 - Update to 0.1.0
 - Change license to GPLv2+ and LGPLv2+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxdm/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	8 Jan 2010 15:45:05 -0000	1.3
+++ sources	24 Feb 2010 00:08:39 -0000	1.4
@@ -1 +1 @@
-656e2e7e296368edd97699605f8bd3cb  lxdm-0.1.0.tar.gz
+b5176d766507afbf8d1f75282d26c402  lxdm-20100223gitdf819fd.tar.bz2


--- lxdm-svn2145-tty1-patch DELETED ---

