packages: builder, php/php.spec - more bashism fix

glen glen at pld-linux.org
Mon Mar 15 23:25:32 CET 2010


Author: glen                         Date: Mon Mar 15 22:25:32 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- more bashism fix

---- Files affected:
packages:
   builder (1.612 -> 1.613) 
packages/php:
   php.spec (1.850 -> 1.851) 

---- Diffs:

================================================================
Index: packages/builder
diff -u packages/builder:1.612 packages/builder:1.613
--- packages/builder:1.612	Mon Mar 15 23:19:31 2010
+++ packages/builder	Mon Mar 15 23:25:26 2010
@@ -755,7 +755,7 @@
 	local origin mirror name rest ol prefix
 	while read origin mirror name rest; do
 		# skip comments and empty lines
-		if [ -z "$origin" ] || [[ $origin == \#* ]]; then
+		if [ -z "$origin" ] || [ "${origin#\#}" != "$origin" ]; then
 			continue
 		fi
 		ol=$(echo -n "$origin" | wc -c)

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.850 packages/php/php.spec:1.851
--- packages/php/php.spec:1.850	Mon Mar 15 22:09:22 2010
+++ packages/php/php.spec	Mon Mar 15 23:25:27 2010
@@ -1300,7 +1300,7 @@
 Summary(pl.UTF-8):	Moduł session dla PHP
 Group:		Libraries
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Suggests:	%{name}-hash = %{epoch}:%{version}-%{release}
+Requires(hint):	%{name}-hash = %{epoch}:%{version}-%{release}
 Provides:	php(session)
 
 %description session
@@ -1409,8 +1409,8 @@
 Group:		Libraries
 URL:		http://www.php.net/manual/en/book.sqlite.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Suggests:	%{name}-pdo = %{epoch}:%{version}-%{release}
-Suggests:	%{name}-spl = %{epoch}:%{version}-%{release}
+Requires(hint):	%{name}-pdo = %{epoch}:%{version}-%{release}
+Requires(hint):	%{name}-spl = %{epoch}:%{version}-%{release}
 Provides:	php(sqlite)
 
 %description sqlite
@@ -1609,7 +1609,7 @@
 Group:		Libraries
 URL:		http://www.php.net/manual/en/book.xmlreader.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Suggests:	%{name}-dom = %{epoch}:%{version}-%{release}
+Requires(hint):	%{name}-dom = %{epoch}:%{version}-%{release}
 Provides:	php(xmlreader)
 
 %description xmlreader
@@ -3017,6 +3017,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.851  2010/03/15 22:25:27  glen
+- more bashism fix
+
 Revision 1.850  2010/03/15 21:09:22  glen
 - up to 5.3.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/builder?r1=1.612&r2=1.613&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.850&r2=1.851&f=u



More information about the pld-cvs-commit mailing list