Accepting request 726726 from home:pmonrealgonzalez:branches:devel:languages:perl
- Removed patch fixed upstream: * perl-Glib-1.328-glib2.59-comment-linebreaks.patch - updated to 1.3291 see /usr/share/doc/packages/perl-Glib/ChangeLog.pre-git - Add patch and glib2-devel dependency to cpanspec.yml - updated to 1.329 see /usr/share/doc/packages/perl-Glib/ChangeLog.pre-git OBS-URL: https://build.opensuse.org/request/show/726726 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-Glib?expand=0&rev=60
This commit is contained in:
parent
8b90430caa
commit
af1f7d9499
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:459cc2add7aaa90aa56675582a93989158ed38caa1e10628733ccc690e0464d5
|
||||
size 301694
|
3
Glib-1.3291.tar.gz
Normal file
3
Glib-1.3291.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b983cdd87b9d3b5537edb110842313356237ab01b020b5f547f86f7e902b1f72
|
||||
size 301944
|
@ -8,10 +8,9 @@
|
||||
# - source1
|
||||
# - source2
|
||||
# patches:
|
||||
# foo.patch: -p1
|
||||
# bar.patch:
|
||||
#preamble: |-
|
||||
# BuildRequires: gcc-c++
|
||||
# perl-Glib-1.328-glib2.59-comment-linebreaks.patch: -p1
|
||||
preamble: |-
|
||||
BuildRequires: glib2-devel >= 2.0.0
|
||||
#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
|
||||
|
@ -1,41 +0,0 @@
|
||||
diff -up Glib-1.328/t/g.t.comment-linebreaks Glib-1.328/t/g.t
|
||||
--- Glib-1.328/t/g.t.comment-linebreaks 2012-01-06 01:26:40.000000000 -0500
|
||||
+++ Glib-1.328/t/g.t 2019-01-04 14:35:05.796603043 -0500
|
||||
@@ -84,7 +84,11 @@ SKIP: {
|
||||
eq_array (\@bools, [FALSE, TRUE, FALSE]);
|
||||
|
||||
ok ($key_file->has_group('locales'));
|
||||
- is ($key_file->get_comment('locales', 'mystring'), "some string\n");
|
||||
+ if (Glib->CHECK_VERSION (2, 59, 0)) {
|
||||
+ is ($key_file->get_comment('locales', 'mystring'), "some string");
|
||||
+ } else {
|
||||
+ is ($key_file->get_comment('locales', 'mystring'), "some string\n");
|
||||
+ }
|
||||
is ($key_file->get_string('locales', 'mystring'), 'Good morning');
|
||||
is ($key_file->get_locale_string('locales', 'mystring', 'it'), 'Buongiorno');
|
||||
|
||||
@@ -94,11 +98,21 @@ SKIP: {
|
||||
$key_file->set_string_list('listsection', 'stringlist', 'one', 'two', 'three');
|
||||
$key_file->set_locale_string('locales', 'mystring', 'en', 'one');
|
||||
$key_file->set_comment('locales', 'mystring', 'comment');
|
||||
- is ($key_file->get_comment('locales', 'mystring'), "comment\n");
|
||||
- $key_file->set_comment('locales', undef, "another comment\n");
|
||||
- is ($key_file->get_comment('locales', undef), "#another comment\n#");
|
||||
+ if (Glib->CHECK_VERSION (2, 59, 0)) {
|
||||
+ is ($key_file->get_comment('locales', 'mystring'), "comment");
|
||||
+ $key_file->set_comment('locales', undef, "another comment");
|
||||
+ is ($key_file->get_comment('locales', undef), "#another comment");
|
||||
+ } else {
|
||||
+ is ($key_file->get_comment('locales', 'mystring'), "comment\n");
|
||||
+ $key_file->set_comment('locales', undef, "another comment\n");
|
||||
+ is ($key_file->get_comment('locales', undef), "#another comment\n#");
|
||||
+ }
|
||||
$key_file->set_comment(undef, undef, 'one comment more');
|
||||
- is ($key_file->get_comment(undef, undef), "one comment more\n");
|
||||
+ if (Glib->CHECK_VERSION (2, 59, 0)) {
|
||||
+ is ($key_file->get_comment(undef, undef), "one comment more");
|
||||
+ } else {
|
||||
+ is ($key_file->get_comment(undef, undef), "one comment more\n");
|
||||
+ }
|
||||
$key_file->set_boolean($start_group, 'boolkey', FALSE);
|
||||
$key_file->set_value($start_group, 'boolkey', '0');
|
@ -1,3 +1,26 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 28 09:40:45 UTC 2019 - Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
|
||||
|
||||
- Removed patch fixed upstream:
|
||||
* perl-Glib-1.328-glib2.59-comment-linebreaks.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 28 05:12:58 UTC 2019 - Stephan Kulow <coolo@suse.com>
|
||||
|
||||
- updated to 1.3291
|
||||
see /usr/share/doc/packages/perl-Glib/ChangeLog.pre-git
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 27 21:50:35 CEST 2019 - Tina Mueller <tina.mueller@suse.com>
|
||||
|
||||
- Add patch and glib2-devel dependency to cpanspec.yml
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 3 06:59:51 UTC 2019 - Stephan Kulow <coolo@suse.com>
|
||||
|
||||
- updated to 1.329
|
||||
see /usr/share/doc/packages/perl-Glib/ChangeLog.pre-git
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 15 11:20:02 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package perl-Glib
|
||||
#
|
||||
# Copyright (c) 2018 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
|
||||
@ -17,26 +17,26 @@
|
||||
|
||||
|
||||
Name: perl-Glib
|
||||
Version: 1.328
|
||||
Version: 1.3291
|
||||
Release: 0
|
||||
%define cpan_name Glib
|
||||
Summary: Perl wrappers for the GLib utility and Object libraries
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/Perl
|
||||
Url: https://metacpan.org/pod/%{cpan_name}
|
||||
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
|
||||
Patch0: perl-Glib-1.328-glib2.59-comment-linebreaks.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: glib2-devel >= 2.0.0
|
||||
BuildRequires: perl
|
||||
BuildRequires: perl-macros
|
||||
BuildRequires: perl(ExtUtils::Depends) >= 0.300
|
||||
BuildRequires: perl(ExtUtils::PkgConfig) >= 1.000000
|
||||
Requires: perl(ExtUtils::Depends) >= 0.300
|
||||
Requires: perl(ExtUtils::PkgConfig) >= 1.000000
|
||||
Provides: %{name}-devel = %{version}
|
||||
%{perl_requires}
|
||||
# MANUAL BEGIN
|
||||
BuildRequires: glib2-devel >= 2.0.0
|
||||
# MANUAL END
|
||||
|
||||
%description
|
||||
This wrapper attempts to provide a perlish interface while remaining as
|
||||
@ -48,14 +48,13 @@ sorts of good information.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{cpan_name}-%{version}
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
|
||||
%{__make} %{?_smp_mflags}
|
||||
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%check
|
||||
%{__make} test
|
||||
make test
|
||||
|
||||
%install
|
||||
%perl_make_install
|
||||
|
Loading…
Reference in New Issue
Block a user