rpms/phpPgAdmin/devel phpPgAdmin.spec,1.2,1.3

[Devrim GÜNDÜZ (devrim)]

Author: devrim

Update of /cvs/extras/rpms/phpPgAdmin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19158/devel

Modified Files:
	phpPgAdmin.spec 
Log Message:
* Update to 4.1
* Fix rh bugzilla #222740



Index: phpPgAdmin.spec
===================================================================
RCS file: /cvs/extras/rpms/phpPgAdmin/devel/phpPgAdmin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- phpPgAdmin.spec	4 Jan 2007 18:53:23 -0000	1.2
+++ phpPgAdmin.spec	21 Jan 2007 12:53:32 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:	Web-based PostgreSQL administration
 Name:		phpPgAdmin
-Version:	4.0.1
-Release:	6%{?dist}
+Version:	4.1
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Databases
 URL:		http://phppgadmin.sourceforge.net/
@@ -37,12 +37,16 @@
 %install
 rm -rf %{buildroot}
 install -d %{buildroot}%{_phppgadmindir}
+install -d %{buildroot}%{_phppgadmindir}/conf
+install -d %{buildroot}%{_sysconfdir}/%{name}
 install -m 644 -p *.php %{buildroot}%{_phppgadmindir}
-cp -ap *.js robots.txt classes conf images lang libraries sql themes xloadtree help %{buildroot}%{_phppgadmindir}
-rm -f %{buildroot}%{_phppgadmindir}/conf/.cvsignore
+cp -ap *.js robots.txt classes images lang libraries sql themes xloadtree help %{buildroot}%{_phppgadmindir}
 install -d  %{buildroot}%{_sysconfdir}/httpd/conf.d/
 install -d %{buildroot}%{_sysconfdir}/httpd/conf.d/
 install -m 755 -p %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
+install -m 755 conf/* %{buildroot}%{_sysconfdir}/%{name}
+ln -s %{_sysconfdir}/%{name}/config.inc.php %{buildroot}/%{_phppgadmindir}/conf/config.inc.php
+ln -s %{_sysconfdir}/%{name}/config.inc.php-dist %{buildroot}/%{_phppgadmindir}/conf/config.inc.php-dist
 
 %post
 	/sbin/service httpd reload > /dev/null 2>&1
@@ -54,8 +58,7 @@
 %defattr(0644,root,root,0755)
 %doc CREDITS DEVELOPERS FAQ HISTORY INSTALL LICENSE TODO TRANSLATORS
 %dir %{_phppgadmindir}
-%config(noreplace) %{_phppgadmindir}/conf/config.inc.php-dist
-%config(noreplace) %{_phppgadmindir}/conf/config.inc.php
+%config(noreplace) %{_sysconfdir}/%{name}/*
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
 %attr(644,root,root) %{_phppgadmindir}/*.php
 %{_phppgadmindir}/*.js
@@ -66,19 +69,26 @@
 %dir %attr(755,root,root) %{_phppgadmindir}/lang/recoded
 %attr(644,root,root) %{_phppgadmindir}/lang/*.php
 %attr(644,root,root) %{_phppgadmindir}/lang/recoded/*
-%attr(644,root,root)  %{_phppgadmindir}/lang/Makefile
-%attr(755,root,root)  %{_phppgadmindir}/lang/convert.awk
-%attr(755,root,root)  %{_phppgadmindir}/lang/langcheck
-%attr(755,root,root)  %{_phppgadmindir}/lang/php2po
-%attr(755,root,root)  %{_phppgadmindir}/lang/po2php
-%attr(755,root,root)  %{_phppgadmindir}/lang/synch
+%attr(644,root,root) %{_phppgadmindir}/lang/Makefile
+%attr(755,root,root) %{_phppgadmindir}/lang/convert.awk
+%attr(755,root,root) %{_phppgadmindir}/lang/langcheck
+%attr(755,root,root) %{_phppgadmindir}/lang/php2po
+%attr(755,root,root) %{_phppgadmindir}/lang/po2php
+%attr(755,root,root) %{_phppgadmindir}/lang/synch
 %{_phppgadmindir}/libraries
 %{_phppgadmindir}/sql
 %{_phppgadmindir}/themes
 %{_phppgadmindir}/xloadtree
 %{_phppgadmindir}/help
+%{_phppgadmindir}/conf/config.inc.php*
 
 %changelog
+* Thu Jan 4 2007 Devrim Gunduz <devrim at commandprompt.com> 4.1-1
+- Update to 4.1
+- Fix for rh bugzilla #222740
+
+* Thu Jan 4 2007 Devrim Gunduz <devrim at commandprompt.com> 4.0.1-7
+- Rebuilt
 * Thu Jan 4 2007 Devrim Gunduz <devrim at commandprompt.com> 4.0.1-6
 - Fixed phppgadmin.conf file.