From 2ad7e42f7cf2373a4c9ce5929a70907b2eca5a0d Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <[email protected]>
Date: Thu, 22 Jun 2017 14:17:45 +0200
Subject: 1.2 bump

---
 .gitignore                                         |  1 +
 ...05-Fix-unescaped-curly-bracket-in-regexps.patch | 69 ----------------------
 Parse-Yapp-1.05-pod-errors.patch                   | 15 -----
 Parse-Yapp-1.05-pod_item.patch                     | 13 ----
 Parse-Yapp-1.05-spelling.patch                     | 25 --------
 perl-Parse-Yapp.spec                               | 33 +++++------
 sources                                            |  2 +-
 7 files changed, 16 insertions(+), 142 deletions(-)
 delete mode 100644 Parse-Yapp-1.05-Fix-unescaped-curly-bracket-in-regexps.patch
 delete mode 100644 Parse-Yapp-1.05-pod-errors.patch
 delete mode 100644 Parse-Yapp-1.05-pod_item.patch
 delete mode 100644 Parse-Yapp-1.05-spelling.patch

diff --git a/.gitignore b/.gitignore
index d0a2057..45e8e71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Parse-Yapp-1.05.tar.gz
+/Parse-Yapp-1.2.tar.gz
diff --git a/Parse-Yapp-1.05-Fix-unescaped-curly-bracket-in-regexps.patch 
b/Parse-Yapp-1.05-Fix-unescaped-curly-bracket-in-regexps.patch
deleted file mode 100644
index 587d659..0000000
--- a/Parse-Yapp-1.05-Fix-unescaped-curly-bracket-in-regexps.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From d2f95da0bde7130cce98bbd91dc2095df3635bd4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <[email protected]>
-Date: Mon, 22 May 2017 11:14:40 +0200
-Subject: [PATCH] Fix unescaped curly bracket in regexps
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Since 5.22.0 a literal '{' is a warning, since 5.26.0 it's an error:
-
-Unescaped left brace in regex is illegal here in regex; marked by <-- HERE in 
m/\G{ <-- HERE / at YappParse.yp line 288.
-[...]
-
-CPAN RT#106685
-CPAN RT#114776
-
-Signed-off-by: Petr Písař <[email protected]>
----
- YappParse.yp            | 4 ++--
- lib/Parse/Yapp/Parse.pm | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/YappParse.yp b/YappParse.yp
-index 9f6c234..8000b34 100644
---- a/YappParse.yp
-+++ b/YappParse.yp
-@@ -285,7 +285,7 @@ sub _Lexer {
-         return($1, [ $1, $lineno[0] ]);
-     };
- 
--        $$input=~/\G{/gc
-+        $$input=~/\G\{/gc
-     and do {
-         my($level,$from,$code);
- 
-@@ -312,7 +312,7 @@ sub _Lexer {
-         and return('START',[ undef, $lineno[0] ]);
-             $$input=~/\G%(expect)/gc
-         and return('EXPECT',[ undef, $lineno[0] ]);
--            $$input=~/\G%{/gc
-+            $$input=~/\G%\{/gc
-         and do {
-             my($code);
- 
-diff --git a/lib/Parse/Yapp/Parse.pm b/lib/Parse/Yapp/Parse.pm
-index db561de..9651fa7 100755
---- a/lib/Parse/Yapp/Parse.pm
-+++ b/lib/Parse/Yapp/Parse.pm
-@@ -880,7 +880,7 @@ sub _Lexer {
-         return($1, [ $1, $lineno[0] ]);
-     };
- 
--        $$input=~/\G{/gc
-+        $$input=~/\G\{/gc
-     and do {
-         my($level,$from,$code);
- 
-@@ -907,7 +907,7 @@ sub _Lexer {
-         and return('START',[ undef, $lineno[0] ]);
-             $$input=~/\G%(expect)/gc
-         and return('EXPECT',[ undef, $lineno[0] ]);
--            $$input=~/\G%{/gc
-+            $$input=~/\G%\{/gc
-         and do {
-             my($code);
- 
--- 
-2.9.4
-
diff --git a/Parse-Yapp-1.05-pod-errors.patch b/Parse-Yapp-1.05-pod-errors.patch
deleted file mode 100644
index 98713b2..0000000
--- a/Parse-Yapp-1.05-pod-errors.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Ansgar Burchardt <[email protected]>
-Subject: Fix POD syntax errors
-
-<https://rt.cpan.org/Public/Bug/Display.html?id=54410>
-
---- libparse-yapp-perl.orig/lib/Parse/Yapp.pm
-+++ libparse-yapp-perl/lib/Parse/Yapp.pm
-@@ -149,6 +149,7 @@
- C<%expect> followed by a number, suppress warnings about number of 
Shift/Reduce
- conflicts when both numbers match, a la bison.
- 
-+=back
- 
- =item B<The Rule Section> contains your grammar rules:
- 
diff --git a/Parse-Yapp-1.05-pod_item.patch b/Parse-Yapp-1.05-pod_item.patch
deleted file mode 100644
index 5902982..0000000
--- a/Parse-Yapp-1.05-pod_item.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-<https://rt.cpan.org/Public/Bug/Display.html?id=11659>
-
---- a/lib/Parse/Yapp.pm     2005-02-25 13:24:39.000000000 +0300
-+++ b/lib/Parse/Yapp.pm     2005-02-25 13:25:13.000000000 +0300
-@@ -375,7 +375,7 @@
-
- So you will need an Error reporting sub.
-
--item C<Error reporting routine>
-+=item C<Error reporting routine>
-
- If you want one, write it knowing that it is passed as parameter
- the parser object. So you can share information whith the lexer
diff --git a/Parse-Yapp-1.05-spelling.patch b/Parse-Yapp-1.05-spelling.patch
deleted file mode 100644
index 21752c8..0000000
--- a/Parse-Yapp-1.05-spelling.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Ansgar Burchardt <[email protected]>
-Subject: Correct spelling errors
-
-<https://rt.cpan.org/Public/Bug/Display.html?id=54410>
-
---- libparse-yapp-perl.orig/lib/Parse/Yapp.pm
-+++ libparse-yapp-perl/lib/Parse/Yapp.pm
-@@ -173,7 +173,7 @@
- 
- A rhs may be followed by an optional C<%prec> directive, followed
- by a token, giving the rule an explicit precedence (see yacc manuals
--for its precise meaning) and optionnal semantic action code block (see
-+for its precise meaning) and optional semantic action code block (see
- below).
- 
-     exp:   '-' exp %prec NEG { -$_[1] }
-@@ -351,7 +351,7 @@
- It is its duty to return the next token and value to the parser.
- They C<must> be returned as a list of two variables, the first one
- is the token known by the parser (symbolic or literal), the second
--one beeing anything you want (usualy the content of the token, or the
-+one beeing anything you want (usually the content of the token, or the
- literal value) from a simple scalar value to any complex reference,
- as the parsing driver never use it but to call semantic actions:
- 
diff --git a/perl-Parse-Yapp.spec b/perl-Parse-Yapp.spec
index 3f9052a..c3fda7f 100644
--- a/perl-Parse-Yapp.spec
+++ b/perl-Parse-Yapp.spec
@@ -1,23 +1,20 @@
+%global cpan_version 1.2
+
 Name:           perl-Parse-Yapp
-Version:        1.05
-Release:        62%{?dist}
+# Keep 2-digit version for history
+Version:        %{cpan_version}0
+Release:        1%{?dist}
 Summary:        Perl extension for generating and using LALR parsers
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Parse-Yapp/
-Source0:        
http://www.cpan.org/authors/id/F/FD/FDESAR/Parse-Yapp-%{version}.tar.gz
-# Fix POD, CPAN RT #54410
-Patch0:         Parse-Yapp-1.05-pod-errors.patch
-# Fix POD, CPAN RT #54410
-Patch1:         Parse-Yapp-1.05-spelling.patch
-# Fix POD, CPAN RT #11659
-Patch2:         Parse-Yapp-1.05-pod_item.patch
-# Restore compatibility with Perl 5.26.0, CPAN RT#106685, CPAN RT#114776
-Patch3:         Parse-Yapp-1.05-Fix-unescaped-curly-bracket-in-regexps.patch
+Source0:        
http://www.cpan.org/authors/id/W/WB/WBRASWELL/Parse-Yapp-%{cpan_version}.tar.gz
 BuildArch:      noarch
+BuildRequires:  coreutils
+BuildRequires:  make
 BuildRequires:  perl
 BuildRequires:  perl-generators
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
 # Run-time:
 BuildRequires:  perl(Carp)
 BuildRequires:  perl(strict)
@@ -31,20 +28,15 @@ object oriented interface.  The script yapp is a front-end 
to the Parse::Yapp
 module and let you easily create a Perl OO parser from an input grammar file.
 
 %prep
-%setup -q -n Parse-Yapp-%{version} 
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%setup -q -n Parse-Yapp-%{cpan_version}
 chmod 644 README lib/Parse/{*.pm,Yapp/*.pm}
 
 %build
-perl Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
 make %{?_smp_mflags}
 
 %install
 make pure_install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 %check
@@ -59,6 +51,9 @@ make test
 
 
 %changelog
+* Thu Jun 22 2017 Jitka Plesnikova <[email protected]> - 1.20-1
+- 1.2 bump
+
 * Sun Jun 04 2017 Jitka Plesnikova <[email protected]> - 1.05-62
 - Perl 5.26 rebuild
 
diff --git a/sources b/sources
index 27ef457..e0aa47d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7bfca736d6af36c51edf7a97111a8f3b  Parse-Yapp-1.05.tar.gz
+SHA512 (Parse-Yapp-1.2.tar.gz) = 
f421f7130c1e1ddc0699b83c210c266bb14f7bc47a3f14ecfd1b2fe6cc48454eb3dbd9d4a32901b92072e68d07e4acfb3ebcebd133986ac9cbfba70d05b394d6
-- 
cgit v1.1


        
https://src.fedoraproject.org/cgit/perl-Parse-Yapp.git/commit/?h=master&id=2ad7e42f7cf2373a4c9ce5929a70907b2eca5a0d
_______________________________________________
perl-devel mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to