rpms/lxdm/devel .cvsignore, 1.4, 1.5 lxdm.spec, 1.4, 1.5 sources, 1.4, 1.5 lxdm-0.1.0-dsofix.patch, 1.1, NONE

Christoph Wickert cwickert at fedoraproject.org
Wed Mar 3 01:22:51 UTC 2010


Author: cwickert

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

Modified Files:
	.cvsignore lxdm.spec sources 
Removed Files:
	lxdm-0.1.0-dsofix.patch 
Log Message:
* Wed Mar 03 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-0.1.20100303gite4f7b39
- Update to git release e4f7b39 (fixes #564995)
- Fix SELinux problems (#564320)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lxdm/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	24 Feb 2010 00:08:38 -0000	1.4
+++ .cvsignore	3 Mar 2010 01:22:49 -0000	1.5
@@ -1 +1 @@
-lxdm-20100223gitdf819fd.tar.bz2
+lxdm-20100303gite4f7b39.tar.bz2


Index: lxdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxdm/devel/lxdm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- lxdm.spec	24 Feb 2010 00:08:39 -0000	1.4
+++ lxdm.spec	3 Mar 2010 01:22:50 -0000	1.5
@@ -1,12 +1,12 @@
 # Review at https://bugzilla.redhat.com/show_bug.cgi?id=540034
 
-%global gitdate 20100223
-%global gitversion df819fd
-%global alphatag %{gitdate}git%{gitversion}
+%global gitdate 20100303
+%global gitversion e4f7b39
+%global alphatag .%{gitdate}git%{gitversion}
 
 Name:           lxdm
-Version:        0.2.0
-Release:        0.1.%{alphatag}%{?dist}
+Version:        0.1.1
+Release:        0.1%{?alphatag}%{?dist}
 Summary:        Lightweight X11 Display Manager
 
 Group:          User Interface/Desktops
@@ -16,13 +16,8 @@ URL:            http://lxde.org
 # 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
+# git archive --format=tar --prefix=%{name}/ %{gitversion} | bzip2 > ~/%{gitdate}git%{gitversion}.tar.bz2
+Source0:        %{name}-%{gitdate}git%{gitversion}.tar.bz2
 ## distro specific patches ##
 Patch10:        lxdm-0.2.0-config.patch
 # SELinux, permit graphical root login etc.
@@ -33,6 +28,11 @@ BuildRequires:  gtk2-devel >= 2.12.0
 BuildRequires:  iso-codes-devel
 BuildRequires:  ConsoleKit-devel
 BuildRequires:  intltool >= 0.40.0
+
+# for autogen.sh
+BuildRequires:	automake
+BuildRequires:	libtool
+
 Requires:       pam
 Requires:       /sbin/shutdown
 Requires:       desktop-backgrounds-compat
@@ -49,19 +49,22 @@ KDM in LXDE distros. It's still in very 
 %prep
 %setup -qn lxdm
 
-%patch4 -p1 -b .dsofix
+export NOCONFIGURE=yes
+sh autogen.sh
+
 %patch10 -p1 -b .config
 %patch11 -p1 -b .orig
 
 
 %build
+./autogen.sh
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
 %find_lang %{name}
 
 # these files are not in the package, but should be owned by lxdm 
@@ -98,11 +101,14 @@ rm -rf %{buildroot}
 %dir %{_localstatedir}/spool/gdm/
 
 %changelog
-* Wed Feb 24 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.0-0.1.20100223gitdf819fd
+* Wed Mar 03 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-0.1.20100303gite4f7b39
+- Update to git release e4f7b39 (fixes #564995)
+- Fix SELinux problems (#564320)
+
+* Wed Feb 24 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lxdm/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	24 Feb 2010 00:08:39 -0000	1.4
+++ sources	3 Mar 2010 01:22:50 -0000	1.5
@@ -1 +1 @@
-b5176d766507afbf8d1f75282d26c402  lxdm-20100223gitdf819fd.tar.bz2
+44c6d9839af3116fe925518d2b2ca3c2  lxdm-20100303gite4f7b39.tar.bz2


--- lxdm-0.1.0-dsofix.patch DELETED ---



More information about the scm-commits mailing list