From 051daca10dacab773ebf6796efccb0310309e587d3a18f8ea78c9dda955c97c4 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 18 Sep 2019 07:39:59 +0000 Subject: [PATCH] Accepting request 731337 from devel:languages:perl:autoupdate This overrides https://build.opensuse.org/request/show/729035 - Override description in cpanspec - Remove fix-pangocairo_libs.patch (not needed anymore) Add custom dependencies and test to cpanspec.yml - updated to 1.227 see /usr/share/doc/packages/perl-Pango/ChangeLog.pre-git OBS-URL: https://build.opensuse.org/request/show/731337 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-Pango?expand=0&rev=23 --- Pango-1.226.tar.gz | 3 -- Pango-1.227.tar.gz | 3 ++ cpanspec.yml | 65 +++++++++++++++++++++++++++++++++++++++ fix-pangocairo_libs.patch | 17 ---------- perl-Pango.changes | 17 ++++++++++ perl-Pango.spec | 57 ++++++++++++++-------------------- 6 files changed, 108 insertions(+), 54 deletions(-) delete mode 100644 Pango-1.226.tar.gz create mode 100644 Pango-1.227.tar.gz create mode 100644 cpanspec.yml delete mode 100644 fix-pangocairo_libs.patch diff --git a/Pango-1.226.tar.gz b/Pango-1.226.tar.gz deleted file mode 100644 index 6bf7097..0000000 --- a/Pango-1.226.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f7039bf79bca027009fdc2b0472ecf2d2e0e30227fb92c5ecd1c867dae99264 -size 46333 diff --git a/Pango-1.227.tar.gz b/Pango-1.227.tar.gz new file mode 100644 index 0000000..680a03e --- /dev/null +++ b/Pango-1.227.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34b0a422df3fecd7597587048552457d48ae764c43bbefd2a9d62ceb6c8bac71 +size 46457 diff --git a/cpanspec.yml b/cpanspec.yml new file mode 100644 index 0000000..c57685a --- /dev/null +++ b/cpanspec.yml @@ -0,0 +1,65 @@ +--- +#description_paragraphs: 3 +description: |- + Pango is a library for laying out and rendering text, with an emphasis on + internationalization. Pango can be used anywhere that text layout is + needed, but using Pango in conjunction with L and/or L + provides a complete solution with high quality text handling and graphics + rendering. + + Dynamically loaded modules handle text layout for particular + combinations of script and font backend. Pango provides a wide selection + of modules, including modules for Hebrew, Arabic, Hangul, Thai, and a + number of Indic scripts. Virtually all of the world's major scripts are + supported. + + In addition to the low level layout rendering routines, Pango includes + Pango::Layout, a high level driver for laying out entire blocks of text, + and routines to assist in editing internationalized text. +#summary: override summary from CPAN +#no_testing: broken upstream +#sources: +# - source1 +# - source2 +#patches: +# foo.patch: -p1 +# bar.patch: +preamble: |- + BuildRequires: xorg-x11 + BuildRequires: xorg-x11-Xvfb + BuildRequires: xorg-x11-server + BuildRequires: pkgconfig(cairo) + BuildRequires: pkgconfig(pango) + %if %{with Gtk2} + BuildRequires: perl(Gtk2) >= 1.220 + %endif +#post_prep: |- +# hunspell=`pkg-config --libs hunspell | sed -e 's,-l,,; s, *,,g'` +# sed -i -e "s,hunspell-X,$hunspell," t/00-prereq.t Makefile.PL +#post_build: |- +# rm unused.files +#post_install: |- +# sed on %{name}.files +#license: SUSE-NonFree +#skip_noarch: 1 +#custom_build: |- +#./Build build flags=%{?_smp_mflags} --myflag +custom_test: |- + %if %{with Gtk2} + #### FIXME + #### failing with: + ## (EE) XKB: Couldn't open rules file /usr/share/X11/xkb/rules/base + ## XKB: Failed to compile keymap + ## Keyboard initialization failed. This could be a missing or incorrect setup of xkeyboard-config + # + Xvfb -fp /usr/share/fonts/misc -extension RANDR :95 & + trap "kill $! || true" EXIT + sleep 5 + DISPLAY=:95 make test + %else + make test + %endif + + +#startserver && make test +#ignore_requires: Bizarre::Module diff --git a/fix-pangocairo_libs.patch b/fix-pangocairo_libs.patch deleted file mode 100644 index d5999c4..0000000 --- a/fix-pangocairo_libs.patch +++ /dev/null @@ -1,17 +0,0 @@ -From https://raw.githubusercontent.com/voidlinux/void-packages/087cebfbb367f0f20ab32a6b8cdd2653698240d7/srcpkgs/perl-Pango/patches/fix-pangocairo_libs.patch -Upstream: https://rt.cpan.org/Public/Bug/Display.html?id=111117 -When constructing the $libs variable, there is a blank missing -before the -lpangocairo-1.0 coming from the pangocairo.pc through -pkg-config. Inserting an extra blank before the pkg-config -result fixes the issue. - ---- Makefile.PL 2014-02-19 05:13:50.000000000 +0100 -+++ Makefile.PL 2015-10-08 00:47:59.777157391 +0200 -@@ -161,6 +161,7 @@ - if ($have_cairo) { - push @deps, qw/Cairo/; - $inc .= $pangocairo_pkgcfg{cflags}; -+ $libs .= ' '; - $libs .= $pangocairo_pkgcfg{libs}; - } - diff --git a/perl-Pango.changes b/perl-Pango.changes index c317028..d71347b 100644 --- a/perl-Pango.changes +++ b/perl-Pango.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Sep 16 17:35:41 UTC 2019 - Tina Mueller + +- Override description in cpanspec + +------------------------------------------------------------------- +Fri Sep 6 21:01:49 UTC 2019 - Tina Mueller + +- Remove fix-pangocairo_libs.patch (not needed anymore) + Add custom dependencies and test to cpanspec.yml + +------------------------------------------------------------------- +Wed Apr 3 07:21:56 UTC 2019 - Stephan Kulow + +- updated to 1.227 + see /usr/share/doc/packages/perl-Pango/ChangeLog.pre-git + ------------------------------------------------------------------- Tue Jan 12 08:40:50 UTC 2016 - bwiedemann@suse.com diff --git a/perl-Pango.spec b/perl-Pango.spec index 966e15c..ee1d056 100644 --- a/perl-Pango.spec +++ b/perl-Pango.spec @@ -1,7 +1,7 @@ # # spec file for package perl-Pango # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,50 +12,42 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%bcond_with Gtk2 - Name: perl-Pango -Version: 1.226 +Version: 1.227 Release: 0 %define cpan_name Pango -Summary: Pango Perl module -License: LGPL-2.1+ +Summary: Layout and render international text +License: LGPL-2.1-or-later Group: Development/Libraries/Perl -Url: http://search.cpan.org/dist/Pango/ -Source: http://www.cpan.org/authors/id/X/XA/XAOC/%{cpan_name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM fix-pangocairo_libs.patch https://rt.cpan.org/Public/Bug/Display.html?id=111117 -Patch0: fix-pangocairo_libs.patch -# +Url: https://metacpan.org/release/%{cpan_name} +Source0: https://cpan.metacpan.org/authors/id/X/XA/XAOC/%{cpan_name}-%{version}.tar.gz +Source1: cpanspec.yml +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -BuildRequires: update-desktop-files +BuildRequires: perl(Cairo) >= 1.000 +BuildRequires: perl(ExtUtils::Depends) >= 0.300 +BuildRequires: perl(ExtUtils::PkgConfig) >= 1.030000 +BuildRequires: perl(Glib) >= 1.220 +Requires: perl(Cairo) >= 1.000 +Requires: perl(ExtUtils::Depends) >= 0.300 +Requires: perl(ExtUtils::PkgConfig) >= 1.030000 +Requires: perl(Glib) >= 1.220 +%{perl_requires} +# MANUAL BEGIN BuildRequires: xorg-x11 BuildRequires: xorg-x11-Xvfb BuildRequires: xorg-x11-server BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(pango) -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{perl_requires} %if %{with Gtk2} BuildRequires: perl(Gtk2) >= 1.220 %endif -# -BuildRequires: perl(Cairo) >= 1.000 -BuildRequires: perl(ExtUtils::Depends) >= 0.300 -BuildRequires: perl(ExtUtils::MakeMaker) -#BuildRequires: perl(ExtUtils::PkgConfig) >= 1.030 -BuildRequires: perl(ExtUtils::PkgConfig) >= 1.03 -BuildRequires: perl(Glib) >= 1.220 -# -Requires: perl(Cairo) >= 1.000 -Requires: perl(ExtUtils::Depends) >= 0.300 -#Requires: perl(ExtUtils::PkgConfig) >= 1.030 -Requires: perl(ExtUtils::PkgConfig) >= 1.03 -Requires: perl(Glib) >= 1.220 +# MANUAL END %description Pango is a library for laying out and rendering text, with an emphasis on @@ -76,7 +68,6 @@ and routines to assist in editing internationalized text. %prep %setup -q -n %{cpan_name}-%{version} -%patch0 %build perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" @@ -103,11 +94,9 @@ make test %perl_process_packlist %perl_gen_filelist -%clean -rm -rf %{buildroot} - %files -f %{name}.files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog.pre-git doctypes LICENSE maps-1.0 maps-1.10 maps-1.16 maps-1.18 maps-1.4 maps-1.6 maps-1.8 NEWS pango.exports pango.typemap README xs_files-1.0 xs_files-1.10 xs_files-1.16 xs_files-1.6 +%defattr(-,root,root,755) +%doc AUTHORS ChangeLog.pre-git doctypes examples maps-1.0 maps-1.10 maps-1.16 maps-1.18 maps-1.4 maps-1.6 maps-1.8 NEWS pango.exports pango.typemap perl-Pango.doap README xs_files-1.0 xs_files-1.10 xs_files-1.16 xs_files-1.6 +%license LICENSE %changelog