SPECS: phpldapadmin.spec - simplify install - keep the separated h...

[glen]

Author: glen                         Date: Wed Apr  5 23:48:55 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- simplify install
- keep the separated htdocs and code

---- Files affected:
SPECS:
   phpldapadmin.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: SPECS/phpldapadmin.spec
diff -u SPECS/phpldapadmin.spec:1.25 SPECS/phpldapadmin.spec:1.26
--- SPECS/phpldapadmin.spec:1.25	Wed Apr  5 23:11:32 2006
+++ SPECS/phpldapadmin.spec	Thu Apr  6 01:48:50 2006
@@ -3,14 +3,12 @@
 Summary(pl):	phpldapadmin - klient WWW dla LDAP
 Name:		phpldapadmin
 Version:	0.9.8.2
-Release:	0.1
+Release:	0.4
 License:	GPL
 Group:		Applications/Networking
 Source0:	http://dl.sourceforge.net/phpldapadmin/%{name}-%{version}.tar.gz
 # Source0-md5:	a83b44d90b14983b01db53ec39053a15
-Patch0:		%{name}-index.patch
-Patch1:		%{name}-lib-functions.patch
-Patch2:		%{name}-common.patch
+Patch0:		%{name}-paths.patch
 URL:		http://phpldapadmin.sourceforge.net/
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	php-gettext
@@ -50,35 +48,24 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
+
 cat > apache.conf <<'EOF'
-Alias /ldapadmin %{_appdir}
-<Directory %{_appdir}>
+Alias /ldapadmin %{_appdir}/htdocs
+<Directory %{_appdir}/htdocs>
 	allow from all
 </Directory>
 EOF
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/{css,config,doc,images,js,locale,lib,templates/creation}}
-
-cp -a htdocs/js/*				$RPM_BUILD_ROOT%{_appdir}/js
-cp -a locale/*				$RPM_BUILD_ROOT%{_appdir}/locale
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}}
 
-install	doc/*				.
-install	doc/*				$RPM_BUILD_ROOT%{_appdir}/doc
-install	htdocs/*.php	 		$RPM_BUILD_ROOT%{_appdir}
-install	htdocs/images/*.{png,jpg}	$RPM_BUILD_ROOT%{_appdir}/images
-install	htdocs/css/*.css	 	$RPM_BUILD_ROOT%{_appdir}/css
-install	lib/*.php			$RPM_BUILD_ROOT%{_appdir}/lib
-install	templates/*.{xml,dtd,php}	$RPM_BUILD_ROOT%{_appdir}/templates
-install	templates/creation/*.php	$RPM_BUILD_ROOT%{_appdir}/templates/creation
-install	VERSION				$RPM_BUILD_ROOT%{_appdir}
-install	config/config.php.example	$RPM_BUILD_ROOT%{_sysconfdir}/config.php
-install apache.conf			$RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-install apache.conf			$RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-ln -sf	%{_sysconfdir}/config.php 	$RPM_BUILD_ROOT%{_appdir}/config/config.php
+cp -a htdocs $RPM_BUILD_ROOT%{_appdir}
+cp -a lib locale templates $RPM_BUILD_ROOT%{_appdir}
+cp -a VERSION $RPM_BUILD_ROOT%{_appdir}
+cp -a config/config.php.example	$RPM_BUILD_ROOT%{_sysconfdir}/config.php
+cp -a apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+cp -a apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -97,7 +84,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc pla-test-i18n.ldif README-translation.txt
+%doc doc/*
 %dir %attr(750,root,http) %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
@@ -110,6 +97,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2006/04/05 23:48:50  glen
+- simplify install
+- keep the separated htdocs and code
+
 Revision 1.25  2006/04/05 21:11:32  mwinkler
 - template display fix
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/phpldapadmin.spec?r1=1.25&r2=1.26&f=u