From 8986e674044e496d3ad78af26d4c2676cf5f67a5 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jples...@redhat.com>
Date: Fri, 9 Dec 2016 13:57:55 +0100
Subject: 0.20 bump

---
 .gitignore                                         |  1 +
 perl-Protocol-WebSocket.spec                       | 27 ++++++++++++------
 ...col_websocket_remove_cpan_meta_references.patch | 33 ----------------------
 sources                                            |  2 +-
 4 files changed, 20 insertions(+), 43 deletions(-)
 delete mode 100644 protocol_websocket_remove_cpan_meta_references.patch

diff --git a/.gitignore b/.gitignore
index 9faad20..0843b40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /Protocol-WebSocket-0.17.tar.gz
 /Protocol-WebSocket-0.18.tar.gz
 /Protocol-WebSocket-0.19.tar.gz
+/Protocol-WebSocket-0.20.tar.gz
diff --git a/perl-Protocol-WebSocket.spec b/perl-Protocol-WebSocket.spec
index e9491b6..11c2e76 100644
--- a/perl-Protocol-WebSocket.spec
+++ b/perl-Protocol-WebSocket.spec
@@ -1,6 +1,6 @@
 Name:           perl-Protocol-WebSocket
-Version:        0.19
-Release:        3%{?dist}
+Version:        0.20
+Release:        1%{?dist}
 Summary:        WebSocket protocol
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -9,6 +9,7 @@ Source0:        
http://search.cpan.org/CPAN/authors/id/V/VT/VTI/Protocol-WebSock
 # includes Test::More with a higher version than available for epel6
 Patch1:         test_simple_include.patch
 BuildArch:      noarch
+BuildRequires:  coreutils
 BuildRequires:  perl
 BuildRequires:  perl-generators
 BuildRequires:  perl(base)
@@ -21,12 +22,11 @@ BuildRequires:  perl(Encode)
 %if 0%{?el6}
 BuildRequires:  perl(Exporter)
 %endif
-BuildRequires:  perl(File::Basename)
-BuildRequires:  perl(File::Copy)
-BuildRequires:  perl(File::Spec)
+BuildRequires:  perl(FindBin)
 BuildRequires:  perl(IO::Handle)
+BuildRequires:  perl(lib)
 BuildRequires:  perl(MIME::Base64)
-BuildRequires:  perl(Module::Build)
+BuildRequires:  perl(Module::Build::Tiny) >= 0.35
 BuildRequires:  perl(Scalar::Util)
 BuildRequires:  perl(strict)
 BuildRequires:  perl(Test::More)
@@ -35,8 +35,11 @@ BuildRequires:  perl(warnings)
 %if 0%{?el6}
 BuildRequires:  perl(vars)
 %endif
+BuildRequires:  sed
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo 
$version))
 
+%{?perl_default_filter}
+
 %description
 Client/server WebSocket message and frame parser/constructor. This module
 does not provide a WebSocket server or client, but is made for using in
@@ -49,14 +52,16 @@ http servers or clients to provide WebSocket support.
 %patch1 -p1
 %endif
 # Upstream is okay with wsconsole being made available as a binary for 
Fedora/EPEL
-%{__mv} util bin
+# Module::Build::Tiny requires that all executables must be in script/
+%{__mv} util script
+%{__sed} -i -e '1s|#!/usr/bin/env perl|%(perl -MConfig -e 'print 
$Config{startperl}')|' script/* examples/*
 
 %build
-%{__perl} Build.PL installdirs=vendor
+%{__perl} Build.PL --installdirs=vendor
 ./Build
 
 %install
-./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
+./Build install --destdir=$RPM_BUILD_ROOT --create_packlist=0
 
 %{_fixperms} $RPM_BUILD_ROOT/*
 
@@ -72,10 +77,14 @@ PERL5LIB=test_simple_patch/lib ./Build test
 %license LICENSE
 %doc Changes examples
 %{perl_vendorlib}/*
+%{_mandir}/man1/*
 %{_mandir}/man3/*
 %{_bindir}/*
 
 %changelog
+* Fri Dec 09 2016 Jitka Plesnikova <jples...@redhat.com> - 0.20-1
+- 0.20 bump
+
 * Sat May 14 2016 Jitka Plesnikova <jples...@redhat.com> - 0.19-3
 - Perl 5.24 rebuild
 
diff --git a/protocol_websocket_remove_cpan_meta_references.patch 
b/protocol_websocket_remove_cpan_meta_references.patch
deleted file mode 100644
index 37725eb..0000000
--- a/protocol_websocket_remove_cpan_meta_references.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur old/Build.PL new/Build.PL
---- old/Build.PL       2014-04-09 18:12:18.000000000 +1000
-+++ new/Build.PL       2014-04-13 22:01:57.890616362 +1000
-@@ -12,8 +12,6 @@
- use Module::Build;
- use File::Basename;
- use File::Spec;
--use CPAN::Meta;
--use CPAN::Meta::Prereqs;
- 
- my %args = (
-     license              => 'perl',
-@@ -53,20 +51,3 @@
- )->new(%args);
- $builder->create_build_script();
- 
--my $mbmeta = CPAN::Meta->load_file('MYMETA.json');
--my $meta = CPAN::Meta->load_file('META.json');
--my $prereqs_hash = CPAN::Meta::Prereqs->new(
--    $meta->prereqs
--)->with_merged_prereqs(
--    CPAN::Meta::Prereqs->new($mbmeta->prereqs)
--)->as_string_hash;
--my $mymeta = CPAN::Meta->new(
--    {
--        %{$meta->as_struct},
--        prereqs => $prereqs_hash
--    }
--);
--print "Merging cpanfile prereqs to MYMETA.yml\n";
--$mymeta->save('MYMETA.yml', { version => 1.4 });
--print "Merging cpanfile prereqs to MYMETA.json\n";
--$mymeta->save('MYMETA.json', { version => 2 });
diff --git a/sources b/sources
index 4b9847b..234b310 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eede6e8c78c04a4fb74ea85ae73c93f4  Protocol-WebSocket-0.19.tar.gz
+ef663082cd975ae8098dd3de144ee21c  Protocol-WebSocket-0.20.tar.gz
-- 
cgit v0.12


        
http://pkgs.fedoraproject.org/cgit/perl-Protocol-WebSocket.git/commit/?h=master&id=8986e674044e496d3ad78af26d4c2676cf5f67a5
_______________________________________________
perl-devel mailing list -- perl-devel@lists.fedoraproject.org
To unsubscribe send an email to perl-devel-le...@lists.fedoraproject.org

Reply via email to