Hello community, here is the log from the commit of package xsp for openSUSE:Factory checked in at 2016-06-14 23:07:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xsp (Old) and /work/SRC/openSUSE:Factory/.xsp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xsp" Changes: -------- --- /work/SRC/openSUSE:Factory/xsp/xsp.changes 2015-05-11 19:49:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xsp.new/xsp.changes 2016-06-14 23:07:05.000000000 +0200 @@ -1,0 +2,8 @@ +Sun Jun 5 00:00:00 UTC 2016 - [email protected] + +- Added patch mono-440-build-fix.patch: + * Alter mono libraries search path in order to fix build with mono 4.4.0 and up +- Added mono-4-install.patch: + * Alter xsp mono package path for mono 4.0 and up in order to fix xsp2 startup crash + +------------------------------------------------------------------- New: ---- mono-4-install.patch mono-440-build-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xsp.spec ++++++ --- /var/tmp/diff_new_pack.y8yBfY/_old 2016-06-14 23:07:06.000000000 +0200 +++ /var/tmp/diff_new_pack.y8yBfY/_new 2016-06-14 23:07:06.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xsp # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,8 @@ Source: https://github.com/mono/xsp/archive/%{version}.tar.gz Source1: xsp.conf Patch1: %{name}-3.0.11-fix-bashisms.patch +Patch2: mono-440-build-fix.patch +Patch3: mono-4-install.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch BuildRequires: autoconf @@ -48,9 +50,25 @@ The XSP server is a small Web server that hosts the Mono System.Web classes for running what is commonly known as ASP.NET. +%define mcsver %({ mcs --version | awk '{print $5}' | cut -f1 -d"." ; mcs --version | awk '{print $5}' | cut -f2 -d"." ; } | xargs printf "%03d") + +%if 0%{?mcsver} >= 4000 +%define target2_dir xsp2 +%define target4_dir xsp4 +%else +%define target2_dir 2.0 +%define target4_dir 4.5 +%endif + %prep %setup -q %patch1 -p1 +%if 0%{?mcsver} >= 4004 +%patch2 -p1 +%endif +%if 0%{?mcsver} >= 4000 +%patch3 -p1 +%endif %build NOCONFIGURE=1 ./autogen.sh @@ -102,14 +120,16 @@ %doc NEWS README %{_bindir}/* %{_datadir}/pkgconfig/* -%{_prefix}/lib/mono/2.0/Mono.WebServer2.dll -%{_prefix}/lib/mono/2.0/fastcgi-mono-server2.exe -%{_prefix}/lib/mono/2.0/mod-mono-server2.exe -%{_prefix}/lib/mono/2.0/xsp2.exe -%{_prefix}/lib/mono/4.5/Mono.WebServer2.dll -%{_prefix}/lib/mono/4.5/fastcgi-mono-server4.exe -%{_prefix}/lib/mono/4.5/mod-mono-server4.exe -%{_prefix}/lib/mono/4.5/xsp4.exe +%dir %{_prefix}/lib/mono/%{target2_dir} +%{_prefix}/lib/mono/%{target2_dir}/Mono.WebServer2.dll +%{_prefix}/lib/mono/%{target2_dir}/fastcgi-mono-server2.exe +%{_prefix}/lib/mono/%{target2_dir}/mod-mono-server2.exe +%{_prefix}/lib/mono/%{target2_dir}/xsp2.exe +%dir %{_prefix}/lib/mono/%{target4_dir} +%{_prefix}/lib/mono/%{target4_dir}/Mono.WebServer2.dll +%{_prefix}/lib/mono/%{target4_dir}/fastcgi-mono-server4.exe +%{_prefix}/lib/mono/%{target4_dir}/mod-mono-server4.exe +%{_prefix}/lib/mono/%{target4_dir}/xsp4.exe %{_prefix}/lib/mono/gac/Mono.WebServer2 %{_prefix}/lib/mono/gac/fastcgi-mono-server2 %{_prefix}/lib/mono/gac/fastcgi-mono-server4 ++++++ mono-4-install.patch ++++++ diff -uprN xsp-3.0.11.old/packaging/opensuse/xsp2.init xsp-3.0.11.new/packaging/opensuse/xsp2.init --- xsp-3.0.11.old/packaging/opensuse/xsp2.init 2013-05-14 15:46:56.000000000 +0400 +++ xsp-3.0.11.new/packaging/opensuse/xsp2.init 2016-06-08 15:07:47.954947643 +0300 @@ -111,7 +111,7 @@ # Check for missing binaries (stale symlinks should not happen) # Note: Special treatment of stop for LSB conformance -XSP2_BIN=/usr/lib/mono/2.0/xsp2.exe +XSP2_BIN=/usr/lib/mono/xsp2/xsp2.exe XSP2_WRAPPER=/usr/bin/xsp2 MONO_BIN=/usr/bin/mono test -x $XSP2_BIN || { echo "$XSP2_BIN not installed"; diff -uprN xsp-3.0.11.old/scripts/Makefile.am xsp-3.0.11.new/scripts/Makefile.am --- xsp-3.0.11.old/scripts/Makefile.am 2013-05-14 15:46:56.000000000 +0400 +++ xsp-3.0.11.new/scripts/Makefile.am 2016-06-08 15:08:27.210947559 +0300 @@ -16,11 +16,11 @@ bin_SCRIPTS = $(bin2_scripts) $(tool2_sc CLEANFILES = $(bin2_scripts_real) $(tool2_scripts) $(bin_scripts) $(tool_scripts) $(bin4_scripts) $(tool4_scripts) -plat_bindir2 = $(prefix)/lib/mono/2.0 +plat_bindir2 = $(prefix)/lib/mono/xsp2 plat_tooldir2 = $(prefix)/lib/xsp/2.0 if NET_4_0 -plat_bindir4 = $(prefix)/lib/mono/4.5 +plat_bindir4 = $(prefix)/lib/mono/xsp4 plat_tooldir4 = $(prefix)/lib/xsp/4.0 endif diff -uprN xsp-3.0.11.old/src/Mono.WebServer/Makefile.am xsp-3.0.11.new/src/Mono.WebServer/Makefile.am --- xsp-3.0.11.old/src/Mono.WebServer/Makefile.am 2013-05-14 15:46:56.000000000 +0400 +++ xsp-3.0.11.new/src/Mono.WebServer/Makefile.am 2016-06-08 15:10:08.520628986 +0300 @@ -6,13 +6,13 @@ SYSTEMCORE_DEP=@SYSTEMCORE_DEP@ monowebserver2dir = $(prefix)/lib/xsp/2.0 monowebserver2_install = 2.0/Mono.WebServer2.dll monowebserver2_references = -r:System.Web.dll -r:System.Configuration.dll -r:Mono.Security.dll -r:System.Core.dll -GACUTIL2=$(GACUTIL) -package 2.0 +GACUTIL2=$(GACUTIL) -package xsp2 if NET_4_0 monowebserver4dir = $(prefix)/lib/xsp/4.5 monowebserver4_install = 4.0/Mono.WebServer2.dll monowebserver4_references = $(monowebserver2_references) -GACUTIL4=$(GACUTIL) -package 4.5 +GACUTIL4=$(GACUTIL) -package xsp4 endif noinst_SCRIPTS= $(monowebserver2_install) $(monowebserver4_install) diff -uprN xsp-3.0.11.old/src/Mono.WebServer.Apache/Makefile.am xsp-3.0.11.new/src/Mono.WebServer.Apache/Makefile.am --- xsp-3.0.11.old/src/Mono.WebServer.Apache/Makefile.am 2013-05-14 15:46:56.000000000 +0400 +++ xsp-3.0.11.new/src/Mono.WebServer.Apache/Makefile.am 2016-06-08 15:11:06.756628861 +0300 @@ -3,11 +3,11 @@ builddir=$(top_builddir)/src/Mono.WebSer MCSFLAGS= -unsafe -debug+ -debug:full -nologo -nowarn:618 $(WEBTRACING) -keyfile:$(top_srcdir)/src/mono.snk MODMONOSERVER2_EXE = mod-mono-server2.exe -GACUTIL2=$(GACUTIL) -package 2.0 +GACUTIL2=$(GACUTIL) -package xsp2 if NET_4_0 MODMONOSERVER4_EXE = mod-mono-server4.exe -GACUTIL4=$(GACUTIL) -package 4.5 +GACUTIL4=$(GACUTIL) -package xsp4 endif noinst_SCRIPTS = $(MODMONOSERVER2_EXE) $(MODMONOSERVER4_EXE) diff -uprN xsp-3.0.11.old/src/Mono.WebServer.FastCgi/Makefile.am xsp-3.0.11.new/src/Mono.WebServer.FastCgi/Makefile.am --- xsp-3.0.11.old/src/Mono.WebServer.FastCgi/Makefile.am 2013-05-14 15:46:56.000000000 +0400 +++ xsp-3.0.11.new/src/Mono.WebServer.FastCgi/Makefile.am 2016-06-08 15:11:23.980628824 +0300 @@ -3,11 +3,11 @@ builddir=$(top_builddir)/src/Mono.WebSer MCSFLAGS= -debug+ -debug:full -nologo -nowarn:618 $(WEBTRACING) -unsafe+ -keyfile:$(top_srcdir)/src/mono.snk XSP2_EXE = fastcgi-mono-server2.exe -GACUTIL2=$(GACUTIL) -package 2.0 +GACUTIL2=$(GACUTIL) -package xsp2 if NET_4_0 XSP4_EXE = fastcgi-mono-server4.exe -GACUTIL4=$(GACUTIL) -package 4.5 +GACUTIL4=$(GACUTIL) -package xsp4 endif noinst_SCRIPTS = $(XSP2_EXE) $(XSP4_EXE) diff -uprN xsp-3.0.11.old/src/Mono.WebServer.XSP/Makefile.am xsp-3.0.11.new/src/Mono.WebServer.XSP/Makefile.am --- xsp-3.0.11.old/src/Mono.WebServer.XSP/Makefile.am 2013-05-14 15:46:56.000000000 +0400 +++ xsp-3.0.11.new/src/Mono.WebServer.XSP/Makefile.am 2016-06-08 15:11:40.280628788 +0300 @@ -4,11 +4,11 @@ pkgconfigdir=$(libdir)/pkgconfig MCSFLAGS= -debug+ -debug:full -nologo -nowarn:618 -unsafe $(WEBTRACING) -keyfile:$(top_srcdir)/src/mono.snk XSP2_EXE = xsp2.exe -GACUTIL2=$(GACUTIL) -package 2.0 +GACUTIL2=$(GACUTIL) -package xsp2 if NET_4_0 XSP4_EXE = xsp4.exe -GACUTIL4=$(GACUTIL) -package 4.5 +GACUTIL4=$(GACUTIL) -package xsp4 endif noinst_SCRIPTS = $(XSP2_EXE) $(XSP4_EXE) diff -uprN xsp-3.0.11.old/src/Mono.WebServer.XSP/xsp-2.pc.in xsp-3.0.11.new/src/Mono.WebServer.XSP/xsp-2.pc.in --- xsp-3.0.11.old/src/Mono.WebServer.XSP/xsp-2.pc.in 2013-05-14 15:46:56.000000000 +0400 +++ xsp-3.0.11.new/src/Mono.WebServer.XSP/xsp-2.pc.in 2016-06-08 15:07:47.954947643 +0300 @@ -1,5 +1,5 @@ prefix=@prefix@ -assemblies_dir=${prefix}/lib/mono/2.0 +assemblies_dir=${prefix}/lib/mono/xsp2 Libraries=${assemblies_dir}/Mono.WebServer2.dll Executable=${assemblies_dir}/xsp2.exe diff -uprN xsp-3.0.11.old/src/Mono.WebServer.XSP/xsp-4.pc.in xsp-3.0.11.new/src/Mono.WebServer.XSP/xsp-4.pc.in --- xsp-3.0.11.old/src/Mono.WebServer.XSP/xsp-4.pc.in 2013-05-14 15:46:56.000000000 +0400 +++ xsp-3.0.11.new/src/Mono.WebServer.XSP/xsp-4.pc.in 2016-06-08 15:24:35.764508410 +0300 @@ -1,5 +1,5 @@ prefix=@prefix@ -assemblies_dir=${prefix}/lib/mono/4.5 +assemblies_dir=${prefix}/lib/mono/xsp4 Libraries=${assemblies_dir}/Mono.WebServer2.dll Executable=${assemblies_dir}/xsp4.exe ++++++ mono-440-build-fix.patch ++++++ diff -uprN xsp-3.0.11.old/build/m4/shamrock/mono.m4 xsp-3.0.11.new/build/m4/shamrock/mono.m4 --- xsp-3.0.11.old/build/m4/shamrock/mono.m4 2013-05-14 15:46:56.000000000 +0400 +++ xsp-3.0.11.new/build/m4/shamrock/mono.m4 2016-06-08 12:30:43.330749909 +0300 @@ -74,21 +74,21 @@ AC_DEFUN([SHAMROCK_CHECK_MONO_1_0_GAC_AS AC_DEFUN([SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES], [ - _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono, 2.0, $*) + _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono, 2.0-api, $*) ]) AC_DEFUN([SHAMROCK_CHECK_MONO2_2_0_GAC_ASSEMBLIES], [ - _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono-2, 2.0, $*) + _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono-2, 2.0-api, $*) ]) AC_DEFUN([SHAMROCK_CHECK_MONO_4_0_GAC_ASSEMBLIES], [ - _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono, 4.0, $*) + _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono, 4.0-api, $*) ]) AC_DEFUN([SHAMROCK_CHECK_MONO2_4_0_GAC_ASSEMBLIES], [ - _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono-2, 4.0, $*) + _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono-2, 4.0-api, $*) ]) diff -uprN xsp-3.0.11.old/configure.ac xsp-3.0.11.new/configure.ac --- xsp-3.0.11.old/configure.ac 2013-05-14 15:46:56.000000000 +0400 +++ xsp-3.0.11.new/configure.ac 2016-06-08 12:30:43.330749909 +0300 @@ -76,8 +76,8 @@ if test "x$GMCS" = "xno" -a "x$DMCS" = " fi AC_MSG_CHECKING([for Mono 2.0 GAC for Mono.Data.Sqlite.dll]) -if test -e "$($PKG_CONFIG --variable=libdir mono)/mono/2.0/Mono.Data.Sqlite.dll" -o \ - -e "$($PKG_CONFIG --variable=prefix mono)/lib/mono/2.0/Mono.Data.Sqlite.dll"; then +if test -e "$($PKG_CONFIG --variable=libdir mono)/mono/2.0-api/Mono.Data.Sqlite.dll" -o \ + -e "$($PKG_CONFIG --variable=prefix mono)/lib/mono/2.0-api/Mono.Data.Sqlite.dll"; then AC_MSG_RESULT([found]) HAVE_MONO_SQLITE=yes else
