[php-voms-admin] Update to released version 0.6

[Mattias Ellert]

commit d686d9592f571c5bde436c4b498341620ff91b11
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Tue Jun 28 18:47:12 2011 +0200

    Update to released version 0.6

 .gitignore          |    2 +-
 php-voms-admin.spec |   42 ++++++++++++++++++++++++++----------------
 sources             |    2 +-
 3 files changed, 28 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 601bcf0..e0da2af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/php-voms-admin-0.5.1.tar.gz
+/php-voms-admin-0.6.tar.gz
diff --git a/php-voms-admin.spec b/php-voms-admin.spec
index de07eda..1be80cb 100644
--- a/php-voms-admin.spec
+++ b/php-voms-admin.spec
@@ -1,15 +1,15 @@
 Name:		php-voms-admin
 %define shortname pva
-Version:	0.5.1
-Release:	2%{?dist}
+Version:	0.6
+Release:	1%{?dist}
 Summary:	Web based interface to control VOMS parameters written in PHP
 
 Group:		Applications/Internet
 License:	ASL 2.0
 URL:		http://grid.org.ua/development/pva/
 #		The source was created from a svn checkout
-#		svn co http://svn.nordugrid.org/repos/nordugrid/contrib/pva/tags/pva-0.5.1 php-voms-admin-0.5.1
-#		tar -z -c --exclude .svn -f php-voms-admin-0.5.1.tar.gz php-voms-admin-0.5.1
+#		svn co http://svn.nordugrid.org/repos/nordugrid/contrib/pva/tags/pva-0.6 php-voms-admin-0.6
+#		tar -z -c --exclude .svn -f php-voms-admin-0.6.tar.gz php-voms-admin-0.6
 Source0:	%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
@@ -38,8 +38,7 @@ the vomsd mysql backend.
 
 # Remove bundled PHPMailer
 rm modules/class.phpmailer.php modules/class.smtp.php
-sed 's!\("include_path".*\)"\(.*\)"!\1"\2:/usr/share/php/PHPMailer"!' \
-    -i index.php
+sed 's!//REDHAT_PHPMAILER//!!' -i modules/miscmail.php
 
 %build
 # Nothing to build
@@ -53,15 +52,16 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{shortname}/vomses
 mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
 mkdir -p %{buildroot}%{_localstatedir}/www/%{shortname}/mail-copies
 mkdir -p %{buildroot}%{_mandir}/man1
+mkdir -p %{buildroot}%{_mandir}/man5
 
 sed '/^ADDVOCONF=/s!=.*!=%{_sysconfdir}/%{shortname}/addvo.conf!' \
     addvo > %{buildroot}%{_sbindir}/%{shortname}-addvo
 chmod 755 %{buildroot}%{_sbindir}/%{shortname}-addvo
 
-install -p -m 644 index.php VOMSCompatibility.php \
+install -p -m 644 index.php VOMSCompatibility.php VOMSCompatibility2.php rpc.php \
     %{buildroot}%{_datadir}/%{shortname}
 
-for dir in js kcaptcha lang modules pics styles ; do
+for dir in interfaces js kcaptcha lang modules pics styles wsdl ; do
     cp -pr ${dir} %{buildroot}%{_datadir}/%{shortname}
 done
 
@@ -71,20 +71,22 @@ sed -e 's!%%SYSCONFDIR%%!%{_sysconfdir}!g' \
 
 sed -e 's!%%INSTALLROOT%%!%{_datadir}/%{shortname}!g' \
     -e '/\$mail_filecopies_path=/s!".*"!"%{_localstatedir}/www/%{shortname}/mail-copies"!' \
-    conf/config.inc > %{buildroot}%{_sysconfdir}/%{shortname}/config.inc
+    conf/config.inc > %{buildroot}%{_sysconfdir}/%{shortname}/%{shortname}-config
 
-install -p -m 644 conf/vomses/external \
+install -p -m 640 conf/vomses/external \
     %{buildroot}%{_sysconfdir}/%{shortname}/vomses
 
 sed 's!%%DATADIR%%!%{_datadir}!g' \
-    pva.conf > %{buildroot}%{_sysconfdir}/httpd/conf.d/%{shortname}.conf
+    %{shortname}.conf > %{buildroot}%{_sysconfdir}/httpd/conf.d/%{shortname}.conf
 
-ln -s %{_sysconfdir}/%{shortname}/config.inc \
-      %{buildroot}%{_datadir}/%{shortname}/conf
+ln -s %{_sysconfdir}/%{shortname}/%{shortname}-config \
+    %{buildroot}%{_datadir}/%{shortname}/conf/config.inc
 ln -s %{_sysconfdir}/%{shortname}/vomses \
-      %{buildroot}%{_datadir}/%{shortname}/conf
+    %{buildroot}%{_datadir}/%{shortname}/conf
 
 install -p -m 644 pva-addvo.1 %{buildroot}%{_mandir}/man1/%{shortname}-addvo.1
+install -p -m 644 addvo.conf.5 %{buildroot}%{_mandir}/man5/addvo.conf.5
+install -p -m 644 pva-config.5 %{buildroot}%{_mandir}/man5/%{shortname}-config.5
 
 %clean
 rm -rf %{buildroot}
@@ -108,14 +110,22 @@ fi
 %defattr(-,root,root,-)
 %{_sbindir}/%{shortname}-addvo
 %{_mandir}/man1/%{shortname}-addvo.1*
+%{_mandir}/man5/addvo.conf.5*
+%{_mandir}/man5/%{shortname}-config.5*
 %{_datadir}/%{shortname}
 %dir %{_localstatedir}/www/%{shortname}
 %attr(-,apache,apache) %{_localstatedir}/www/%{shortname}/mail-copies
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{shortname}.conf
-%config(noreplace) %{_sysconfdir}/%{shortname}
-%doc AUTHORS CHANGELOG LICENSE NOTES README README.Fedora
+%dir %{_sysconfdir}/%{shortname}
+%attr(640,root,root) %config(noreplace) %{_sysconfdir}/%{shortname}/addvo.conf
+%attr(640,apache,apache) %config(noreplace) %{_sysconfdir}/%{shortname}/%{shortname}-config
+%attr(640,apache,apache) %config(noreplace) %{_sysconfdir}/%{shortname}/vomses/external
+%doc AUTHORS CHANGELOG LICENSE NOTES README README.transactions README.Fedora
 
 %changelog
+* Tue Jun 28 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.6-1
+- Update to released version 0.6
+
 * Fri Jun 17 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 0.5.1-2
 - Add file context handling scriptlets
 
diff --git a/sources b/sources
index 42ca3c5..b0faf1d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-79f197a93cc30cb8a44dc6d76bf0ab79  php-voms-admin-0.5.1.tar.gz
+5b80a613f595914197b59e9d50f94907  php-voms-admin-0.6.tar.gz