[html2ps] Remove deprecated variable

Petr Pisar ppisar at fedoraproject.org
Wed May 16 12:59:29 UTC 2012


commit 46688d545b4ddbda0b25705ed5bb057bf0f4c946
Author: Petr Písař <ppisar at redhat.com>
Date:   Wed May 16 14:44:08 2012 +0200

    Remove deprecated variable

 html2ps-1.0b7-Remove-deprecated-variable.patch |   26 ++++++++++++++++++++++++
 html2ps.spec                                   |    8 ++++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/html2ps-1.0b7-Remove-deprecated-variable.patch b/html2ps-1.0b7-Remove-deprecated-variable.patch
new file mode 100644
index 0000000..0d795cf
--- /dev/null
+++ b/html2ps-1.0b7-Remove-deprecated-variable.patch
@@ -0,0 +1,26 @@
+From cf9d76ef6b15bb31d86313e6b97ed13910908044 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Wed, 16 May 2012 14:40:41 +0200
+Subject: [PATCH] Remove deprecated $[ variable
+
+Usage of the variable is deprecated since perl 5.12 and it default to
+0 either. See <https://bugzilla.redhat.com/show_bug.cgi?id=822117>.
+---
+ html2ps |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/html2ps b/html2ps
+index ba6bf3b..a5f363d 100755
+--- a/html2ps
++++ b/html2ps
+@@ -3405,7 +3405,6 @@ sub Getopts {
+   local($optlist)=@_;
+   local(@args,$_,$opt,$opts,$rest,$olist,$plist,$found, at popts);
+   local($errs)=0;
+-  local($[)=0;
+   @args=split( /\|/, $optlist );
+   for $opt (@args) {
+     if(substr($opt,-1,1) ne ':') {$olist.=$opt}
+-- 
+1.7.7.6
+
diff --git a/html2ps.spec b/html2ps.spec
index c16a60d..a2975a9 100644
--- a/html2ps.spec
+++ b/html2ps.spec
@@ -1,7 +1,7 @@
 %define my_subversion b7
 Name:           html2ps
 Version:        1.0
-Release:        0.8.%{my_subversion}%{?dist}
+Release:        0.9.%{my_subversion}%{?dist}
 Summary:        HTML to PostScript converter
 
 Group:          Applications/Publishing
@@ -15,6 +15,8 @@ Patch1:         %{name}-1.0b5-xdg-open.patch
 # patch config file from debian to use dvips, avoid using weblint 
 # don't set letter as default page type, paperconf will set the default
 Patch2:         %{name}-1.0b5-config.patch
+# Remove deprecated variable, bug #822117
+Patch3:         %{name}-1.0b7-Remove-deprecated-variable.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -50,6 +52,7 @@ converter.
 %patch0 -p1
 %patch1 -p1 -b .xdg-open
 %patch2 -p1 -b .config
+%patch3 -p1 -b .deprecated
 
 # convert README to utf8
 iconv -f latin1 -t utf8 < README > README.utf8
@@ -105,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*xhtml2ps.desktop
 
 %changelog
+* Wed May 16 2012 Petr Pisar <ppisar at redhat.com> - 1.0-0.9.b7
+- Remove deprecated variable (bug #822117)
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.8.b7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list