diff --git a/_service:format_spec_file:phpPgAdmin.spec b/_service:format_spec_file:phpPgAdmin.spec
new file mode 100644
index 0000000..8fff042
--- /dev/null
+++ b/_service:format_spec_file:phpPgAdmin.spec
@@ -0,0 +1,120 @@
+#
+# spec file for package phpPgAdmin
+#
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+
+
+Name: phpPgAdmin
+
+%define apxs %{_sbindir}/apxs2
+%define ap_sysconfdir %(%{apxs} -q SYSCONFDIR)
+%define ap_serverroot %(%{apxs} -q PREFIX)
+%define ap_docroot %(%{apxs} -q PREFIX)/htdocs
+%define ppa_config %{_sysconfdir}/%{name}/config.inc.php
+
+Summary: Administration of PostgreSQL over the web
+Version: 5.0.2
+Release: 1
+License: GPLv2+
+Group: Productivity/Databases/Tools
+Url: http://phppgadmin.sourceforge.net
+Source0: %{name}-%{version}.tar.bz2
+Source1: %{name}.http
+Patch0: %{name}-4.2.3-config.inc.patch
+BuildArch: noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: apache2-devel
+Requires: mod_php_any php-pgsql
+
+
+%description
+phpPgAdmin is a web-based administration tool for PostgreSQL. It is
+perfect for PostgreSQL DBAs, newbies and hosting services.
+
+Features
+
+* Administer multiple servers
+* Support for PostgreSQL 7.4.x, 8.0.x, 8.1.x, 8.2.x, 8.3.x, 8.4.x, 9.0.x
+* Manage all aspects of:
+ o Users & groups
+ o Databases
+ o Schemas
+ o Tables, indexes, constraints, triggers, rules & privileges
+ o Views, sequences & functions
+ o Advanced objects
+ o Reports
+* Easy data manipulation:
+ o Browse tables, views & reports
+ o Execute arbitrary SQL
+ o Select, insert, update and delete
+* Dump table data in a variety of formats: SQL, COPY, XML, XHTML, CSV, Tabbed, pg_dump
+* Import SQL scripts, COPY data, XML, CSV and Tabbed
+* Supports the Slony master-slave replication engine
+* Excellent language support:
+ o Available in 27 languages
+ o No encoding conflicts. Edit Russian data using a Japanese interface!
+
+%prep
+%setup -q
+%patch0 -p1
+
+
+%build
+
+
+%install
+%{__install} -d %{buildroot}%{ap_docroot}/%{name}
+%{__cp} -dR *.php *.js classes help images lang libraries sql themes xloadtree \
+ %{buildroot}%{ap_docroot}/%{name}
+
+# install config to config dir
+%{__install} -D -m0640 conf/config.inc.php-dist \
+ %{buildroot}%{ppa_config}
+
+# install config for apache
+%{__install} -D -m0644 %{S:1} %{buildroot}%{ap_sysconfdir}/conf.d/%{name}.conf
+
+# fix paths in http config
+%{__sed} -i -e "s,@ap_docroot@,%{ap_docroot},g" -e "s,@name@,%{name},g" \
+ -e "s,@docdir@,%{_docdir},g" %{buildroot}%{ap_sysconfdir}/conf.d/%{name}.conf
+
+# remove not needed files from lang/
+for i in Makefile convert.awk langcheck php2po po2php synch; do
+ %{__rm} -f %{buildroot}%{ap_docroot}/%{name}/lang/${i}
+done
+# remove not needed files
+%{__rm} %{buildroot}%{ap_docroot}/%{name}/build_tests.php
+
+
+%postun
+%restart_on_update apache2
+
+
+%clean
+%{__rm} -rf %{buildroot}
+
+
+%files
+%defattr(0644,root,root,0755)
+%doc CREDITS DEVELOPERS FAQ HISTORY INSTALL LICENSE TODO TRANSLATORS
+%{ap_docroot}/%{name}
+%config(noreplace) %{ap_sysconfdir}/conf.d/%{name}.conf
+%dir %attr(0750,wwwrun,root) %{_sysconfdir}/%{name}
+%config(noreplace) %attr(0640,root,www) %{ppa_config}
+
+
+
+%changelog
diff --git a/phpPgAdmin-4.2.3-config.inc.patch b/phpPgAdmin-4.2.3-config.inc.patch
new file mode 100644
index 0000000..365f94a
--- /dev/null
+++ b/phpPgAdmin-4.2.3-config.inc.patch
@@ -0,0 +1,19 @@
+diff -ruN phpPgAdmin-4.2.3-orig/libraries/lib.inc.php phpPgAdmin-4.2.3/libraries/lib.inc.php
+--- phpPgAdmin-4.2.3-orig/libraries/lib.inc.php 2010-03-28 23:46:17.000000000 +0200
++++ phpPgAdmin-4.2.3/libraries/lib.inc.php 2011-02-19 00:50:02.000000000 +0100
+@@ -27,12 +27,12 @@
+ exit(sprintf('Version of PHP not supported. Please upgrade to version %s or later.', $phpMinVer));
+
+ // Check to see if the configuration file exists, if not, explain
+- if (file_exists('conf/config.inc.php')) {
++ if (file_exists('/etc/phpPgAdmin/config.inc.php')) {
+ $conf = array();
+- include('./conf/config.inc.php');
++ include('/etc/phpPgAdmin/config.inc.php');
+ }
+ else {
+- echo 'Configuration error: Copy conf/config.inc.php-dist to conf/config.inc.php and edit appropriately.';
++ echo 'Configuration error: Can not include config /etc/phpPgAdmin/config.inc.php.';
+ exit;
+ }
+
diff --git a/phpPgAdmin-4.2.tar.bz2 b/phpPgAdmin-4.2.tar.bz2
deleted file mode 100644
index d21d07f..0000000
--- a/phpPgAdmin-4.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:15e19a4f41e15097bb1022d22d8b247bbcd66cc1ce02055b9f5ef0eba04cb641
-size 839991
diff --git a/phpPgAdmin-5.0.2.tar.bz2 b/phpPgAdmin-5.0.2.tar.bz2
new file mode 100644
index 0000000..6f2c2c6
--- /dev/null
+++ b/phpPgAdmin-5.0.2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e68c2f20692198517d4745a9cd4ff25d33779fa89ca0a152a1e812e5224f0adf
+size 776276
diff --git a/phpPgAdmin-CVE-2008-5587.patch b/phpPgAdmin-CVE-2008-5587.patch
deleted file mode 100644
index 899001c..0000000
--- a/phpPgAdmin-CVE-2008-5587.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libraries/lib.inc.php
-+++ libraries/lib.inc.php
-@@ -95,6 +95,8 @@
- }
-
- // Determine language file to import:
-+ unset($_language);
-+
- // 1. Check for the language from a request var
- if (isset($_REQUEST['language']) && isset($appLangFiles[$_REQUEST['language']]))
- $_language = $_REQUEST['language'];
diff --git a/phpPgAdmin.changes b/phpPgAdmin.changes
index ce87082..7366b1a 100644
--- a/phpPgAdmin.changes
+++ b/phpPgAdmin.changes
@@ -1,3 +1,124 @@
+-------------------------------------------------------------------
+Thu May 26 15:23:55 UTC 2011 - chris@computersalat.de
+
+- update to 5.0.2
+ - Released: 3rd January 2011
+ - Some bug fixes.
+ * Fix a css typo & error in cappuccino theme
+ * Fix #3139003 "Autocomplete doesn't insert value", report and
+ patch by Aleksander Machniak
+ * Fix bad inheritance between pg83 -> pg instead of pg83 -> pg84 in
+ the database access classes. This bug was breaking some
+ functionnalities with 8.3
+ * Fix a lot of nonstandard escaped string in the database access
+ classes
+ - Version 5.0.1
+ - Released: 14th December 2010
+ - Minor bug fix and update version.
+ * Fix #3124417 "Wrong german translation", reported by schnoesel
+ * Fix (officialy) a bug where non-super user roles cannot check
+ ownership on objects
+ * Add forgotten Galician language to the target "all" of lang/Makefile
+ * Update jQuery library to current stable 1.4.4
+ * remove useless date from the topbar informations.
+ This was the only place that did PHP 5.3 complain about bad timezone
+ configuration (a non-PPA related warning). As it was a totaly
+ useless information, we decide to remove it.
+ - Version 5.0
+ - Released: 29th November 2010
+ - Features
+ * Support for PostgreSQL 8.4 and 9.0
+ * Support for database level collation for 8.4+
+ * Support for schema level export
+ * Add ability to alter schema ownership
+ * Clean up domain support and improve interface
+ * Add support for commenting on functions
+ * Allow user to rename role/users and set new passwords at the same time
+ * Greatly enhanced Full-Text-Search capabilities (ioguix, Loomis_K)
+ * Overhauled Selenium Test suite to support multiple database versions
+ * Optimized application graphics (Limo Driver)
+ * Support for Column Level Privileges
+ * Allow users to specify a template database at database creation time
+ * Support killing processes
+ * Add ability to create indexes concurrently
+ * Much better support of autovacuum configuration
+ * Add an admin page for table level
+ * Refactored autocompletion:
+ * fix support for cross-schema objects
+ * support multi-field FK
+ * support for pagination of values in the auto-complete list
+ * Allow user to logicaly group their server under custom named
+ node in the browser tree
+ * New themes (Cappuccino and Gotar) and a theme switcher on the
+ introduction page
+ * Auto refresh Locks page
+ * Auto refresh Processes page
+ * Link in the bottom of the page to go to top of page
+ * Browsing on Foreign Keys (When browsing a table, clicking on a
+ FK value, jump to the PK row)
+ - Bugs
+ * Fix problems with query tracking on overly long queries
+ * Ensure pg_dump paths are valid
+ * Fix multiple bugs about quoting and escaping database objects
+ names with special chars
+ * Fix multiple bugs in the browser tree
+ * Fix multiple bugs on the SQL and script file import form
+ * One security fix about code injection
+ * Don't allow inserting on a table without fields
+ * Some fix about commenting databases
+ * removed deprecated functions from PHP 5.3
+ * Lot of code cleanup
+ * Many other small minor bugs found on our way
+ * Fix the operator property page
+ - Translations
+ * Czech (Marek Cernocky)
+ * Greek (Adamantios Diamantidis)
+ * Brazillian Portuguese (Fernando Wendt)
+ * Galician (Adrián Chaves Fernández)
+ - Incompatabilities
+ * No longer support PHP < 5.0
+ * No longer support Postgres < 7.4
+- some spec cleanup
+ o fix description
+
+-------------------------------------------------------------------
+Fri Feb 18 23:51:19 UTC 2011 - chris@computersalat.de
+
+- update to 4.2.3
+ * Fix bug where space as first character in a bytea column was
+ removed by html renderer
+ * Check if the given pg_dumpall / pg_dump paths are correct before
+ using them
+ * Fix some transalation files that had bad UTF-8 declaration, rising
+ a warning
+ * Fix bug with tables that contain quote in their name
+ * support PHP 5.3
+- Version 4.2.2
+ * Fix bug where long SQL queries get truncated
+ * Fix createFunction method on PostgreSQL < 7.3
+ * Fix bug with alter schema in PostgreSQL < 7.4
+ * Remove alter domain for PostgreSQL < 7.4
+ * Fix local file inclusion vulnerability:
+ http://www.securityfocus.com/bid/32670/
+ Unset language variable before determine file includes
+- Version 4.2.1
+ * Fix table icon/link disapearing when navigating between pages
+ during column browse (ioguix)
+ * Fix import/export links from tree menu (Denis Golovtsov, ioguix)
+ * Fix missing language string for shared credential logout
+ * Add missing text search functions/operators (Loomis K, xzilla)
+ * Update FAQ info for postgres win32 releases
+ * Fix database list error for users without connect privileges on
+ all databases (Thomi Dammann, xzilla)
+- add/remove patches
+ * remove obsolete CVE-2008-5587 patch
+ * add config.inc patch
+- add http config
+- add some macros
+- fix deps
+- fix descr
+- remove changelog from spec
+
-------------------------------------------------------------------
Tue Feb 3 14:56:06 CET 2009 - max@suse.de
diff --git a/phpPgAdmin.http b/phpPgAdmin.http
new file mode 100644
index 0000000..862709b
--- /dev/null
+++ b/phpPgAdmin.http
@@ -0,0 +1,18 @@
+
+ Options FollowSymLinks
+ AllowOverride None
+
+ php_admin_flag register_globals off
+ php_admin_flag magic_quotes_gpc off
+ php_admin_flag allow_url_include off
+ php_admin_flag allow_url_fopen off
+ php_admin_flag zend.ze1_compatibility_mode off
+ php_admin_flag safe_mode Off
+ php_admin_value open_basedir "@ap_docroot@/@name@:/var/lib/php5:/tmp:@docdir@/@name@:/etc/@name@"
+
+
+
+ Order allow,deny
+ Deny from all
+
+
diff --git a/phpPgAdmin.spec b/phpPgAdmin.spec
index 9aea4db..773d562 100644
--- a/phpPgAdmin.spec
+++ b/phpPgAdmin.spec
@@ -1,7 +1,7 @@
#
-# spec file for package phpPgAdmin (Version 4.2)
+# spec file for package phpPgAdmin
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,110 +15,97 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
Name: phpPgAdmin
-Summary: phpPgAdmin is a web-based administration tool for PostgreSQL
-BuildRequires: apache2
-Version: 4.2
-Release: 55
-License: GPL v2 or later
+
+%define apxs %{_sbindir}/apxs2
+%define ap_sysconfdir %(%{apxs} -q SYSCONFDIR)
+%define ap_serverroot %(%{apxs} -q PREFIX)
+%define ap_docroot %(%{apxs} -q PREFIX)/htdocs
+%define ppa_config %{_sysconfdir}/%{name}/config.inc.php
+
+Summary: Administration of PostgreSQL over the web
+Version: 5.0.2
+Release: 1
+License: GPLv2+
Group: Productivity/Databases/Tools
-Requires: php5-pgsql apache2-mod_php5
Url: http://phppgadmin.sourceforge.net
Source0: %{name}-%{version}.tar.bz2
-Patch1: phpPgAdmin-CVE-2008-5587.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Source1: %{name}.http
+Patch0: %{name}-4.2.3-config.inc.patch
BuildArch: noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: apache2-devel
+Requires: mod_php_any php-pgsql
%description
phpPgAdmin is a web-based administration tool for PostgreSQL. It is
perfect for PostgreSQL DBAs, newbies and hosting services.
-Currently it can:
+Features
-- Administer multiple servers
-
-- Support for PostgreSQL 7.0.x, 7.1.x, 7.2.x, 7.3.x, 7.4.x, 8.0.x
- and 8.1.x
-
-- Manage all aspects (Users, Groups, Databases, Schemas, Tables,
- Views, Reports)
-
-- Easy data manipulation (browse tables, views, reports; Select,
- insert, update and delete; execute SQL statements)
-
-- Dump table data in a variety of formats
-
-- Import SQL scripts, COPY data, XML, CSV and Tabbed
-
-- Available in 26 languages
-
-
-
-Authors:
---------
- Dan Wilson
- Robert Treat
- Christopher Kings-Lynne
+* Administer multiple servers
+* Support for PostgreSQL 7.4.x, 8.0.x, 8.1.x, 8.2.x, 8.3.x, 8.4.x, 9.0.x
+* Manage all aspects of:
+ o Users & groups
+ o Databases
+ o Schemas
+ o Tables, indexes, constraints, triggers, rules & privileges
+ o Views, sequences & functions
+ o Advanced objects
+ o Reports
+* Easy data manipulation:
+ o Browse tables, views & reports
+ o Execute arbitrary SQL
+ o Select, insert, update and delete
+* Dump table data in a variety of formats: SQL, COPY, XML, XHTML, CSV, Tabbed, pg_dump
+* Import SQL scripts, COPY data, XML, CSV and Tabbed
+* Supports the Slony master-slave replication engine
+* Excellent language support:
+ o Available in 27 languages
+ o No encoding conflicts. Edit Russian data using a Japanese interface!
%prep
%setup -q
-%patch1
+%patch0 -p1
%build
%install
-mkdir -p %buildroot/srv/www/htdocs/%{name}
-cp -a * %buildroot/srv/www/htdocs/%{name}/
-rm -f %buildroot/srv/www/htdocs/%{name}/lang/php2po
-rm -f %buildroot/srv/www/htdocs/%{name}/lang/po2php
+%{__install} -d %{buildroot}%{ap_docroot}/%{name}
+%{__cp} -dR *.php *.js classes help images lang libraries sql themes xloadtree \
+ %{buildroot}%{ap_docroot}/%{name}
+
+# install config to config dir
+%{__install} -D -m0640 conf/config.inc.php-dist \
+ %{buildroot}%{ppa_config}
+
+# install config for apache
+%{__install} -D -m0644 %{S:1} %{buildroot}%{ap_sysconfdir}/conf.d/%{name}.conf
+
+# fix paths in http config
+%{__sed} -i -e "s,@ap_docroot@,%{ap_docroot},g" -e "s,@name@,%{name},g" \
+ -e "s,@docdir@,%{_docdir},g" %{buildroot}%{ap_sysconfdir}/conf.d/%{name}.conf
+
+# remove not needed files from lang/
+for i in Makefile convert.awk langcheck php2po po2php synch; do
+ %{__rm} -f %{buildroot}%{ap_docroot}/%{name}/lang/${i}
+done
+# remove not needed files
+%{__rm} %{buildroot}%{ap_docroot}/%{name}/build_tests.php
+
+%postun
+%restart_on_update apache2
%clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
%files
%defattr(0644,root,root,0755)
-%doc CREDITS DEVELOPERS INSTALL TODO TRANSLATORS
-/srv/www/htdocs/%{name}
-%exclude /srv/www/htdocs/%{name}/conf/config.inc.php
-%config(noreplace) /srv/www/htdocs/%{name}/conf/config.inc.php
+%doc CREDITS DEVELOPERS FAQ HISTORY INSTALL LICENSE TODO TRANSLATORS
+%{ap_docroot}/%{name}
+%config(noreplace) %{ap_sysconfdir}/conf.d/%{name}.conf
+%dir %attr(0750,wwwrun,root) %{_sysconfdir}/%{name}
+%config(noreplace) %attr(0640,root,www) %{ppa_config}
%changelog
-* Tue Feb 03 2009 max@suse.de
-- Added phpPgAdmin-CVE-2008-5587.patch to fix a directory
- traversal vulnerability (bnc#462762).
-* Tue Apr 08 2008 tpatzig@suse.de
-- update to Version 4.2
- * Add Analyze to Table Level Actions (ioguix)
- * Add support for multiple actions on main pages (ioguix, Robert Treat)
- * Added favicon for Mozilla and a backwards compatible version for IE.
- * Allow browsers to save different usernames and passwords for different servers.
- * Pagination selection available for reports
- * You can configure reports db, schema and table names
- * Add support for creating a table using an exsting one (ioguix)
- * Auto-expand a node in the tree browser if there are no other nodes (Tomasz Pala)
- * Add column about fields constraints type + links in table properties page (ioguix)
- * Support for built-in Full Text Search (Ivan Zolotukhin)
- * Addd alter name, owner & comment on views (ioguix)
- * Add column about called procedure + links to their definition in the triggers
- properties page (ioguix)
- * Add Support for Enum type creation (ioguix,xzilla)
- * Add alter name, owner, comment and properties for sequences (ioguix)
- * Add function costing options (xzilla)
- * Add alter owner & schema on function (xzilla)
- * Add a popup window for the session requests history (karl, ioguix)
- * Add alter table, view, sequence schema (ioguix)
- * several bugfixes
-* Sat Aug 04 2007 tpatzig@suse.de
-- update to Version 4.1.3
- * Send encrypted passwords over the wire wherever possible.
- * Alter sequence, nextval and setval (Guillaume)
- * Autovacuum configuration support (Robert Treat)
- * Basic ROLE support (Chris Kings-Lynne, Javier Carlos)
- * Add support for SSL connections (Eric Kinolik)
- * Display Prepared Transactions (Javier Carlos)
- * Add automatic lookup of foreign key values in insert/update fields (John Jawed)
- * several bugfixes
-* Wed Oct 18 2006 tpatzig@suse.de
-- initial build of phpPgAdmin Version 4.0.1
+