From b080705613a33bc5c560061e46f0886a3c3daf36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
Date: Tue, 10 Nov 2015 16:40:58 +0100
Subject: 1.45 bump

---
 .gitignore                                         |  1 +
 ...rn-s-first-argument-is-a-formating-string.patch | 30 ----------------------
 ...re-because-StartupWindow-does-some-Prima-.patch | 26 +++++++++++++++++++
 perl-Prima.spec                                    | 17 +++++++++---
 sources                                            |  2 +-
 5 files changed, 42 insertions(+), 34 deletions(-)
 delete mode 100644 Prima-1.44-warn-s-first-argument-is-a-formating-string.patch
 create mode 100644 
Prima-1.45-s-use-require-because-StartupWindow-does-some-Prima-.patch

diff --git a/.gitignore b/.gitignore
index 74fa322..f79e0f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /Prima-1.42.tar.gz
 /Prima-1.43.tar.gz
 /Prima-1.44.tar.gz
+/Prima-1.45.tar.gz
diff --git a/Prima-1.44-warn-s-first-argument-is-a-formating-string.patch 
b/Prima-1.44-warn-s-first-argument-is-a-formating-string.patch
deleted file mode 100644
index ab0e998..0000000
--- a/Prima-1.44-warn-s-first-argument-is-a-formating-string.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From cee9d72d34b97c029082538c2e02b493f2a0b04a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
-Date: Wed, 5 Aug 2015 15:37:28 +0200
-Subject: [PATCH] warn()'s first argument is a formating string
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GCC -Werror=format-security complains that calling warn( msg); is not
-safe because the msg argument is interpreted as a formating string,
-not a string literal.
-
-Signed-off-by: Petr Písař <ppi...@redhat.com>
-
-diff --git a/img/codec_png.c b/img/codec_png.c
-index d8f4f39..7b7c307 100644
---- a/img/codec_png.c
-+++ b/img/codec_png.c
-@@ -267,7 +267,7 @@ PNGAPI
- #endif
- warning_fn( png_structp png_ptr, png_const_charp msg) 
- { 
--   warn( msg);
-+   warn( "%s", msg);
- }
- 
- static void
--- 
-2.4.3
-
diff --git 
a/Prima-1.45-s-use-require-because-StartupWindow-does-some-Prima-.patch 
b/Prima-1.45-s-use-require-because-StartupWindow-does-some-Prima-.patch
new file mode 100644
index 0000000..1154449
--- /dev/null
+++ b/Prima-1.45-s-use-require-because-StartupWindow-does-some-Prima-.patch
@@ -0,0 +1,26 @@
+From 3bc6c2e3b41f1d02cf5e83ed196b2d39e37dbeef Mon Sep 17 00:00:00 2001
+From: Dmitry Karasik <dmi...@karasik.eu.org>
+Date: Sun, 8 Nov 2015 12:41:11 +0100
+Subject: [PATCH] s/use/require/ because StartupWindow does some Prima init
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Písař <ppi...@redhat.com>
+---
+ t/misc/syntax.t | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/misc/syntax.t b/t/misc/syntax.t
+index 23ba27d..db4b201 100644
+--- a/t/misc/syntax.t
++++ b/t/misc/syntax.t
+@@ -17,4 +17,4 @@ find ( sub {
+ }, "$Bin/../../");
+ 
+ plan tests => scalar @packages;
+-use_ok($_) for @packages;
++require_ok($_) for @packages;
+-- 
+2.4.3
+
diff --git a/perl-Prima.spec b/perl-Prima.spec
index 0b36dde..8df57bf 100644
--- a/perl-Prima.spec
+++ b/perl-Prima.spec
@@ -1,15 +1,15 @@
 %global use_x11_tests 1
 
 Name:           perl-Prima
-Version:        1.44
+Version:        1.45
 Release:        1%{?dist}
 Summary:        Perl graphic toolkit
 License:        BSD
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Prima/
 Source0:        
http://www.cpan.org/authors/id/K/KA/KARASIK/Prima-%{version}.tar.gz
-# Fix a warn() miscall, bug #1250528, CPAN RT#106257
-Patch0:         Prima-1.44-warn-s-first-argument-is-a-formating-string.patch
+# Fix t/misc/syntax.t test, in upstream adter 1.45
+Patch0:         
Prima-1.45-s-use-require-because-StartupWindow-does-some-Prima-.patch
 BuildRequires:  coreutils
 BuildRequires:  findutils
 BuildRequires:  fontconfig-devel
@@ -45,12 +45,18 @@ BuildRequires:  perl(Tie::Hash)
 BuildRequires:  perl(vars)
 BuildRequires:  perl(warnings)
 # Run-time:
+BuildRequires:  perl(base)
 BuildRequires:  perl(Carp)
 BuildRequires:  perl(Encode)
+BuildRequires:  perl(Exporter)
 BuildRequires:  perl(IO::Handle)
 BuildRequires:  perl(Tie::Array)
 BuildRequires:  perl(Tie::RefHash)
+# Optional run-time:
+# Text::Bidi::Constants 2.10 not used at tests
+# Text::Bidi::Paragraph 2.10 not used at tests
 # Tests:
+BuildRequires:  perl(FindBin)
 BuildRequires:  perl(open)
 BuildRequires:  perl(Test::More)
 %if %{use_x11_tests}
@@ -60,6 +66,8 @@ BuildRequires:  font(:lang=en)
 # Tests exhibit a proportinal font
 BuildRequires:  liberation-sans-fonts
 %endif
+# Optional tests:
+BuildRequires:  perl(Test::Pod) >= 1.00
 Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 # Virtual packages used to load more modules
 Provides:       perl(Prima::Buttons) = %{version}
@@ -130,6 +138,9 @@ find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm 
-f {} \;
 %{_mandir}/man3/Prima::Test.*
 
 %changelog
+* Tue Nov 10 2015 Petr Pisar <ppi...@redhat.com> - 1.45-1
+- 1.45 bump
+
 * Wed Aug 05 2015 Petr Pisar <ppi...@redhat.com> - 1.44-1
 - 1.44 bump
 
diff --git a/sources b/sources
index dc7c428..86c242e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-efc577c1e60dc378f58b24a2e90d8aa6  Prima-1.44.tar.gz
+6a06642d107dcb694bb2d6e403a2b2ca  Prima-1.45.tar.gz
-- 
cgit v0.11.2


        
http://pkgs.fedoraproject.org/cgit/perl-Prima.git/commit/?h=master&id=b080705613a33bc5c560061e46f0886a3c3daf36
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/perl-devel

Reply via email to