[phpPgAdmin] Update to 5.1 (bz #999037)

[Jozef Mlich]

commit 67943b11feea2c2fe43eec11cd2d470ba549f06a
Author: Jozef Mlich <jmlich at redhat.com>
Date:   Wed Aug 28 13:59:00 2013 +0200

    Update to 5.1 (bz #999037)

 .gitignore      |    1 +
 phpPgAdmin.spec |   58 +++++++++++++++++++++++++++++-------------------------
 sources         |    2 +-
 3 files changed, 33 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2ce9760..50ba590 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /phpPgAdmin-5.0.4.tar.bz2
+/phpPgAdmin-5.1.tar.bz2
diff --git a/phpPgAdmin.spec b/phpPgAdmin.spec
index 1867144..8a292e1 100644
--- a/phpPgAdmin.spec
+++ b/phpPgAdmin.spec
@@ -1,20 +1,20 @@
 Summary:	Web-based PostgreSQL administration
 Name:		phpPgAdmin
-Version:	5.0.4
-Release:	5%{?dist}
+Version:	5.1
+Release:	1%{?dist}
 License:	GPLv2+ and (LGPLv2+ or BSD) and ASL 2.0 and MIT
 Group:		Applications/Databases
 URL:		http://phppgadmin.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	http://downloads.sourceforge.net/phppgadmin/phpPgAdmin-%{version}.tar.bz2
+Source0:	http://downloads.sourceforge.net/phppgadmin/%{name}-%{version}.tar.bz2
 Source1:	%{name}.conf
 
 Requires:	php >= 4.2, gawk
 Requires:	php-pgsql >= 4.2, httpd
-# This is for /sbin/service
-Requires(preun):	initscripts
-Requires(postun):	initscripts
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
 Buildarch:	noarch
 
 %define		_phppgadmindir	%{_datadir}/%{name}
@@ -32,26 +32,28 @@ functions (stored procedures). It also has Slony-I support.
 %patch1 -p0
 
 %build
-# Cleanup encoding problem
-sed -i 's/\r//' lang/php2po
-sed -i 's/\r//' lang/po2php
 
 %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 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 644 -p *.php %{buildroot}%{_phppgadmindir}
+cp -ap *.js robots.txt classes help images js lang libraries plugins themes xloadtree %{buildroot}%{_phppgadmindir}
 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
+%systemd_post httpd.service
+
+%preun
+%systemd_preun httpd.service
+
+%postun
+%systemd_postun_with_restart httpd.service 
 
 %clean
 rm -rf %{buildroot}
@@ -68,25 +70,27 @@ rm -rf %{buildroot}
 %{_phppgadmindir}/*.js
 %{_phppgadmindir}/robots.txt
 %{_phppgadmindir}/classes
+%{_phppgadmindir}/help
 %{_phppgadmindir}/images
+%{_phppgadmindir}/js/*.js
+%{_phppgadmindir}/libraries
+%{_phppgadmindir}/plugins/Report/*
+%{_phppgadmindir}/plugins/GuiControl/*
+%{_phppgadmindir}/themes
+%{_phppgadmindir}/xloadtree
+%{_phppgadmindir}/conf/*
 %dir %{_phppgadmindir}/lang
-%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(644,root,root) %{_phppgadmindir}/lang/README
 %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 Aug 22 2013 Jozef Mlich <jmlich at redhat.com> 5.1-1
+- post, preun, postun phases modified accoding to Fedora Packaging Guidelines
+- Update to 5.1, per changes described at
+  http://sourceforge.net/mailarchive/message.php?msg_id=30730170
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.0.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -149,7 +153,7 @@ rm -rf %{buildroot}
 * Tue Jul 10 2007 Devrim Gunduz <devrim at commandprompt.com> 4.1.3-1
 - Update to 4.1.3
 
-* Mon Jun 01 2007 Devrim Gunduz <devrim at commandprompt.com> 4.1.2-1
+* Fri Jun 01 2007 Devrim Gunduz <devrim at commandprompt.com> 4.1.2-1
 - Update to 4.1.2
 - Fix for Red Hat Bugzilla  #241489
 
@@ -186,7 +190,7 @@ rm -rf %{buildroot}
 - Fixed rpmlint errors
 - Spec file cleanup
 
-* Tue Dec 17 2005 Devrim Gunduz <devrim at commandprompt.com> 4.0.1
+* Sat Dec 17 2005 Devrim Gunduz <devrim at commandprompt.com> 4.0.1
 - Update to 4.0.1
 - Added xloadtree and help among installed file lists
 - rename pgadmindir to phppgadmindir
diff --git a/sources b/sources
index 7083c0f..6622b20 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ea3030b376d389bbe447f88dfaf832f2  phpPgAdmin-5.0.4.tar.bz2
+ad8f05cef0c443d9ce2940bf36319c24  phpPgAdmin-5.1.tar.bz2