From 88a1c14612ee86f9eba8ea9cd43a25c5a7cd7e30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <[email protected]>
Date: Wed, 7 Jun 2017 11:30:56 +0200
Subject: Modernize spec file
---
perl-Gnome2-Canvas.spec | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/perl-Gnome2-Canvas.spec b/perl-Gnome2-Canvas.spec
index 2362c3f..3cb8a0e 100644
--- a/perl-Gnome2-Canvas.spec
+++ b/perl-Gnome2-Canvas.spec
@@ -1,22 +1,23 @@
-%global use_x11_tests 1
+# Run X11 tests against a dummy X11 server
+%{bcond_without perl_Gnome2_Canvas_enables_x11_test}
Name: perl-Gnome2-Canvas
Version: 1.002
-Release: 34%{?dist}
+Release: 35%{?dist}
Summary: An engine for structured graphics in Gnome2
Group: Development/Libraries
License: GPLv2+
URL: http://search.cpan.org/dist/Gnome2-Canvas/
Source0:
http://search.cpan.org/CPAN/authors/id/T/TS/TSCH/Gnome2-Canvas-%{version}.tar.gz
-BuildRequires: coreutils
BuildRequires: findutils
+BuildRequires: gcc
BuildRequires: make
BuildRequires: perl
BuildRequires: perl-devel
BuildRequires: perl-generators
BuildRequires: perl(Cwd)
BuildRequires: perl(ExtUtils::Depends) >= 0.200
-BuildRequires: perl(ExtUtils::MakeMaker)
+BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76
BuildRequires: perl(ExtUtils::PkgConfig) >= 1.03
BuildRequires: perl(File::Spec)
BuildRequires: perl(Glib) >= 1.040
@@ -31,7 +32,7 @@ BuildRequires: perl(warnings)
# Tests:
BuildRequires: perl(Test::More)
# Optional tests:
-%if %{use_x11_tests}
+%if %{with perl_Gnome2_Canvas_enables_x11_test}
# X11 tests:
BuildRequires: xorg-x11-server-Xvfb
BuildRequires: font(:lang=en)
@@ -56,17 +57,16 @@ graphics and for creating interactive user interface
elements.
%setup -q -n Gnome2-Canvas-%{version}
%build
-perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}
%install
make pure_install DESTDIR=%{buildroot}
-find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
-find %{buildroot} -type f -name '*.bs' -empty -exec rm -f {} ';'
+find %{buildroot} -type f -name '*.bs' -empty -delete
%{_fixperms} %{buildroot}
%check
-%if %{use_x11_tests}
+%if %{with perl_Gnome2_Canvas_enables_x11_test}
xvfb-run -a make test
%else
make test
@@ -82,6 +82,9 @@ find %{buildroot} -type f -name '*.bs' -empty -exec rm -f {}
';'
%changelog
+* Wed Jun 07 2017 Petr Pisar <[email protected]> - 1.002-35
+- Modernize spec file
+
* Wed Jun 07 2017 Jitka Plesnikova <[email protected]> - 1.002-34
- Perl 5.26 rebuild
@@ -168,7 +171,7 @@ find %{buildroot} -type f -name '*.bs' -empty -exec rm -f
{} ';'
- bump
* Thu Oct 05 2006 Christian Iseli <[email protected]> 1.002-6
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
* Tue Sep 19 2006 Chris Weyl <[email protected]> 1.002-5
- taking co-maintainership post-non-massrebuild
--
cgit v1.1
https://src.fedoraproject.org/cgit/perl-Gnome2-Canvas.git/commit/?h=master&id=88a1c14612ee86f9eba8ea9cd43a25c5a7cd7e30
_______________________________________________
perl-devel mailing list -- [email protected]
To unsubscribe send an email to [email protected]
