Skip to content

Commit

Permalink
Perl fix 16 (#10301)
Browse files Browse the repository at this point in the history
* bump perl-excel-writer-xlsx

* Bump perl-archive-zip

* Unblacklist
  • Loading branch information
druvus authored Aug 7, 2018
1 parent b197c22 commit f908b22
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 53 deletions.
2 changes: 0 additions & 2 deletions build-fail-blacklist
Original file line number Diff line number Diff line change
Expand Up @@ -2125,7 +2125,6 @@ recipes/perl-file-homedir
recipes/perl-extutils-cppguess
recipes/perl-term-progressbar
recipes/perl-archive-extract
recipes/perl-archive-zip
recipes/perl-bit-vector
recipes/perl-data-uuid
recipes/perl-encode-locale
Expand Down Expand Up @@ -2221,7 +2220,6 @@ recipes/perl-moosex-types-path-class
recipes/perl-template-toolkit
recipes/perl-test-output
recipes/carna
recipes/perl-excel-writer-xlsx
recipes/perl-json-create
recipes/perl-moosex-app/1.39
recipes/perl-moosex-nonmoose
Expand Down
13 changes: 4 additions & 9 deletions recipes/perl-archive-zip/build.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
#!/bin/bash

# If it has Build.PL use that, otherwise use Makefile.PL
cpanm --installdeps .
if [ -f Build.PL ]; then
perl Build.PL
./Build
./Build test
perl ./Build
perl ./Build test
# Make sure this goes in site
./Build install --installdirs site
perl ./Build install --installdirs site
elif [ -f Makefile.PL ]; then
# Make sure this goes in site
perl Makefile.PL INSTALLDIRS=site
Expand All @@ -19,8 +18,4 @@ else
exit 1
fi

# Add more build steps here, if they are necessary.

# See
# http://docs.continuum.io/conda/build.html
# for a list of environment variables that are set during the build process.
chmod 755 ${PREFIX}/bin/crc32
48 changes: 38 additions & 10 deletions recipes/perl-archive-zip/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,23 +1,51 @@
{% set name = "perl-archive-zip" %}
{% set version = "1.60" %}
{% set sha256 = "eac75b05f308e860aa860c3094aa4e7915d3d31080e953e49bc9c38130f5c20b" %}

package:
name: perl-archive-zip
version: '1.55'
name: {{ name }}
version: {{ version }}

source:
url: https://cpan.metacpan.org/authors/id/P/PH/PHRED/Archive-Zip-1.55.tar.gz
sha256: ce36f93a636c0041503cdfedad67ca087f84101e71ab3415d172150ad5d23707
url: https://cpan.metacpan.org/authors/id/P/PH/PHRED/Archive-Zip-1.60.tar.gz
sha256: {{ sha256 }}

build:
number: 4
number: 0

requirements:
host:
- perl
- perl-module-build
- perl-app-cpanminus
- perl-file-path
- perl-extutils-makemaker
- perl-time-local
- perl-test-mockmodule
- perl-compress-raw-zlib
- perl-file-temp

run:
- perl
- perl-file-path
- perl-compress-raw-zlib
- perl-time-local
- perl-file-temp

test:
imports:
- Archive::Zip
- Archive::Zip::Archive
- Archive::Zip::BufferedFileHandle
- Archive::Zip::DirectoryMember
- Archive::Zip::FileMember
- Archive::Zip::Member
- Archive::Zip::MemberRead
- Archive::Zip::MockFileHandle
- Archive::Zip::NewFileMember
- Archive::Zip::StringMember
- Archive::Zip::Tree
- Archive::Zip::ZipFileMember

about:
home: https://metacpan.org/pod/Archive::Zip
license: Perl
summary: Provide an interface to ZIP archive files
home: http://metacpan.org/pod/Archive::Zip
license: perl_5
summary: 'Provide an interface to ZIP archive files.'
12 changes: 4 additions & 8 deletions recipes/perl-excel-writer-xlsx/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
# If it has Build.PL use that, otherwise use Makefile.PL
if [ -f Build.PL ]; then
perl Build.PL
./Build
./Build test
perl ./Build
perl ./Build test
# Make sure this goes in site
./Build install --installdirs site
perl ./Build install --installdirs site
elif [ -f Makefile.PL ]; then
# Make sure this goes in site
perl Makefile.PL INSTALLDIRS=site
Expand All @@ -18,8 +18,4 @@ else
exit 1
fi

# Add more build steps here, if they are necessary.

# See
# http://docs.continuum.io/conda/build.html
# for a list of environment variables that are set during the build process.
chmod 755 ${PREFIX}/bin/extract_vba
36 changes: 12 additions & 24 deletions recipes/perl-excel-writer-xlsx/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,32 +1,31 @@
package:
name: perl-excel-writer-xlsx
version: "0.95"
{% set name = "perl-excel-writer-xlsx" %}
{% set version = "0.98" %}
{% set sha256 = "fe7eed92593ee5f2d8a7da72c36f552f6f78672f8b7e32f6df4bb788af95b4c2" %}

build:
number: 1
package:
name: {{ name }}
version: {{ version }}

source:
url: https://cpan.metacpan.org/authors/id/J/JM/JMCNAMARA/Excel-Writer-XLSX-0.95.tar.gz
md5: 377094b38e541afdbb21a02a7d433ac3
# patches:
# List any patch files here
# - fix.patch
url: https://cpan.metacpan.org/authors/id/J/JM/JMCNAMARA/Excel-Writer-XLSX-0.98.tar.gz
sha256: {{ sha256 }}

build:
number: 1
number: 0

requirements:
host:
- perl
- perl-extutils-makemaker
- perl-archive-zip
- perl-file-temp
- perl-extutils-makemaker

run:
- perl
- perl-file-temp
- perl-archive-zip

test:
# Perl 'use' tests
imports:
- Excel::Writer::XLSX
- Excel::Writer::XLSX::Chart
Expand Down Expand Up @@ -61,18 +60,7 @@ test:
- Excel::Writer::XLSX::Workbook
- Excel::Writer::XLSX::Worksheet

# You can also put a file called run_test.pl (or run_test.py) in the recipe
# that will be run at test time.

# requires:
# Put any additional test requirements here. For example
# - nose

about:
home: http://jmcnamara.github.com/excel-writer-xlsx/
license: perl_5
summary: 'Create a new file in the Excel 2007+ XLSX format.'

# See
# http://docs.continuum.io/conda/build.html for
# more information about meta.yaml

0 comments on commit f908b22

Please sign in to comment.