rpms/mod_mono/devel .cvsignore, 1.7, 1.8 import.log, 1.5, 1.6 mod_mono-2.0-varrun.patch, 1.1, 1.2 mod_mono.spec, 1.14, 1.15 sources, 1.7, 1.8

[Paul F. Johnson]

Author: pfj

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

Modified Files:
	.cvsignore import.log mod_mono-2.0-varrun.patch mod_mono.spec 
	sources 
Log Message:

Bump to 2.2 preview 1
Added fix to the /var/run fix 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mod_mono/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	26 Aug 2008 12:08:49 -0000	1.7
+++ .cvsignore	25 Nov 2008 15:48:32 -0000	1.8
@@ -1 +1 @@
-mod_mono-2.0.tar.bz2
+mod_mono-2.2.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mod_mono/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	11 Oct 2008 21:36:07 -0000	1.5
+++ import.log	25 Nov 2008 15:48:32 -0000	1.6
@@ -3,3 +3,4 @@
 mod_mono-2_0-4_fc10:HEAD:mod_mono-2.0-4.fc10.src.rpm:1222992078
 mod_mono-2_0-5_fc10:HEAD:mod_mono-2.0-5.fc10.src.rpm:1223678042
 mod_mono-2_0-6_fc10:HEAD:mod_mono-2.0-6.fc10.src.rpm:1223760866
+mod_mono-2_2-1_pre1_fc10:HEAD:mod_mono-2.2-1.pre1.fc10.src.rpm:1227628062

mod_mono-2.0-varrun.patch:

Index: mod_mono-2.0-varrun.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mod_mono/devel/mod_mono-2.0-varrun.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_mono-2.0-varrun.patch	11 Oct 2008 21:36:07 -0000	1.1
+++ mod_mono-2.0-varrun.patch	25 Nov 2008 15:48:32 -0000	1.2
@@ -5,15 +5,15 @@
  
  #define MODMONO_SERVER_PATH 	MONO_PREFIX "/bin/mod-mono-server"
 -#define WAPIDIR				"/tmp"
-+#define WAPIDIR				"/var/run"
++#define WAPIDIR				"/var/run/mod_mono"
  #define DOCUMENT_ROOT		NULL
  #define APPCONFIG_FILE		NULL
  #define APPCONFIG_DIR		NULL
 -#define SOCKET_FILE		"/tmp/mod_mono_server"
-+#define SOCKET_FILE		"/var/run/mod_mono_server"
++#define SOCKET_FILE		"/var/run/mod_mono/mod_mono_server"
  #define LISTEN_ADDRESS		"127.0.0.1"
 -#define DASHBOARD_FILE "/tmp/mod_mono_dashboard"
-+#define DASHBOARD_FILE "/var/run/mod_mono_dashboard"
++#define DASHBOARD_FILE "/var/run/mod_mono/mod_mono_dashboard"
  
  #ifndef DEFAULT_RESTART_REQUESTS
  #define DEFAULT_RESTART_REQUESTS 10000


Index: mod_mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_mono/devel/mod_mono.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mod_mono.spec	11 Oct 2008 21:36:07 -0000	1.14
+++ mod_mono.spec	25 Nov 2008 15:48:32 -0000	1.15
@@ -1,6 +1,6 @@
 Name: mod_mono
-Version: 2.0
-Release: 6%{?dist}
+Version: 2.2
+Release: 1.pre1%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://ftp.novell.com/pub/mono/sources-stable
@@ -25,7 +25,7 @@
 
 %build
 %configure --disable-static
-make %{?_smp_mflags}
+make %{?_smp_mflags} 
 
 %install
 rm -rf %{buildroot}
@@ -35,6 +35,8 @@
 mv %{buildroot}%{_sysconfdir}/httpd/conf/mod_mono* %{buildroot}%{_sysconfdir}/httpd/conf.d/
 rm -rf %{buildroot}%{_sysconfdir}/httpd/conf
 
+mkdir -p %{buildroot}/var/run/mod_mono
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -47,9 +49,14 @@
 %doc AUTHORS ChangeLog COPYING NEWS README INSTALL
 %{_libdir}/httpd/modules/mod_mono.so*
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_mono.conf
+%attr(0755,apache,apache) /var/run/mod_mono
 %{_mandir}/man8/mod_mono.8*
 
 %changelog
+* Tue Nov 25 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-1.pre1
+- Bump to 2.2 preview 1
+- incorporate fix to the var-run patch (thanks to Dario Lesca)
+
 * Sat Oct 11 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-6
 - use var run instead of tmp
 - added additional Requires


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mod_mono/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	26 Aug 2008 12:08:49 -0000	1.7
+++ sources	25 Nov 2008 15:48:32 -0000	1.8
@@ -1 +1 @@
-d0e318acc6ca60c4683171043a917304  mod_mono-2.0.tar.bz2
+7e229e9e9bea7e4b0d39783eab801221  mod_mono-2.2.tar.bz2