Hello community,
here is the log from the commit of package xsp
checked in at Mon Oct 6 19:45:53 CEST 2008.
--------
--- xsp/xsp.changes 2008-09-22 21:11:08.000000000 +0200
+++ /mounts/work_src_done/STABLE/xsp/xsp.changes 2008-10-01 23:17:29.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Oct 1 15:16:09 MDT 2008 - ajorgensen@novell.com
+
+- Update to 2.0 RC4
+ * Fixes bnc#431121
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xsp.spec ++++++
--- /var/tmp/diff_new_pack.gT1153/_old 2008-10-06 19:42:02.000000000 +0200
+++ /var/tmp/diff_new_pack.gT1153/_new 2008-10-06 19:42:02.000000000 +0200
@@ -24,7 +24,7 @@
Group: Productivity/Networking/Web/Servers
AutoReqProv: on
Version: 2.0
-Release: 12
+Release: 13
Summary: Small Web Server Hosting ASP.NET
Source: %{name}-%{version}.tar.bz2
#Patch: xsp-libexecdir.patch
@@ -109,6 +109,9 @@
%define __find_requires env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-requires && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-requires ; } | sort | uniq'
%changelog
+* Wed Oct 01 2008 ajorgensen@novell.com
+- Update to 2.0 RC4
+ * Fixes bnc#431121
* Mon Sep 22 2008 ajorgensen@novell.com
- Update to 2.0 RC3
* Defaults to 2.0 profile (fixes a bug in mod_mono)
++++++ xsp-2.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xsp-2.0/ChangeLog new/xsp-2.0/ChangeLog
--- old/xsp-2.0/ChangeLog 2008-09-22 20:09:30.000000000 +0200
+++ new/xsp-2.0/ChangeLog 2008-10-01 23:05:38.000000000 +0200
@@ -1,3 +1,12 @@
+2008-10-01 Miguel de Icaza
+
+ * Fix the scripts, my previous commit was untested, and some
+ scripts ended up not pointing to the right place (xsp was trying
+ to call 2.0/xsp.exe instead of 2.0/xsp2.exe and xsp1 was trying to
+ call 1.0/xsp1.exe instead of 1.0/xsp.exe).
+
+ Fixes #431121
+
2008-09-21 Miguel de Icaza
* scripts/Makefile.am ($(tool_scripts)): Follow the naming pattern
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xsp-2.0/scripts/Makefile.am new/xsp-2.0/scripts/Makefile.am
--- old/xsp-2.0/scripts/Makefile.am 2008-09-22 20:09:30.000000000 +0200
+++ new/xsp-2.0/scripts/Makefile.am 2008-10-01 23:05:29.000000000 +0200
@@ -23,26 +23,26 @@
REWRITE = sed \
-e 's,@''plat_bindir@,$(plat_bindir),g' \
- -e 's,@''exe_file@,$@.exe,g' \
+ -e 's,@''exe_file@,'`basename $@ 1`'.exe,g' \
-e 's,@''RUNTIME@,@RUNTIME@,g'
REWRITE2 = sed \
-e 's,@''plat_bindir@,$(plat_bindir2),g' \
- -e 's,@''exe_file@,$@.exe,g' \
+ -e 's,@''exe_file@,'`basename $@ 2`'2.exe,g' \
-e 's,@''RUNTIME@,@RUNTIME@,g'
REWRITE_TOOLS = sed \
-e 's,@''plat_bindir@,$(plat_tooldir),g' \
- -e 's,@''exe_file@,$@.exe,g' \
+ -e 's,@''exe_file@,'`basename $@ 1`'.exe,g' \
-e 's,@''RUNTIME@,@RUNTIME@,g'
-REWRITE_TOOLS2 = sed \
+REWRITE_TOOLS2 = echo dd $@ dd; sed \
-e 's,@''plat_bindir@,$(plat_tooldir2),g' \
- -e 's,@''exe_file@,$@.exe,g' \
+ -e 's,@''exe_file@,'`basename $@ 2`'2.exe,g' \
-e 's,@''RUNTIME@,@RUNTIME@,g'
$(bin1_scripts): $(srcdir)/script.in Makefile.am
- $(REWRITE) $(srcdir)/script.in > $@.tmp
+ e=`basename $@ 1`; $(REWRITE) $(srcdir)/script.in > $@.tmp
mv $@.tmp $@
$(tool1_scripts): $(srcdir)/script.in Makefile.am
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xsp-2.0/scripts/Makefile.in new/xsp-2.0/scripts/Makefile.in
--- old/xsp-2.0/scripts/Makefile.in 2008-09-22 20:09:51.000000000 +0200
+++ new/xsp-2.0/scripts/Makefile.in 2008-10-01 23:05:55.000000000 +0200
@@ -156,22 +156,22 @@
plat_tooldir2 = $(prefix)/lib/xsp/2.0
REWRITE = sed \
-e 's,@''plat_bindir@,$(plat_bindir),g' \
- -e 's,@''exe_file@,$@.exe,g' \
+ -e 's,@''exe_file@,'`basename $@ 1`'.exe,g' \
-e 's,@''RUNTIME@,@RUNTIME@,g'
REWRITE2 = sed \
-e 's,@''plat_bindir@,$(plat_bindir2),g' \
- -e 's,@''exe_file@,$@.exe,g' \
+ -e 's,@''exe_file@,'`basename $@ 2`'2.exe,g' \
-e 's,@''RUNTIME@,@RUNTIME@,g'
REWRITE_TOOLS = sed \
-e 's,@''plat_bindir@,$(plat_tooldir),g' \
- -e 's,@''exe_file@,$@.exe,g' \
+ -e 's,@''exe_file@,'`basename $@ 1`'.exe,g' \
-e 's,@''RUNTIME@,@RUNTIME@,g'
-REWRITE_TOOLS2 = sed \
+REWRITE_TOOLS2 = echo dd $@ dd; sed \
-e 's,@''plat_bindir@,$(plat_tooldir2),g' \
- -e 's,@''exe_file@,$@.exe,g' \
+ -e 's,@''exe_file@,'`basename $@ 2`'2.exe,g' \
-e 's,@''RUNTIME@,@RUNTIME@,g'
all: all-am
@@ -359,7 +359,7 @@
$(bin1_scripts): $(srcdir)/script.in Makefile.am
- $(REWRITE) $(srcdir)/script.in > $@.tmp
+ e=`basename $@ 1`; $(REWRITE) $(srcdir)/script.in > $@.tmp
mv $@.tmp $@
$(tool1_scripts): $(srcdir)/script.in Makefile.am
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org