SPECS: apache-mod-ngobjweb.spec - patch Cezary Krzyzanowski dhuble...

[wolvverine]

Author: wolvverine                   Date: Tue Sep  6 15:09:18 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- patch Cezary Krzyzanowski dhubleizh at o2 dot pl

---- Files affected:
SPECS:
   apache-mod-ngobjweb.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/apache-mod-ngobjweb.spec
diff -u SPECS/apache-mod-ngobjweb.spec:1.4 SPECS/apache-mod-ngobjweb.spec:1.5
--- SPECS/apache-mod-ngobjweb.spec:1.4	Fri Apr 22 19:25:43 2005
+++ SPECS/apache-mod-ngobjweb.spec	Tue Sep  6 17:09:13 2005
@@ -3,20 +3,25 @@
 # - mv SPECS/{apache-mod-ngobjweb.spec,apache-mod_ngobjweb.spec},v (if it's apache module)
 # - why Name and install dir is sope-* ???
 # - strange /var/*/*.so and /usr/local paths in generated OGo.conf
+# - OGo.conf link to %{_sysconfdir}/httpd/httpd.conf/@XX_Ogo.conf
 
 %define		mod_ngobjweb_makeflags		-v
 %define		sope_version			4.3
 %define		opengroupware.org_version	1.0a
+%define		datenightly			200508311705
+%define		sopename			sope-mod_ngobjweb
 
 Summary:	mod_ngobjweb apache module
 Summary(pl):	Moduł Apacha mod_ngobjweb
-Name:		sope-mod_ngobjweb
-Version:	3.15
-Release:	1
+Name:		apache-mod_ngobjweb
+Version:	r1098
+Release:	0.1
 Vendor:		OpenGroupware.org
 License:	LGPL
 Group:		Development/Libraries
-Source0:	http://download.opengroupware.org/sources/trunk/sope-mod_ngobjweb-trunk-latest.tar.gz
+Source0:	http://download.opengroupware.org/nightly/sources/trunk/%{sopename}-trunk-%{version}-%{datenightly}.tar.gz	
+# Source0-md5:	
+Patch0:		%{name}-makefile.patch
 URL:		http://www.softwarestudio.org/libical
 Requires: 	apache >= 2.0.40
 BuildRequires:	autoconf
@@ -37,16 +42,16 @@
 Apache obsługiwać żądania HTTP dla serwera aplikacji SOPE.
 
 %prep
-%setup -n sope-mod_ngobjweb
+%setup -q -n sope-mod_ngobjweb
+%patch0 -p1
 
 %build
-. /usr/lib/GNUstep/System/Library/Makefiles/GNUstep.sh
+. %{_libdir}/GNUstep/System/Library/Makefiles/GNUstep.sh
 export PATH=$PATH:%{_sbindir}
-%{__make} %{mod_ngobjweb_makeflags} \
+%{__make} \
 	apxs=/usr/sbin/apxs \
-	HTTPD=/usr/sbin/httpd \
-	APXS_INCLUDE_DIRS="-I%{_includedir}/apr -I%{_includedir}/apr-util -I%{_includedir}/apache"
-
+	HTTPD=/usr/sbin/httpd
+	
 %install
 rm -rf $RPM_BUILD_ROOT
 export PATH=$PATH:%{_sbindir}
@@ -91,7 +96,7 @@
 
 %files
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd/httpd.conf/88_OGo.conf
+#%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd/httpd.conf/88_OGo.conf
 %attr(755,root,root) %{_libdir}/sope-%{sope_version}/mod_ngobjweb.so
 %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/opengroupware.org/OGo.conf
 
@@ -101,6 +106,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2005/09/06 15:09:13  wolvverine
+- patch Cezary Krzyzanowski dhubleizh at o2 dot pl
+
 Revision 1.4  2005/04/22 17:25:43  qboosh
 - partial cleanup
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache-mod-ngobjweb.spec?r1=1.4&r2=1.5&f=u