From b8c3ad7e4fd810466a2c4ed97268dadfa9091445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= Date: Fri, 10 Aug 2012 10:45:16 +0200 Subject: [PATCH] avoid build failure with using Getopt::Std; --- openjade-getoptperl.patch | 21 +++++++++++++++++++++ openjade.spec | 9 ++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 openjade-getoptperl.patch diff --git a/openjade-getoptperl.patch b/openjade-getoptperl.patch new file mode 100644 index 0000000..0d835ea --- /dev/null +++ b/openjade-getoptperl.patch @@ -0,0 +1,21 @@ +diff -urNp openjade-1.3.2-orig/msggen.pl openjade-1.3.2/msggen.pl +--- openjade-1.3.2-orig/msggen.pl 2002-10-20 23:47:23.000000000 +0200 ++++ openjade-1.3.2/msggen.pl 2012-08-10 10:38:28.019081661 +0200 +@@ -4,6 +4,7 @@ + # See the file COPYING for copying permission. + + use POSIX; ++use Getopt::Std; + + # Package and version. + $package = 'openjade'; +@@ -18,8 +19,7 @@ $gen_c = 0; + undef $opt_l; + undef $opt_p; + undef $opt_t; +-do 'getopts.pl'; +-&Getopts('l:p:t:'); ++getopts('l:p:t:'); + $module = $opt_l; + $pot_file = $opt_p; + diff --git a/openjade.spec b/openjade.spec index 8ce3a3b..da192d2 100644 --- a/openjade.spec +++ b/openjade.spec @@ -1,7 +1,7 @@ Summary: A DSSSL implementation Name: openjade Version: 1.3.2 -Release: 40%{?dist} +Release: 41%{?dist} Requires: sgml-common URL: http://openjade.sourceforge.net/ Source: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz @@ -15,6 +15,8 @@ Patch2: openjade-deplibs.patch Patch3: openjade-nola.patch #upstream bug tracker fix for build with gcc46 Patch4: openjade-1.3.2-gcc46.patch +#use Getopt:Std to prevent build failure +Patch5: openjade-getoptperl.patch License: BSD Group: Applications/Text BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -24,6 +26,7 @@ Provides: jade = %{version}-%{release} BuildRequires: opensp-devel + %description OpenJade is an implementation of the ISO/IEC 10179:1996 standard DSSSL (Document Style Semantics and Specification Language). OpenJade is @@ -40,6 +43,7 @@ XML, RTF, TeX, MIF (FrameMaker), SGML, or XML. %patch2 -p1 -b .deplibs %patch3 -p1 -b .nola %patch4 -p1 -b .gcc46 +%patch5 -p1 -b .getopt %build @@ -96,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/sgml/%{name}-%{version} %changelog +* Fri Aug 10 2012 Ondrej Vasik 1.3.2-41 +- avoid build failure with using Getopt::Std; + * Fri Jul 20 2012 Fedora Release Engineering - 1.3.2-40 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild