aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfcrozat <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>2006-05-29 12:29:19 +0000
committerfcrozat <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>2006-05-29 12:29:19 +0000
commite473dbe6f56cbc7dd9c656097e2046e58d8c43b4 (patch)
treea8e17f8299c1a80424345ff8699f2b7005575e80
parent45000fc68e1359839c33eb4ac632cfbc06812440 (diff)
downloads2u-e473dbe6f56cbc7dd9c656097e2046e58d8c43b4.tar
s2u-e473dbe6f56cbc7dd9c656097e2046e58d8c43b4.tar.gz
s2u-e473dbe6f56cbc7dd9c656097e2046e58d8c43b4.tar.bz2
s2u-e473dbe6f56cbc7dd9c656097e2046e58d8c43b4.tar.xz
s2u-e473dbe6f56cbc7dd9c656097e2046e58d8c43b4.zip
- Fix for modular xorg
git-svn-id: svn+ssh://svn.mandriva.com/svn/soft/s2u/trunk@179827 99302b65-d5f7-0310-b3dd-f8cd6f4e3d94
-rw-r--r--Makefile2
-rw-r--r--s2u.c4
-rw-r--r--s2u.spec5
3 files changed, 7 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 0c09f53..07eee05 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@
PACKAGE=s2u
VERSION:=$(shell rpm -q --qf '%{VERSION}\n' --specfile $(PACKAGE).spec | head -1)
-RELEASE:=$(shell rpm -q --qf '%{RELEASE}\n' --specfile $(PACKAGE).spec | head -1)
+RELEASE:=$(shell rpm -q --qf '%{RELEASE}\n' --specfile $(PACKAGE).spec | head -1| sed -e 's/%mkrel \(.*\)/\1mdv/g')
TAG := $(shell echo "V$(VERSION)_$(RELEASE)" | tr -- '-.' '__')
FILES = Makefile README hostname-post s2u.c s2u.sh s2u.spec \
diff --git a/s2u.c b/s2u.c
index f8d7ce1..b3904f5 100644
--- a/s2u.c
+++ b/s2u.c
@@ -118,7 +118,7 @@ filter_function (DBusConnection * connection,
"/com/mandriva/user") == 0) {
gchar* args[] =
{
- "/usr/X11R6/bin/xauth",
+ "/usr/bin/xauth",
"add",
NULL,
".",
@@ -178,7 +178,7 @@ main (int argc, char *argv[])
{
GMainLoop *loop;
gchar* args[] = {
- "/usr/X11R6/bin/xauth",
+ "/usr/bin/xauth",
"list",
NULL,
NULL
diff --git a/s2u.spec b/s2u.spec
index 61d3513..611eb19 100644
--- a/s2u.spec
+++ b/s2u.spec
@@ -1,6 +1,6 @@
Summary: System to user tools
Name: s2u
-Version: 0.6
+Version: 0.7
Release: %mkrel 1
URL: http://www.mandrivalinux.com/
Source0: %{name}-%{version}.tar.bz2
@@ -39,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT
# MAKE THE CHANGES IN CVS: NO PATCH OR SOURCE ALLOWED
%changelog
+* Mon May 29 2006 Frederic Crozat <fcrozat@mandriva.com> 0.7-1mdv2007.0
+- Fix for modular xorg
+
* Fri Jan 27 2006 Frederic Lepied <flepied@mandriva.com> 0.6-1mdk
- switch to Mandriva
- log actions by default