diff --git a/.gitignore b/.gitignore index 256abe3..00e87e9 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /Excel-Writer-XLSX-1.07.tar.gz /Excel-Writer-XLSX-1.09.tar.gz /Excel-Writer-XLSX-1.11.tar.gz +/Excel-Writer-XLSX-1.12.tar.gz diff --git a/Excel-Writer-XLSX-1.11-Adjust-make-mydocs-invocation-to-Perl-without-dot-in.patch b/Excel-Writer-XLSX-1.11-Adjust-make-mydocs-invocation-to-Perl-without-dot-in.patch deleted file mode 100644 index d510d9e..0000000 --- a/Excel-Writer-XLSX-1.11-Adjust-make-mydocs-invocation-to-Perl-without-dot-in.patch +++ /dev/null @@ -1,46 +0,0 @@ -From b508e348ec054df0454fd46b3930317a1105de22 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Wed, 26 Apr 2023 14:02:41 +0200 -Subject: [PATCH] Adjust make mydocs invocation to Perl without dot in @INC -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -After perl lost "." from @INC, "make mydocs" does not work: - -$ make mydocs -perl -Mblib examples/gen_examples_pod.pl examples > lib/Excel/Writer/XLSX/Examples.pm -Can't locate examples/../lib/Excel/Writer/XLSX.pm in @INC (@INC contains: /home/test/fedora/perl-Excel-Writer-XLSX/Excel-Writer-XLSX-1.11/blib/arch /home/test/fedora/perl-Excel-Writer-XLSX/Excel-Writer-XLSX-1.11/blib/lib /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at examples/gen_examples_pod.pl line 30. -make: *** [Makefile:1096: mydocs] Error 2 - -But running "make mydocs" before "make all" also failed because it -assumed blib has already been created an populated: - -$ make mydocs -perl -Mblib examples/gen_examples_pod.pl examples > lib/Excel/Writer/XLSX/Examples.pm -Cannot find blib even in /home/test/fedora/perl-Excel-Writer-XLSX/Excel-Writer-XLSX-1.11/../../../../.. -BEGIN failed--compilation aborted. - -This patch fixes both these issues. - -Signed-off-by: Petr Písař ---- - Makefile.PL | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.PL b/Makefile.PL -index fbe5be3b..50a1eba5 100644 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -50,7 +50,7 @@ WriteMakefile(%params); - # - sub MY::postamble { - "mydocs:\n" -- . "\tperl -Mblib examples/gen_examples_pod.pl examples " -+ . "\tperl -Mlib=lib examples/gen_examples_pod.pl ./examples " - . "> lib/Excel/Writer/XLSX/Examples.pm\n\n" - . "tags:\n" - . "\trm -f TAGS\n" --- -2.40.0 - diff --git a/license_clarification b/license_clarification deleted file mode 100644 index 558c78d..0000000 --- a/license_clarification +++ /dev/null @@ -1,143 +0,0 @@ -From noreply@github.com Wed Apr 26 21:34:13 2023 -Delivered-To: ppisar@gapps.redhat.com -Received: by 2002:a5d:4904:0:0:0:0:0 with SMTP id x4csp400013wrq; - Wed, 26 Apr 2023 12:34:13 -0700 (PDT) -X-Google-Smtp-Source: AKy350Z6GJ1cSCy65tavZ3idE/JBxgUnrio0KHiBzA9tt8mnfxRG51LNEGhL48pBOZZkX8xreF31 -X-Received: by 2002:ac8:5781:0:b0:3ef:3ca6:c760 with SMTP id v1-20020ac85781000000b003ef3ca6c760mr38960306qta.18.1682537653264; - Wed, 26 Apr 2023 12:34:13 -0700 (PDT) -ARC-Seal: i=1; a=rsa-sha256; t=1682537653; cv=none; - d=google.com; s=arc-20160816; - b=otXJi8DVYSF9JaSbYdxaa364X8m7rbUy7MQcfK0vp1geCWGd4eU2FjvFnEKZLztMe9 - ocUIFAp728NTr9cqAtA8VnppqvVhv6ZdxFup5NVkf30ooHW5sQICiTnib9ToMr0dIFtN - AUE5rxREO2qEiSZvH77Rsv9fmt814mM9fI5UMlKaU8zw6NHSb2o8LYkOZ5X3OUo60fUH - e76/W01Li6tWe32WAAQayExgjCXCBYXLatnxTP+7xYIO9G8sKNBTD7+Zxj18cbDK9tnz - YDY8maqm81MA8Zura0aziLEKOPC72nXoNH1Ocw9l5N4Q4x0/Z3QlXRXwarD1UufEOWYK - Ttgg== -ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; - h=list-unsubscribe:list-post:list-archive:list-id:precedence - :mime-version:subject:references:in-reply-to:message-id:cc:to - :reply-to:from:date:delivered-to; - bh=YFmYjgD+C3QNYq6uYwuB1eVHxGE2mfj4iwIw40XijLg=; - b=bqAQf/bTdCUtvDx3mjOzMiL2Zp3hXAbJmCBDtybuzpMgrgt3xPyudG7abA3UOsbQxw - 1IZKKj7cbEyVqzzwD8aG06gTJUaeeDDmeiwfMOjhz4azkZmz8tnFOWjGxmm+rGdWaupj - Nd1Kl9bBruY6A8WR26gLqrxQhMeXrhNMl0MyAjH34gbmzQnwOYmV0TI9C5qBgp+fWZKe - uNcej3G9lKp4KYv9TaRjH0DmmrDZvLTMzuYO84BccG/wBROGTNILsM+GKBbNNh7Fx35F - g5Yt55NBQvRAH43IfJaD29xT7SdEWQJ7TVhjV35C2eWgF297F4Jsvt1UGB5zyHImaWhp - qTCg== -ARC-Authentication-Results: i=1; mx.google.com; - spf=pass (google.com: domain of noreply@github.com designates 192.30.252.201 as permitted sender) smtp.mailfrom=noreply@github.com -Return-Path: -Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com. [207.211.31.120]) - by mx.google.com with ESMTPS id w22-20020ac87e96000000b003bfc28e4157si9714072qtj.149.2023.04.26.12.34.12 - for - (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); - Wed, 26 Apr 2023 12:34:13 -0700 (PDT) -Received-SPF: pass (google.com: domain of noreply@github.com designates 192.30.252.201 as permitted sender) client-ip=192.30.252.201; -Authentication-Results: mx.google.com; - spf=pass (google.com: domain of noreply@github.com designates 192.30.252.201 as permitted sender) smtp.mailfrom=noreply@github.com -Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com - [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS - (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id - us-mta-423-LY79AJl_NPatiTrXKAraRQ-1; Wed, 26 Apr 2023 15:34:10 -0400 -X-MC-Unique: LY79AJl_NPatiTrXKAraRQ-1 -Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) - (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) - (No client certificate requested) - by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 201272A59556 - for ; Wed, 26 Apr 2023 19:34:10 +0000 (UTC) -Received: by smtp.corp.redhat.com (Postfix) - id 1D8242027046; Wed, 26 Apr 2023 19:34:10 +0000 (UTC) -Delivered-To: ppisar@redhat.com -Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) - by smtp.corp.redhat.com (Postfix) with ESMTPS id 159AA2027043 - for ; Wed, 26 Apr 2023 19:34:10 +0000 (UTC) -Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) - (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) - (No client certificate requested) - by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EED4985A5B1 - for ; Wed, 26 Apr 2023 19:34:09 +0000 (UTC) -Received: from out-18.smtp.github.com (out-18.smtp.github.com - [192.30.252.201]) by relay.mimecast.com with ESMTP with STARTTLS - (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id - us-mta-658-vXT5lhTYNGKD4MPit1PwEg-1; Wed, 26 Apr 2023 15:34:06 -0400 -X-MC-Unique: vXT5lhTYNGKD4MPit1PwEg-1 -Received: from github-lowworker-3877b57.ash1-iad.github.net (github-lowworker-3877b57.ash1-iad.github.net [10.56.216.25]) - by smtp.github.com (Postfix) with ESMTP id 8934D34020E - for ; Wed, 26 Apr 2023 12:34:06 -0700 (PDT) -Date: Wed, 26 Apr 2023 12:34:06 -0700 -From: John McNamara -Reply-To: jmcnamara/excel-writer-xlsx -To: jmcnamara/excel-writer-xlsx -Cc: Petr Pisar , - Author -Message-ID: -In-Reply-To: -References: -Subject: Re: [jmcnamara/excel-writer-xlsx] What's the license of this project? - (Issue #285) -Mime-Version: 1.0 -Precedence: list -X-GitHub-Sender: jmcnamara -X-GitHub-Recipient: ppisar -X-GitHub-Reason: author -List-ID: jmcnamara/excel-writer-xlsx -List-Archive: https://github.com/jmcnamara/excel-writer-xlsx -List-Post: -List-Unsubscribe: , - -X-Auto-Response-Suppress: All -X-GitHub-Recipient-Address: ppisar@redhat.com -X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition;Similar Internal Domain=false;Similar Monitored External Domain=false;Custom External Domain=false;Mimecast External Domain=false;Newly Observed Domain=false;Internal User Name=false;Custom Display Name List=false;Reply-to Address Mismatch=false;Targeted Threat Dictionary=false;Mimecast Threat Dictionary=false;Custom Threat Dictionary=false -X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 -X-Mimecast-Spam-Score: 1 -X-Mimecast-Originator: github.com -Content-Type: multipart/alternative; - boundary="--==_mimepart_64497cae79fcc_63a1d020935bc"; - charset=UTF-8 -Status: RO -Content-Length: 2409 -Lines: 42 - -----==_mimepart_64497cae79fcc_63a1d020935bc -Content-Type: text/plain; - charset=UTF-8 -Content-Transfer-Encoding: 7bit - -Thanks for pointing this out. The intention is that license is the same as perl so "Artistic License" or "GPL 1.0 or Later". I'll clean this up and clarify. I'll add a SPDX header as well. - --- -Reply to this email directly or view it on GitHub: -https://github.com/jmcnamara/excel-writer-xlsx/issues/285#issuecomment-1523940402 -You are receiving this because you authored the thread. - -Message ID: -----==_mimepart_64497cae79fcc_63a1d020935bc -Content-Type: text/html; - charset=UTF-8 -Content-Transfer-Encoding: 7bit - -

-

Thanks for pointing this out. The intention is that license is the same as perl so "Artistic License" or "GPL 1.0 or Later". I'll clean this up and clarify. I'll add a SPDX header as well.

- -

—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you authored the thread.Message ID: <jmcnamara/excel-writer-xlsx/issues/285/1523940402@github.com>

- -----==_mimepart_64497cae79fcc_63a1d020935bc-- - - diff --git a/perl-Excel-Writer-XLSX.spec b/perl-Excel-Writer-XLSX.spec index 8b0b735..d71bada 100644 --- a/perl-Excel-Writer-XLSX.spec +++ b/perl-Excel-Writer-XLSX.spec @@ -1,22 +1,12 @@ Name: perl-Excel-Writer-XLSX -Version: 1.11 -Release: 3%{?dist} +Version: 1.12 +Release: 1%{?dist} Summary: Create a new file in the Excel 2007+ XLSX format -# lib/Excel/Writer/XLSX.pm: GPL-1.0-or-later OR Artistic-1.0-Perl -# (An Artistic-1.0-Perl only part in LICENSE POD -# section was a mistake corrected after 1.11 -# ) -# LICENSE: Artistic-1.0-Perl text -# other files which declares a license: GPL-1.0-or-later OR Artistic-1.0-Perl +# LICENSE_Artistic_Perl: Artistic-1.0-Perl text +# LICENSE_GPL_1.0: GPL-1.0 text License: GPL-1.0-or-later OR Artistic-1.0-Perl URL: https://metacpan.org/release/Excel-Writer-XLSX Source0: https://cpan.metacpan.org/authors/id/J/JM/JMCNAMARA/Excel-Writer-XLSX-%{version}.tar.gz -# Grant a license for lib/Excel/Writer/XLSX.pm -# -Source1: license_clarification -# Fix regenerating a documentation with examples, in upstream after 1.11, -# . -Patch0: Excel-Writer-XLSX-1.11-Adjust-make-mydocs-invocation-to-Perl-without-dot-in.patch BuildArch: noarch BuildRequires: coreutils BuildRequires: make @@ -85,7 +75,6 @@ with "%{_libexecdir}/%{name}/test". %prep %autosetup -p1 -n Excel-Writer-XLSX-%{version} -install -m 0644 %{SOURCE1} ./ %build perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 @@ -117,7 +106,7 @@ export HARNESS_OPTIONS=j$(perl -e 'if ($ARGV[0] =~ /.*-j([0-9][0-9]*).*/) {print make test %files -%license LICENSE license_clarification +%license LICENSE_Artistic_Perl LICENSE_GPL_1.0 # ./examples is compiled and packaged as Excel::Writer::XLSX::Examples %doc Changes CONTRIBUTING.md README %dir %{perl_vendorlib}/Excel @@ -133,6 +122,9 @@ make test %{_libexecdir}/%{name} %changelog +* Tue Feb 27 2024 Petr Pisar - 1.12-1 +- 1.12 bump + * Thu Jul 20 2023 Fedora Release Engineering - 1.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index c2fdf41..5b489cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Excel-Writer-XLSX-1.11.tar.gz) = 43563838be7d15a5a19a27bc79ff7a51161d4456011423babc93b50216c24e42db85b993b833f7239008e3e8a3f83048553377a44f4b7abceab97825abe56c78 +SHA512 (Excel-Writer-XLSX-1.12.tar.gz) = c8c353c4e8d975d45aad9ae27d2c01c50f18cda39f19a144d10f68fdcf777a4c67cbf53d49858c3f693518f84409eeb1b9a2f9d6bb0ea365831ba5532b439079