rpms/xorg-x11-xsm/devel rstart-1.0.1-rstart-installation-location-fixes.patch, NONE, 1.1 xsm-1.0.1-xsm-installation-location-fixes.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xorg-x11-xsm.spec, 1.5, 1.6 rstart-0.99.1-rstart-installation-location-fixes.patch, 1.2, NONE xsm-0.99.2-xsm-installation-location-fixes.patch, 1.2, NONE

[fedora-cvs-commits at redhat.com]

Author: mharris

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

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

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

--- NEW FILE rstart-1.0.1-rstart-installation-location-fixes.patch ---
--- rstart-1.0.1/Makefile.am.installation-location-fixes	2005-11-23 06:28:35.000000000 -0500
+++ rstart-1.0.1/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	\

xsm-1.0.1-xsm-installation-location-fixes.patch:
 Makefile.am |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xsm-1.0.1-xsm-installation-location-fixes.patch ---
--- xsm-1.0.1/Makefile.am.xsm-installation-location-fixes	2005-11-23 07:04:34.000000000 -0500
+++ xsm-1.0.1/Makefile.am	2005-11-23 07:05:47.000000000 -0500
@@ -21,7 +21,7 @@
 
 bin_PROGRAMS = xsm
 
-SYSTEM_INIT_DIR = $(libdir)/X11/xsm
+SYSTEM_INIT_DIR = $(sysconfdir)/X11/xsm
 
 
 xsm_CFLAGS = $(XSM_CFLAGS) -DRSHCMD=\"@RSH@\" \


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xsm/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Dec 2005 19:38:35 -0000	1.3
+++ .cvsignore	31 Jan 2006 16:05:17 -0000	1.4
@@ -1,3 +1,3 @@
-rstart-1.0.0.tar.bz2
-smproxy-1.0.0.tar.bz2
-xsm-1.0.0.tar.bz2
+rstart-1.0.1.tar.bz2
+smproxy-1.0.1.tar.bz2
+xsm-1.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xsm/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Dec 2005 19:38:35 -0000	1.3
+++ sources	31 Jan 2006 16:05:17 -0000	1.4
@@ -1,3 +1,3 @@
-7c0c59d789dcc551c4cd5aa3e11bff63  rstart-1.0.0.tar.bz2
-5349b08a4801b57ead9b53ba960f1d4f  smproxy-1.0.0.tar.bz2
-a9da580db77532d62968e86525dd3289  xsm-1.0.0.tar.bz2
+48bb7ad1fb9a4e43a8a702148dfb846e  rstart-1.0.1.tar.bz2
+977acfb1f74d0de55d78bd80a4e08ad3  smproxy-1.0.1.tar.bz2
+cce867ff7d0df9c0b9e682591779952c  xsm-1.0.1.tar.bz2


Index: xorg-x11-xsm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xsm/devel/xorg-x11-xsm.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-xsm.spec	16 Dec 2005 19:38:35 -0000	1.5
+++ xorg-x11-xsm.spec	31 Jan 2006 16:05:17 -0000	1.6
@@ -2,24 +2,24 @@
 
 Summary: X.Org X11 X Session Manager
 Name: xorg-x11-%{pkgname}
-Version: 1.0.0
+Version: 1.0.1
 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-RC4/everything/xsm-1.0.0.tar.bz2
-Source1: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/smproxy-1.0.0.tar.bz2
-Source2: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/rstart-1.0.0.tar.bz2
+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
 
 # Patches for xsm (10-19)
-Patch10: xsm-0.99.2-xsm-installation-location-fixes.patch
+Patch10: xsm-1.0.1-xsm-installation-location-fixes.patch
 
 # Patches for smproxy (20-29)
 #Patch20:
 
 # Patches for rstart (30-39)
-Patch30: rstart-0.99.1-rstart-installation-location-fixes.patch
+Patch30: rstart-1.0.1-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
+* Wed Jan 18 2006 Mike A. Harris <mharris at redhat.com> 1.0.1-1
+- Updated all apps to version 1.0.1 from X11R7.0
+
 * Tue Nov 22 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-1
 - Updated all apps to version 1.0.0 from X11R7 RC4.
 - Changed manpage dir from man1x to man1 to match upstream default.


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


--- xsm-0.99.2-xsm-installation-location-fixes.patch DELETED ---