SPECS: phpPgAdmin.spec - updated apache config to allow from all; ...

[glen]

Author: glen                         Date: Tue Jan  3 10:08:25 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated apache config to allow from all; rel 2

---- Files affected:
SPECS:
   phpPgAdmin.spec (1.54 -> 1.55) 

---- Diffs:

================================================================
Index: SPECS/phpPgAdmin.spec
diff -u SPECS/phpPgAdmin.spec:1.54 SPECS/phpPgAdmin.spec:1.55
--- SPECS/phpPgAdmin.spec:1.54	Sun Dec 11 17:49:03 2005
+++ SPECS/phpPgAdmin.spec	Tue Jan  3 11:08:19 2006
@@ -6,11 +6,12 @@
 Summary(pl):	phpPgAdmin - administracja bazami PostgreSQL przez WWW
 Name:		phpPgAdmin
 Version:	4.0.1
-Release:	1.9
+Release:	2
 License:	GPL v2+
 Group:		Applications/Databases/Interfaces
 Source0:	http://dl.sourceforge.net/phppgadmin/%{name}-%{version}.tar.bz2
 # Source0-md5:	7e0c18a01538572d3c2b435725e68fe2
+Source1:	%{name}-apache.conf
 Patch0:		%{name}-config.patch
 URL:		http://phppgadmin.sourceforge.net/
 BuildRequires:	rpmbuild(macros) >= 1.264
@@ -44,10 +45,6 @@
 %patch0 -p1
 rm -f conf/config.inc.php-dist
 
-cat > apache.conf <<EOF
-Alias /pgadmin /usr/share/phpPgAdmin
-EOF
-
 # remove language source files (or one wants to make -devel subpackage?)
 mv -f lang/translations.php .
 rm -f lang/*.php
@@ -63,8 +60,8 @@
 cp -a classes help images lang libraries themes xloadtree $RPM_BUILD_ROOT%{_appdir}
 cp -a conf/*.php $RPM_BUILD_ROOT%{_sysconfdir}
 
-install apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-install apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 #install lighttpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
 %triggerin -- apache1
@@ -165,6 +162,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.55  2006/01/03 10:08:19  glen
+- updated apache config to allow from all; rel 2
+
 Revision 1.54  2005/12/11 16:49:03  glen
 - prevent accidental macro expansion
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/phpPgAdmin.spec?r1=1.54&r2=1.55&f=u