From 3f60240fa9be449a59867681ec376c8e887fb98d Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: May 19 2015 12:49:28 +0000 Subject: v3.8 --- diff --git a/.gitignore b/.gitignore index ef6ab86..87fcf5c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -xsp-2.6.5.tar.bz2 -/xsp-2.8.tar.bz2 -/xsp-2.10.tar.bz2 -/xsp-2.10.2.tar.bz2 +/xsp-*.tar.gz diff --git a/sources b/sources index 5d023f4..4da6862 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4fe62fc95ad5dc136d8a7f3299d523b6 xsp-2.10.2.tar.bz2 +47ea3b73b61e99e78802bc64eb71a05b xsp-3.8.tar.gz diff --git a/xsp-2.8.1.tar.bz2 b/xsp-2.8.1.tar.bz2 deleted file mode 100644 index 1a76d56..0000000 Binary files a/xsp-2.8.1.tar.bz2 and /dev/null differ diff --git a/xsp.spec b/xsp.spec index eeb6995..efef9da 100644 --- a/xsp.spec +++ b/xsp.spec @@ -1,16 +1,16 @@ Name: xsp -Version: 2.10.2 -Release: 8%{?dist} +Version: 3.8 +Release: 1%{?dist} License: MIT URL: http://www.mono-project.com/Main_Page Summary: A small web server that hosts ASP.NET Group: System Environment/Daemons -Source0: http://ftp.novell.com/pub/mono/sources/%{name}/%{name}-%{version}.tar.bz2 -BuildRequires: mono-web-devel, mono-data, mono-devel >= 2.10, mono-data-sqlite, mono-nunit-devel +Source0: http://download.mono-project.com/sources/%{name}/%{name}-%{version}.tar.gz +BuildRequires: mono-web-devel, mono-data, mono-devel, mono-data-sqlite, mono-nunit-devel BuildRequires: mono-data-oracle monodoc-devel BuildRequires: autoconf automake libtool -Requires: mono-core >= 2.10 +Requires: mono-core # Mono only available on these: ExclusiveArch: %mono_arches @@ -41,16 +41,14 @@ Files for testing the xsp server %prep %setup -q -sed -i "s#gmcs#mcs#g" configure sed -i "s#gmcs#mcs#g" configure.ac -sed -i "s#mono/2.0#mono/4.5#g" configure -sed -i "s#Mono 2.0#Mono 4.5#g" configure -sed -i "s#mono/4.0#mono/4.5#g" configure -sed -i "s#Mono 4.0#Mono 4.5#g" configure - -autoreconf -I build/m4/shamrock -I build/m4/shave +sed -i "s#gmcs#mcs#g" build/m4/shamrock/mono.m4 +sed -i "s#gmcs#mcs#g" build/m4/shave/shave.in +sed -i "s#gmcs#mcs#g" build/m4/shave/shave.m4 %build +autoreconf -vif -I build/m4/shamrock -I build/m4/shave + %configure --libdir=%{_prefix}/lib make @@ -95,7 +93,8 @@ test "%{_libdir}" = "%{_prefix}/lib" || mv $RPM_BUILD_ROOT/%{_prefix}/lib/pkgcon %{_prefix}/lib/xsp/test %changelog -* Mon May 18 2015 Peter Robinson 2.10.2-9 +* Mon May 18 2015 Peter Robinson 3.8-1 +- Update to 3.8 - Rebuild (mono4) * Mon Aug 18 2014 Fedora Release Engineering - 2.10.2-8 @@ -231,81 +230,3 @@ test "%{_libdir}" = "%{_prefix}/lib" || mv $RPM_BUILD_ROOT/%{_prefix}/lib/pkgcon * Sun Aug 03 2008 Paul F. Johnson 2.0-1 - bump to 2.0 preview 1 - spec file fixes - -* Mon Apr 21 2008 Paul F. Johnson 1.9.1-1 -- bump - -* Thu Feb 21 2008 Paul F. Johnson 1.9-2 -- fix for problem with the test makefile - -* Thu Feb 21 2008 Paul F. Johnson 1.9-1 -- bump - -* Thu Dec 20 2007 Paul F. Johnson 1.2.6-1.2 -- remove arch ppc64 -- add br mono-data-sqlite - -* Thu Nov 22 2007 Paul F. Johnson 1.2.6-1 -- bump -- spec file fixes -- added new tests subpackage - -* Sun Nov 11 2007 Paul F. Johnson 1.2.5-1 -- bump - -* Thu Apr 22 2007 Paul F. Johnson 1.2.4-1 -- bump - -* Sun Mar 25 2007 Paul F. Johnson 1.2.3-2 -- fix for un-owned directories - -* Thu Feb 15 2007 Paul F. Johnson 1.2.3-1 -- bump - -* Sat Nov 23 2006 Paul F. Johnson 1.2.1-1 -- bump - -* Sat Oct 14 2006 Paul F. Johnson 1.1.18-1 -- bump - -* Thu Aug 31 2006 Paul F. Johnson 1.1.17-1 -- bump to new version -- added patches for architecture independance -- added devel package - -* Tue Jul 11 2006 Paul F. Johnson 1.1.16-1 -- bump to new version - -* Tue Jul 4 2006 Paul F. Johnson 1.1.15-7 -- brought into line with the new packaging regs for mono apps - -* Mon Jun 19 2006 Paul F. Johnson 1.1.15-6 -- removed the libdir hack -- removed the overzealous AC_CANONICAL from config.in - -* Sun Jun 18 2006 Paul F. Johnson 1.1.15-5 -- Added back the libdir hack - -* Thu Jun 15 2006 Paul F. Johnson 1.1.15-4 -- Removed libhack -- Made noarch -- Removed debug package -- Altered configure to keep it happy - -* Wed Jun 14 2006 Paul F. Johnson 1.1.15-3 -- Added BR pkgconfig - -* Tue Jun 06 2006 Paul F. Johnson 1.1.15-2 -- fixes for (clean) mock builds - -* Sun May 14 2006 Paul F. Johnson 1.1.13-4 -- minor alteration to the spec file - -* Mon May 08 2006 Paul F. Johnson 1.1.13-3 -- Fixes to the spec file -- Added clean - -* Mon Apr 17 2006 Paul F. Johnson 1.1.13-1 -- Initial import for FE -- Heavily amended spec file (based on the Novell original) -