rpms/xsp/FC-5 xsp.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xsp.spec, 1.10, 1.11
Paul F. Johnson (pfj)
fedora-extras-commits at redhat.com
Thu Aug 31 21:59:37 UTC 2006
Author: pfj
Update of /cvs/extras/rpms/xsp/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5770/FC-5
Modified Files:
.cvsignore sources xsp.spec
Added Files:
xsp.patch
Log Message:
auto-import xsp-1.1.17-1 on branch FC-5 from xsp-1.1.17-1.src.rpm
xsp.patch:
--- NEW FILE xsp.patch ---
--- xsp-1.1.17/configure.in 2006-08-25 20:55:56.000000000 +0100
+++ xsp-1.1.17/configure.in 2006-08-31 00:29:53.000000000 +0100
@@ -56,7 +56,7 @@
echo "$CS compiler: $MCS"
test x$GMCS = xno || echo "$CS 2.0 compiler: $GMCS"
-GACUTIL_FLAGS='-root $(DESTDIR)$(prefix)/lib'
+GACUTIL_FLAGS='-root $(DESTDIR)$(libdir)'
AC_SUBST(MCS)
AC_SUBST(GMCS)
--- xsp-1.1.17/scripts/Makefile.am 2006-08-25 20:55:56.000000000 +0100
+++ xsp-1.1.17/scripts/Makefile.am 2006-08-31 00:32:55.000000000 +0100
@@ -12,10 +12,10 @@
CLEANFILES = $(bin1_scripts) $(bin2_scripts_real) $(tool_scripts) $(tool2_scripts)
-plat_bindir = $(prefix)/lib/mono/1.0
-plat_bindir2 = $(prefix)/lib/mono/2.0
-plat_tooldir = $(prefix)/lib/xsp/1.0
-plat_tooldir2 = $(prefix)/lib/xsp/2.0
+plat_bindir = $(libdir)/mono/1.0
+plat_bindir2 = $(libdir)/mono/2.0
+plat_tooldir = $(libdir)/xsp/1.0
+plat_tooldir2 = $(libdir)/xsp/2.0
REWRITE = sed \
-e 's,@''plat_bindir@,$(plat_bindir),g' \
--- xsp-1.1.17/src/Makefile.am 2006-08-25 20:55:56.000000000 +0100
+++ xsp-1.1.17/src/Makefile.am 2006-08-31 00:31:41.000000000 +0100
@@ -3,10 +3,10 @@
MCSFLAGS= -debug+ -debug:full -nologo -nowarn:618
-xspdir = $(prefix)/lib/xsp/1.0
-modmonoserverdir = $(prefix)/lib/xsp/1.0
-xsp2dir = $(prefix)/lib/xsp/2.0
-modmonoserver2dir = $(prefix)/lib/xsp/2.0
+xspdir = $(libdir)/xsp/1.0
+modmonoserverdir = $(libdir)/xsp/1.0
+xsp2dir = $(libdir)/xsp/2.0
+modmonoserver2dir = $(libdir)/xsp/2.0
GACUTIL1=$(GACUTIL) -package 1.0
if NET_2_0
@@ -28,9 +28,9 @@
xsp_references= -r:System.Web.dll -r:Mono.WebServer/Mono.WebServer.dll -r:Mono.Security.dll
xsp2_references= -r:System.Web.dll -r:System.Configuration.dll -r:Mono.WebServer/Mono.WebServer2.dll -r:Mono.Security.dll
if PLATFORM_WIN32
-modmono_references= -lib:"$(prefix)/lib" -r:Mono.WebServer/Mono.WebServer.dll \
+modmono_references= -lib:"$(libdir)" -r:Mono.WebServer/Mono.WebServer.dll \
-r:System.Web.dll -r:Mono.Posix.dll -r:Mono.Security.dll
-modmono2_references= -lib:"$(prefix)/lib" -r:Mono.WebServer/Mono.WebServer2.dll \
+modmono2_references= -lib:"$(libdir)" -r:Mono.WebServer/Mono.WebServer2.dll \
-r:System.Web.dll -r:Mono.Posix.dll -r:Mono.Security.dll
else
modmono_references= -r:System.Web.dll -r:Mono.WebServer/Mono.WebServer.dll -r:Mono.Posix.dll -r:Mono.Security.dll
--- xsp-1.1.17/tools/dbsessmgr/Makefile.am 2006-07-05 23:27:10.000000000 +0100
+++ xsp-1.1.17/tools/dbsessmgr/Makefile.am 2006-08-31 00:35:59.000000000 +0100
@@ -1,12 +1,12 @@
MCSFLAGS= -debug+ -debug:full -nologo
-dbsessmgrdir = $(prefix)/lib/xsp/1.0
+dbsessmgrdir = $(libdir)/xsp/1.0
dbsessmgr_SCRIPTS = dbsessmgr.exe dbsessmgr.exe.config
if NET_2_0
scripts2 = dbsessmgr2.exe dbsessmgr2.exe.config
endif
-dbsessmgr2dir = $(prefix)/lib/xsp/2.0
+dbsessmgr2dir = $(libdir)/xsp/2.0
dbsessmgr2_SCRIPTS = $(scripts2)
EXTRA_DIST = $(dbsessmgr_input) dbsessmgr.exe.config dbsessmgr2.exe.config
--- xsp-1.1.17/tools/asp_state/Makefile.am 2006-07-05 23:27:10.000000000 +0100
+++ xsp-1.1.17/tools/asp_state/Makefile.am 2006-08-31 00:36:54.000000000 +0100
@@ -1,12 +1,12 @@
MCSFLAGS= -debug+ -debug:full -nologo
-aspstatedir = $(prefix)/lib/xsp/1.0
+aspstatedir = $(libdir)/xsp/1.0
aspstate_SCRIPTS = asp-state.exe asp-state.exe.config
if NET_2_0
scripts2 = asp-state2.exe asp-state2.exe.config
endif
-aspstate2dir = $(prefix)/lib/xsp/2.0
+aspstate2dir = $(libdir)/xsp/2.0
aspstate2_SCRIPTS = $(scripts2)
EXTRA_DIST = $(aspstate_input) asp-state.exe.config asp-state2.exe.config
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xsp/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 13 Aug 2006 21:06:15 -0000 1.5
+++ .cvsignore 31 Aug 2006 21:59:36 -0000 1.6
@@ -1 +1 @@
-xsp-1.1.16.1.tar.gz
+xsp-1.1.17.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xsp/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 13 Aug 2006 21:06:15 -0000 1.5
+++ sources 31 Aug 2006 21:59:36 -0000 1.6
@@ -1 +1 @@
-ae8d88fe86c55f185d41f8753f776eb7 xsp-1.1.16.1.tar.gz
+48988812f6bd57971f65a47d0f491412 xsp-1.1.17.tar.gz
Index: xsp.spec
===================================================================
RCS file: /cvs/extras/rpms/xsp/FC-5/xsp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xsp.spec 13 Aug 2006 21:06:15 -0000 1.10
+++ xsp.spec 31 Aug 2006 21:59:36 -0000 1.11
@@ -1,39 +1,39 @@
-Name: xsp
-Version: 1.1.16.1
-Release: 1%{?dist}
-License: BSD
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-URL: http://www.mono-project.com/ASP.NET
-Source0: http://www.go-mono.com/sources-latest/%{name}/%{name}-%{version}.tar.gz
-BuildRequires: mono-web, mono-data, mono-core, pkgconfig, autoconf
-Requires: mono-core
-Summary: A small web server that hosts ASP.NET
-Group: System Environment/Daemons
+Name: xsp
+Version: 1.1.17
+Release: 1%{?dist}
+License: BSD
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL: http://www.mono-project.com/ASP.NET
+Source0: http://www.go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz
+Patch0: xsp.patch
+BuildRequires: mono-web, mono-data, mono-core, pkgconfig, autoconf automake
+Requires: mono-core
+Summary: A small web server that hosts ASP.NET
+Group: System Environment/Daemons
%define debug_package %{nil}
-%define monodir %{_prefix}/lib
%description
XSP is a standalone web server written in C# that can be used to run ASP.NET
applications as well as a set of pages, controls and web services that you can
use to experience ASP.NET.
-
+
%package devel
-Summary: Development files for XSP
-Requires: %{name} = %{version}-%{release} pkgconfig
Group: Development/Libraries
+Requires: %{name} = %{version}-%{release} pkgconfig
+Summary: Development files for xsp
%description devel
-Development files for XSP
-
+Development files for xsp
+
%prep
%setup -q
-chmod 0644 tools/asp_state/*.config
-chmod 0644 tools/dbsessmgr/*.config
+%patch0 -p1
+autoreconf
%build
-%configure --libdir=%{monodir}
+%configure
make
%install
@@ -50,25 +50,29 @@
%{_bindir}/dbsessmgr*
%{_bindir}/mod-mono*
%{_bindir}/xsp*
-%{monodir}/xsp/
+%{_libdir}/xsp/1.0/*
+%{_libdir}/xsp/2.0/*
+%{_libdir}/xsp/test/*
+%{_libdir}/mono/gac/Mono.WebServer*/
+%{_libdir}/mono/gac/mod-mono-server*/
+%{_libdir}/mono/gac/xsp*/
+%{_libdir}/mono/1.0/*.dll
+%{_libdir}/mono/1.0/*.exe
+%{_libdir}/mono/2.0/*.dll
+%{_libdir}/mono/2.0/*.exe
%{_mandir}/man1/asp*
%{_mandir}/man1/dbsessmgr*
%{_mandir}/man1/mod-mono-server*
%{_mandir}/man1/xsp*
%files devel
-%{monodir}/pkgconfig/xsp*
+%{_libdir}/pkgconfig/xsp*
%changelog
-* Sat Aug 12 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.16.1-1
-- Bump
-- fixes for 64 bit
-- minor spec file changes
+* Thu Aug 31 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.17-1
+- bump to new version
+- added patches for architecture independance
- added devel package
-- Fixed incorrect permissions
-
-* Tue Jul 11 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.16-2
-- D'oh! Fixes for 64 bit
* Tue Jul 11 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.16-1
- bump to new version
@@ -88,7 +92,6 @@
- Made noarch
- Removed debug package
- Altered configure to keep it happy
-- Fixed some incorrect modes in config files
* Wed Jun 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.15-3
- Added BR pkgconfig
More information about the scm-commits
mailing list