rpms/xsp/devel .cvsignore, 1.14, 1.15 import.log, 1.4, 1.5 sources, 1.16, 1.17 xsp.spec, 1.26, 1.27 xsp-2.0-configure.patch, 1.1, NONE xsp-makes.patch, 1.1, NONE xsp-test-makefile.patch, 1.2, NONE

[Paul F. Johnson]

Author: pfj

Update of /cvs/pkgs/rpms/xsp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23289/devel

Modified Files:
	.cvsignore import.log sources xsp.spec 
Removed Files:
	xsp-2.0-configure.patch xsp-makes.patch 
	xsp-test-makefile.patch 
Log Message:

Bump to 2.2 RC1 svn branch
Removed patches and moved to sed for $(prefix)/lib stuff
 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xsp/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	25 Nov 2008 18:19:40 -0000	1.14
+++ .cvsignore	24 Dec 2008 23:01:20 -0000	1.15
@@ -1 +1 @@
-xsp-2.2.tar.bz2
+xsp-122055.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xsp/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	25 Nov 2008 18:19:41 -0000	1.4
+++ import.log	24 Dec 2008 23:01:21 -0000	1.5
@@ -2,3 +2,4 @@
 xsp-2_0-2_fc10:HEAD:xsp-2.0-2.fc10.src.rpm:1221075950
 xsp-2_0-4_fc10:HEAD:xsp-2.0-4.fc10.src.rpm:1222991981
 xsp-2_2-1_pre1_fc10:HEAD:xsp-2.2-1.pre1.fc10.src.rpm:1227637003
+xsp-2_2-3_RC1_20081224svn122055_fc11:HEAD:xsp-2.2-3.RC1.20081224svn122055.fc11.src.rpm:1230159556


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xsp/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	25 Nov 2008 18:19:41 -0000	1.16
+++ sources	24 Dec 2008 23:01:21 -0000	1.17
@@ -1 +1 @@
-4cb0b1fffd2a9a5512189a43a9dd96b5  xsp-2.2.tar.bz2
+01040707194f17cfb5616550454ac751  xsp-122055.tar.bz2


Index: xsp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsp/devel/xsp.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xsp.spec	25 Nov 2008 18:19:41 -0000	1.26
+++ xsp.spec	24 Dec 2008 23:01:21 -0000	1.27
@@ -1,13 +1,12 @@
+%define svnver 122055
+
 Name:     	xsp
 Version: 	2.2
-Release:	1.pre1%{?dist}
+Release:	3.RC1.20081224svn%{svnver}%{?dist}
 License:	MIT
 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.bz2
-Patch0: xsp-2.0-configure.patch
-Patch1: xsp-makes.patch
-Patch2: xsp-test-makefile.patch
+Source0:	%{name}-%{svnver}.tar.bz2
 BuildRequires:	mono-web, mono-data, mono-devel >= 2.0, pkgconfig, autoconf automake mono-data-sqlite mono-nunit-devel
 Requires:	mono-core >= 2.0
 Summary:	A small web server that hosts ASP.NET
@@ -18,7 +17,7 @@
 
 %description
 
-XSP is a standalone web server written in C#  that can be used to run ASP.NET 
+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.
 	  
@@ -39,10 +38,19 @@
 Files for testing the xsp server
 
 %prep
-%setup -q
-%patch0 -p1 -b .config
-%patch1 -p1 -b .makes
-%patch2 -p1 -b .test-make
+%setup -q -n %{name}-%{svnver}
+find . -name Makefile.in -or -name Makefile.am -or -name \*.pc.in \
+       -or -name \*.make \
+       | while read f ;
+         do
+
+	   sed -i -e 's!@prefix@/lib!%{_libdir}!' "$f"
+           sed -i -e 's!$(prefix)/lib!%{_libdir}!' "$f" 
+	   sed -i -e 's!$prefix/lib!%{_libdir}!' "$f"
+           sed -i -e 's!${exec_prefix}/lib!%{_libdir}!' "$f" 
+	   sed -i -e 's!$libdir!%{_libdir}!' "$f" ;
+         done
+
 autoreconf
 
 %build
@@ -50,11 +58,11 @@
 make
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make DESTDIR=${RPM_BUILD_ROOT} install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
 
 %files
 %defattr(-, root, root,-)
@@ -89,6 +97,18 @@
 %{_libdir}/xsp/test
 
 %changelog
+* Wed Dec 24 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-4.RC1.20081224svn122055
+- Bump to RC1 branched svn
+- Minor specfile changes
+
+* Wed Dec 17 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-3.pre3.20081217svn121604
+- bump to 2.2 preview 3
+- move to svn for bug fixes
+
+* Sat Dec 06 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-2.pre2
+- bump to 2.2 preview 2
+- use sed instead of patches
+
 * Tue Nov 25 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-1.pre1
 - bump to 2.2 preview 1
 


--- xsp-2.0-configure.patch DELETED ---


--- xsp-makes.patch DELETED ---


--- xsp-test-makefile.patch DELETED ---