[packages/phpPgAdmin] - rel 2, fix obsolete rpm tag and fix patch diff

baggins baggins at pld-linux.org
Fri Oct 2 22:51:54 CEST 2026


commit cef846707ae43835c4fedadb98fdbbd4ff845339
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Oct 2 22:51:26 2026 +0200

    - rel 2, fix obsolete rpm tag and fix patch diff

 phpPgAdmin-calendar.patch | 6 +++---
 phpPgAdmin.spec           | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/phpPgAdmin.spec b/phpPgAdmin.spec
index db41c10..a6ce356 100644
--- a/phpPgAdmin.spec
+++ b/phpPgAdmin.spec
@@ -5,7 +5,7 @@ Summary:	phpPgAdmin - web-based PostgreSQL administration
 Summary(pl.UTF-8):	phpPgAdmin - administracja bazami PostgreSQL przez WWW
 Name:		phpPgAdmin
 Version:	5.1
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Applications/Databases/Interfaces
 Source0:	http://downloads.sourceforge.net/phppgadmin/%{name}-%{version}.tar.bz2
@@ -19,7 +19,7 @@ Patch0:		%{name}-config.patch
 Patch1:		%{name}-calendar.patch
 URL:		http://phppgadmin.sourceforge.net/
 BuildRequires:	rpmbuild(macros) >= 1.268
-Requires(triggerpostun):	sed >= 4.0
+Requires(postun):	sed >= 4.0
 #Requires:	adodb >= 4.67-1.17
 Requires:	php(pcre)
 Requires:	php(pgsql)
diff --git a/phpPgAdmin-calendar.patch b/phpPgAdmin-calendar.patch
index e68bcd3..3bd50f9 100644
--- a/phpPgAdmin-calendar.patch
+++ b/phpPgAdmin-calendar.patch
@@ -20,7 +20,7 @@ diff -ur phpPgAdmin-4.2.2.orig/classes/Misc.php phpPgAdmin-4.2.2/classes/Misc.ph
 --- phpPgAdmin-4.2.2.orig/classes/Misc.php	2008-12-18 06:28:57.000000000 +0100
 +++ phpPgAdmin-4.2.2/classes/Misc.php	2009-04-13 17:22:01.000000000 +0200
 @@ -395,6 +395,12 @@
- 				echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset={$lang['appcharset']}\" />\n";
+ 				echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
  				// Theme
  				echo "<link rel=\"stylesheet\" href=\"themes/{$conf['theme']}/global.css\" type=\"text/css\" />\n";
 +?>
@@ -31,7 +31,7 @@ diff -ur phpPgAdmin-4.2.2.orig/classes/Misc.php phpPgAdmin-4.2.2/classes/Misc.ph
 +<?php
  				echo "<link rel=\"shortcut icon\" href=\"images/themes/{$conf['theme']}/Favicon.ico\" type=\"image/vnd.microsoft.icon\" />\n";
  				echo "<link rel=\"icon\" type=\"image/png\" href=\"images/themes/{$conf['theme']}/Introduction.png\" />\n";
- 				echo "<title>", htmlspecialchars($appName);
+ 				echo "<script type=\"text/javascript\" src=\"libraries/js/jquery.js\"></script>";
 diff -ur phpPgAdmin-4.2.2.orig/display.php phpPgAdmin-4.2.2/display.php
 --- phpPgAdmin-4.2.2.orig/display.php	2008-12-18 06:28:57.000000000 +0100
 +++ phpPgAdmin-4.2.2/display.php	2010-10-02 01:41:27.000000000 +0200
@@ -54,7 +54,7 @@ diff -ur phpPgAdmin-4.2.2.orig/display.php phpPgAdmin-4.2.2/display.php
  					if (($fksprops !== false) && isset($fksprops['byfield'][$attrs->fields['attnum']])) {
 @@ -116,6 +117,7 @@
  
- 					echo $data->printField("values[{$attrs->fields['attnum']}]", $rs->fields[$attrs->fields['attname']], $attrs->fields['type'], $extras);
+ 					echo $data->printField("values[{$attrs->fields['attname']}]", $rs->fields[$attrs->fields['attname']], $attrs->fields['type'], $extras);
  
 +					if (in_array(substr($attrs->fields['type'],0,9),array('date','timestamp'))) $shift++;
  					echo "</td>";
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/phpPgAdmin.git/commitdiff/cef846707ae43835c4fedadb98fdbbd4ff845339



More information about the pld-cvs-commit mailing list