packages: xorg-app-xinit/xorg-app-xinit-consolekit-support.patch, xorg-app-...

[qboosh]

Author: qboosh                       Date: Thu May 27 07:29:30 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.2.1
- removed obsolete xinitdir patch (pass --with-xinitdir instead)
- updated consolekit-support patch

---- Files affected:
packages/xorg-app-xinit:
   xorg-app-xinit-consolekit-support.patch (1.1 -> 1.2) , xorg-app-xinit.spec (1.26 -> 1.27) , xorg-app-xinit-xinitdir.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/xorg-app-xinit/xorg-app-xinit-consolekit-support.patch
diff -u packages/xorg-app-xinit/xorg-app-xinit-consolekit-support.patch:1.1 packages/xorg-app-xinit/xorg-app-xinit-consolekit-support.patch:1.2
--- packages/xorg-app-xinit/xorg-app-xinit-consolekit-support.patch:1.1	Sun Dec 23 12:59:41 2007
+++ packages/xorg-app-xinit/xorg-app-xinit-consolekit-support.patch	Thu May 27 09:29:24 2010
@@ -1,18 +1,3 @@
-diff --git a/Makefile.am b/Makefile.am
-index babc2f3..9b912a3 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -24,8 +24,8 @@ XINITDIR = $(libdir)/X11/xinit
- bin_PROGRAMS = xinit
- bin_SCRIPTS = startx
- 
--xinit_CFLAGS = $(XINIT_CFLAGS) -DXINITDIR=\"$(XINITDIR)\" -DBINDIR=\"$(bindir)\"
--xinit_LDADD = $(XINIT_LIBS)
-+xinit_CFLAGS = $(XINIT_CFLAGS) $(CK_CFLAGS) -DXINITDIR=\"$(XINITDIR)\" -DBINDIR=\"$(bindir)\"
-+xinit_LDADD = $(XINIT_LIBS) $(CK_LIBS)
- 
- xinit_SOURCES =	\
-         xinit.c
 diff --git a/configure.ac b/configure.ac
 index 1aee1d2..5775db3 100644
 --- a/configure.ac
@@ -25,7 +10,7 @@
  # You always want to specify the full path to the X server
  DEFAULT_XSERVER=${bindir}/X
  DEFAULT_XAUTH=xauth
-@@ -104,6 +105,20 @@ esac
+@@ -104,6 +105,22 @@ esac
  AC_SUBST(XINIT_CFLAGS)
  AC_SUBST(XINIT_LIBS)
  
@@ -40,6 +25,8 @@
 +		[have_conkit=no; echo no])
 +	if test "x$have_conkit" = xyes ; then
 +		AC_DEFINE(USE_CONKIT, 1, [Define if you have ConsoleKit])
++		XINIT_CFLAGS="$XINIT_CFLAGS $CK_CFLAGS"
++		XINIT_LIBS="$XINIT_LIBS $CK_LIBS"
 +	fi
 +fi
 +

================================================================
Index: packages/xorg-app-xinit/xorg-app-xinit.spec
diff -u packages/xorg-app-xinit/xorg-app-xinit.spec:1.26 packages/xorg-app-xinit/xorg-app-xinit.spec:1.27
--- packages/xorg-app-xinit/xorg-app-xinit.spec:1.26	Thu Dec 25 16:59:55 2008
+++ packages/xorg-app-xinit/xorg-app-xinit.spec	Thu May 27 09:29:24 2010
@@ -6,19 +6,18 @@
 Summary:	xinit application - X Window System initializer
 Summary(pl.UTF-8):	Aplikacja xinit do uruchamiania X Window System
 Name:		xorg-app-xinit
-Version:	1.1.1
+Version:	1.2.1
 Release:	1
 License:	MIT
 Group:		X11/Applications
 Source0:	http://xorg.freedesktop.org/releases/individual/app/xinit-%{version}.tar.bz2
-# Source0-md5:	93c73705ed9eb1e1a6b6938405672f2b
+# Source0-md5:	56f2d202b3dc10fcd21931a67bb270f7
 Source1:	startx.1x.it
 Source2:	startx.1x.pl
 Source3:	xinit.1x.it
 Source4:	xinit.1x.pl
 Patch0:		%{name}-xwrapper.patch
-Patch1:		%{name}-xinitdir.patch
-Patch2:		%{name}-consolekit-support.patch
+Patch1:		%{name}-consolekit-support.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	ConsoleKit-devel
 BuildRequires:	autoconf >= 2.57
@@ -62,7 +61,6 @@
 %setup -q -n xinit-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__aclocal}
@@ -70,7 +68,8 @@
 %{__autoheader}
 %{__automake}
 %configure \
-	--with-consolekit
+	--with-consolekit \
+	--with-xinitdir=/etc/X11/xinit
 
 %{__make}
 
@@ -113,6 +112,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2010/05/27 07:29:24  qboosh
+- updated to 1.2.1
+- removed obsolete xinitdir patch (pass --with-xinitdir instead)
+- updated consolekit-support patch
+
 Revision 1.26  2008/12/25 15:59:55  qboosh
 - updated to 1.1.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-app-xinit/xorg-app-xinit-consolekit-support.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-app-xinit/xorg-app-xinit.spec?r1=1.26&r2=1.27&f=u