rpms/xsp/devel xsp-makes.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 xsp.patch, 1.1, 1.2 xsp.spec, 1.15, 1.16
Paul F. Johnson (pfj)
fedora-extras-commits at redhat.com
Mon Dec 17 01:04:47 UTC 2007
Author: pfj
Update of /cvs/extras/rpms/xsp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11646/devel
Modified Files:
.cvsignore sources xsp.patch xsp.spec
Added Files:
xsp-makes.patch
Log Message:
Bump to 1.2.6
Added new tests subpackage
xsp-makes.patch:
--- NEW FILE xsp-makes.patch ---
--- xsp-1.2.6/tools/asp_state/Makefile.am 2007-07-24 23:56:21.000000000 +0100
+++ xsp-1.2.6/tools/asp_state/Makefile-new.am 2007-12-17 00:29:00.000000000 +0000
@@ -1,6 +1,6 @@
MCSFLAGS= -debug+ -debug:full -nologo
-aspstatedir = $(prefix)/lib/xsp/1.0
+aspstatedir = $(libdir)/xsp/1.0
aspstate_SCRIPTS = asp-state.exe
aspstate_DATA = asp-state.exe.config
@@ -8,7 +8,7 @@
scripts2 = asp-state2.exe
data2 = asp-state2.exe.config
endif
-aspstate2dir = $(prefix)/lib/xsp/2.0
+aspstate2dir = $(libdir)/xsp/2.0
aspstate2_SCRIPTS = $(scripts2)
aspstate2_DATA = $(data2)
--- xsp-1.2.6/tools/dbsessmgr/Makefile.am 2007-07-24 23:56:21.000000000 +0100
+++ xsp-1.2.6/tools/dbsessmgr/Makefile-new.am 2007-12-17 00:28:19.000000000 +0000
@@ -1,6 +1,6 @@
MCSFLAGS= -debug+ -debug:full -nologo
-dbsessmgrdir = $(prefix)/lib/xsp/1.0
+dbsessmgrdir = $(libdir)/xsp/1.0
dbsessmgr_SCRIPTS = dbsessmgr.exe
dbsessmgr_DATA = dbsessmgr.exe.config
@@ -8,7 +8,7 @@
scripts2 = dbsessmgr2.exe
data2 = dbsessmgr2.exe.config
endif
-dbsessmgr2dir = $(prefix)/lib/xsp/2.0
+dbsessmgr2dir = $(libdir)/xsp/2.0
dbsessmgr2_SCRIPTS = $(scripts2)
dbsessmgr2_DATA = $(data2)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xsp/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 15 Feb 2007 13:50:35 -0000 1.9
+++ .cvsignore 17 Dec 2007 01:04:10 -0000 1.10
@@ -1 +1 @@
-xsp-1.2.3.tar.gz
+xsp-1.2.6.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xsp/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 15 Feb 2007 13:50:35 -0000 1.9
+++ sources 17 Dec 2007 01:04:10 -0000 1.10
@@ -1 +1 @@
-bdd6bd7d2dab9e117fc1fd4c03aac45b xsp-1.2.3.tar.gz
+61dd61398f041002292e5514c28decd3 xsp-1.2.6.tar.bz2
xsp.patch:
Index: xsp.patch
===================================================================
RCS file: /cvs/extras/rpms/xsp/devel/xsp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xsp.patch 31 Aug 2006 22:01:31 -0000 1.1
+++ xsp.patch 17 Dec 2007 01:04:10 -0000 1.2
@@ -27,68 +27,4 @@
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: xsp.spec
===================================================================
RCS file: /cvs/extras/rpms/xsp/devel/xsp.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xsp.spec 25 Mar 2007 11:14:08 -0000 1.15
+++ xsp.spec 17 Dec 2007 01:04:10 -0000 1.16
@@ -1,11 +1,12 @@
Name: xsp
-Version: 1.2.3
-Release: 2%{?dist}
+Version: 1.2.6
+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
+Source0: http://www.go-mono.com/sources/%{name}/%{name}-%{version}.tar.bz2
Patch0: xsp.patch
+Patch1: xsp-makes.patch
BuildRequires: mono-web, mono-data, mono-core, pkgconfig, autoconf automake
Requires: mono-core
Summary: A small web server that hosts ASP.NET
@@ -27,9 +28,18 @@
%description devel
Development files for xsp
+%package tests
+Group: Applications/Internet
+Requires: %{name} = %{version}-%{release}
+Summary: xsp test files
+
+%description tests
+Files for testing the xsp server
+
%prep
%setup -q
-%patch0 -p1
+%patch0 -p1 -b .orig
+%patch1 -p1 -b .orig
autoreconf
%build
@@ -50,11 +60,11 @@
%{_bindir}/dbsessmgr*
%{_bindir}/mod-mono*
%{_bindir}/xsp*
+%{_bindir}/fastcgi-mono-server*
%{_libdir}/xsp
-#%{_libdir}/xsp/1.0
-#%{_libdir}/xsp/2.0
-#%{_libdir}/xsp/test
%{_libdir}/mono/gac/Mono.WebServer*/
+%{_libdir}/mono/gac/fastcgi-mono-server/
+%{_libdir}/mono/gac/fastcgi-mono-server2
%{_libdir}/mono/gac/mod-mono-server*/
%{_libdir}/mono/gac/xsp*/
%{_libdir}/mono/1.0/*.dll
@@ -65,11 +75,28 @@
%{_mandir}/man1/dbsessmgr*
%{_mandir}/man1/mod-mono-server*
%{_mandir}/man1/xsp*
+%{_mandir}/man1/fastcgi-mono-server*
%files devel
%{_libdir}/pkgconfig/xsp*
+%files tests
+%{_libdir}/xsp/1.0
+%{_libdir}/xsp/2.0
+%{_libdir}/xsp/test
+
%changelog
+* Thu Nov 22 2007 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.6-1
+- bump
+- spec file fixes
+- added new tests subpackage
+
+* Sun Nov 11 2007 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.5-1
+- bump
+
+* Thu Apr 22 2007 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.4-1
+- bump
+
* Sun Mar 25 2007 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.3-2
- fix for un-owned directories
More information about the fedora-extras-commits
mailing list