rpms/xorg-x11-xsm/devel rstart-1.0.2-rstart-installation-location-fixes.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xorg-x11-xsm.spec, 1.10, 1.11 rstart-1.0.1-rstart-installation-location-fixes.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-xsm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30261/devel

Modified Files:
	.cvsignore sources xorg-x11-xsm.spec 
Added Files:
	rstart-1.0.2-rstart-installation-location-fixes.patch 
Removed Files:
	rstart-1.0.1-rstart-installation-location-fixes.patch 
Log Message:
auto-import xorg-x11-xsm-1.0.2-1 on branch devel from xorg-x11-xsm-1.0.2-1.src.rpm

rstart-1.0.2-rstart-installation-location-fixes.patch:
 Makefile.am |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE rstart-1.0.2-rstart-installation-location-fixes.patch ---
--- rstart-1.0.2/Makefile.am.installation-location-fixes	2005-11-23 06:28:35.000000000 -0500
+++ rstart-1.0.2/Makefile.am	2005-11-23 06:31:44.000000000 -0500
@@ -26,7 +26,7 @@
 
 rstartd_real_CFLAGS = $(RSTART_CFLAGS)			\
 		-DSERVERNAME=\"rstart\"			\
-		-DDEFAULT_CONFIG=\"$(libdir)/X11/rstart/config\"
+		-DDEFAULT_CONFIG=\"$(datadir)/X11/rstart/config\"
 
 rstartd_real_LDADD = $(RSTART_LIBS)
 
@@ -50,9 +50,10 @@
 
 # config data
 
-configdir = $(libdir)/X11/rstart
+configdir = $(sysconfdir)/X11/rstart
 config_DATA = config
 
+# The -DLIBDIR=$(configdir) here just looks "wrong".. we'll see...
 config: config.cpp
 	$(RAWCPP) $(RAWCPPFLAGS) -DPACKAGEname=rstart -DLIBDIR=$(configdir) \
 	-DENVPREFIX=RSTART < ${srcdir}/config.cpp | $(CPP_SED_MAGIC) > $@
@@ -99,7 +100,7 @@
 # FIXME: Someone who cares about rstart may want to look into sanitizing
 # the stuff below.
 
-DATA_DIR = $(libdir)/X11/rstart
+DATA_DIR = $(datadir)/X11/rstart
 
 install-data-hook:
 	for name in `find ${srcdir}/commands -print | grep -v CVS` ; do	\


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xsm/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 Jan 2006 16:05:17 -0000	1.4
+++ .cvsignore	27 Apr 2006 22:54:49 -0000	1.5
@@ -1,3 +1,3 @@
-rstart-1.0.1.tar.bz2
-smproxy-1.0.1.tar.bz2
 xsm-1.0.1.tar.bz2
+rstart-1.0.2.tar.bz2
+smproxy-1.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xsm/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 Jan 2006 16:05:17 -0000	1.4
+++ sources	27 Apr 2006 22:54:49 -0000	1.5
@@ -1,3 +1,3 @@
-48bb7ad1fb9a4e43a8a702148dfb846e  rstart-1.0.1.tar.bz2
-977acfb1f74d0de55d78bd80a4e08ad3  smproxy-1.0.1.tar.bz2
 cce867ff7d0df9c0b9e682591779952c  xsm-1.0.1.tar.bz2
+99aea04a27197056368a4431f30f9cdb  rstart-1.0.2.tar.bz2
+31da204a0255ba8c6a65386e65dc1c90  smproxy-1.0.2.tar.bz2


Index: xorg-x11-xsm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xsm/devel/xorg-x11-xsm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-xsm.spec	1 Mar 2006 07:12:49 -0000	1.10
+++ xorg-x11-xsm.spec	27 Apr 2006 22:54:49 -0000	1.11
@@ -2,15 +2,15 @@
 
 Summary: X.Org X11 X Session Manager
 Name: xorg-x11-%{pkgname}
-Version: 1.0.1
-Release: 1.2
+Version: 1.0.2
+Release: 1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xsm-1.0.1.tar.bz2
-Source1: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/smproxy-1.0.1.tar.bz2
-Source2: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/rstart-1.0.1.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/individual/app/xsm-1.0.1.tar.bz2
+Source1: http://xorg.freedesktop.org/releases/individual/app/smproxy-1.0.2.tar.bz2
+Source2: http://xorg.freedesktop.org/releases/individual/app/rstart-1.0.2.tar.bz2
 
 # Patches for xsm (10-19)
 Patch10: xsm-1.0.1-xsm-installation-location-fixes.patch
@@ -19,7 +19,7 @@
 #Patch20:
 
 # Patches for rstart (30-39)
-Patch30: rstart-1.0.1-rstart-installation-location-fixes.patch
+Patch30: rstart-1.0.2-rstart-installation-location-fixes.patch
 
 # FIXME: The BuildRequires are all missing here and need to be figured out.
 # That's low priority for now though, unless we encounter real build
@@ -122,6 +122,9 @@
 %config %{_sysconfdir}/X11/xsm/system.xsm
 
 %changelog
+* Thu Apr 27 2006 Adam Jackson <ajackson at redhat.com> 1.0.2-1
+- Update smproxy and rstart
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.2
 - bump again for double-long bug on ppc(64)
 


--- rstart-1.0.1-rstart-installation-location-fixes.patch DELETED ---