diff --git a/PDL-2.016.tar.gz b/PDL-2.016.tar.gz deleted file mode 100644 index 8c08df3..0000000 --- a/PDL-2.016.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e2512921947a292b0ec8270e5be05687cf2b165547267ccc956ad6158ab21000 -size 2881448 diff --git a/PDL-2.024.tar.gz b/PDL-2.024.tar.gz new file mode 100644 index 0000000..a56d162 --- /dev/null +++ b/PDL-2.024.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9a350574b77c11ebfe33ec5a4f149787c368255fe60861f9da50c977b88e88a +size 2928015 diff --git a/PDL-2.4.11-implicit.diff b/PDL-2.4.11-implicit.diff index 1726cc3..d9dd529 100644 --- a/PDL-2.4.11-implicit.diff +++ b/PDL-2.4.11-implicit.diff @@ -1,10 +1,3 @@ ---- ./Basic/MatrixOps/simq.c.orig 2012-06-11 13:20:25.000000000 +0000 -+++ ./Basic/MatrixOps/simq.c 2012-06-11 13:20:34.000000000 +0000 -@@ -1,3 +1,4 @@ -+#include - /* simq.c - * - * Solution of simultaneous linear equations AX = B --- ./IO/Browser/browse.c.orig 2012-06-11 13:10:46.000000000 +0000 +++ ./IO/Browser/browse.c 2012-06-11 13:12:00.000000000 +0000 @@ -1,5 +1,6 @@ diff --git a/PDL-2.4.7-pdldoc.db.diff b/PDL-2.4.7-pdldoc.db.diff deleted file mode 100644 index 66cf0dc..0000000 --- a/PDL-2.4.7-pdldoc.db.diff +++ /dev/null @@ -1,18 +0,0 @@ -Index: Doc/scantree.pl -=================================================================== ---- Doc/scantree.pl.orig -+++ Doc/scantree.pl -@@ -8,10 +8,13 @@ require PDL; # always needed to pick up - $opt_v = 0; - - getopts('v'); -+$root = shift @ARGV; - $dir = shift @ARGV; - $outdb = shift @ARGV; - $outindex = shift @ARGV; - -+chroot $root; -+ - unless (defined $dir) { - ($dir = $INC{'PDL.pm'}) =~ s/PDL\.pm$//i; - umask 0022; diff --git a/PDL-htmldocs.patch b/PDL-htmldocs.patch deleted file mode 100644 index 93f002d..0000000 --- a/PDL-htmldocs.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: PDL-2.016/Makefile.PL -=================================================================== ---- PDL-2.016.orig/Makefile.PL 2016-05-28 18:45:50.000000000 +0200 -+++ PDL-2.016/Makefile.PL 2016-08-31 17:42:52.186973067 +0200 -@@ -554,7 +554,7 @@ doc_vendor_install :: - $(NOECHO) $(ECHO) "doc_vendor_install: Building PDL documentation database ..." - $(NOECHO) $(PERLRUNINST) Doc$(DFSEP)scantree.pl "$(INSTALLVENDORARCH)" - %HTML% $(NOECHO) $(ECHO) "doc_vendor_install: Building PDL documentation web pages ..." --%HTML% $(NOECHO) $(PERL) Doc$(DFSEP)mkhtmldoc.pl "$(INSTALLVENDORARCH)$(DFSEP)PDL" -+%HTML% $(NOECHO) $(PERL) Doc$(DFSEP)mkhtmldoc.pl "$(DESTINSTALLVENDORARCH)$(DFSEP)PDL" - - doc_perl_install :: - $(NOECHO) $(ECHO) "doc_perl_install: Building PDL documentation database ..." -Index: PDL-2.016/Doc/mkhtmldoc.pl -=================================================================== ---- PDL-2.016.orig/Doc/mkhtmldoc.pl 2015-08-12 03:44:20.000000000 +0200 -+++ PDL-2.016/Doc/mkhtmldoc.pl 2016-08-31 17:41:41.509889410 +0200 -@@ -153,6 +153,7 @@ chdir $back; - - print "Making HTML docs...\n\n"; - -+$verbose = 1; - print "Put HTML $htmldir\n" if $verbose; - print "Scanning $startdir ... \n\n" if $verbose; - $sub = sub { diff --git a/perl-PDL.changes b/perl-PDL.changes index 18ae7c1..fce424b 100644 --- a/perl-PDL.changes +++ b/perl-PDL.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Oct 15 17:15:40 UTC 2020 - Dirk Stoecker + +- Update spec file to standard perl builds as much as possible +- updated to 2.024 + see /usr/share/doc/packages/perl-PDL/Changes +- drop patches: PDL-2.4.7-pdldoc.db.diff, PDL-htmldocs.patch +- rebase patch: PDL-2.4.11-implicit.diff + ------------------------------------------------------------------- Wed Aug 31 11:57:24 UTC 2016 - vcizek@suse.com diff --git a/perl-PDL.spec b/perl-PDL.spec index 1ef3783..bb3bdb3 100644 --- a/perl-PDL.spec +++ b/perl-PDL.spec @@ -1,7 +1,7 @@ # # spec file for package perl-PDL # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,52 +12,76 @@ # 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/ # Name: perl-PDL -%define cpan_name PDL -Version: 2.016 +Version: 2.024 Release: 0 +%define cpan_name PDL Summary: PDL - perlDL module extension for perl -License: BSD-3-Clause and (GPL-1.0+ or Artistic-1.0) +License: BSD-3-Clause AND (Artistic-1.0 OR GPL-1.0-or-later) Group: Development/Libraries/Perl -Url: http://cpan.org/modules/by-module/PDL/ -Source: http://www.cpan.org/authors/id/C/CH/CHM/%{cpan_name}-%{version}.tar.gz +URL: https://metacpan.org/release/%{cpan_name} +Source0: https://cpan.metacpan.org/authors/id/E/ET/ETJ/%{cpan_name}-%{version}.tar.gz Source1: cpanspec.yml Patch0: PDL-2.4.7.diff Patch1: PDL-2.4.7-return.diff -Patch2: PDL-2.4.7-pdldoc.db.diff Patch4: PDL-2.4.7-qsortvec.diff Patch6: PDL-2.4.7-strncat.diff Patch7: PDL-2.4.11-implicit.diff -Patch9: PDL-htmldocs.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: f2c BuildRequires: fftw3-devel BuildRequires: freeglut-devel +BuildRequires: gcc-c++ BuildRequires: gcc-fortran BuildRequires: gsl-devel BuildRequires: ncurses-devel BuildRequires: perl -BuildRequires: perl-Astro-FITS-Header -BuildRequires: perl-Convert-UU -BuildRequires: perl-Curses -BuildRequires: perl-Devel-CheckLib -BuildRequires: perl-ExtUtils-F77 -BuildRequires: perl-Inline -BuildRequires: perl-Inline-C -BuildRequires: perl-Module-Compile -BuildRequires: perl-Test-Deep -BuildRequires: perl-Test-Exception -BuildRequires: perl-Test-Warn BuildRequires: perl-macros - BuildRequires: xorg-x11 BuildRequires: xorg-x11-Xvfb +BuildRequires: perl(Astro::FITS::Header) +BuildRequires: perl(CPAN::Meta) >= 2.120900 +BuildRequires: perl(Carp) >= 1.2 +BuildRequires: perl(Convert::UU) +BuildRequires: perl(Devel::CheckLib) >= 1.01 +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.56 +BuildRequires: perl(ExtUtils::ParseXS) >= 3.01 +BuildRequires: perl(File::Map) >= 0.57 +BuildRequires: perl(Filter::Simple) >= 0.88 +BuildRequires: perl(IPC::Cmd) >= 0.72 +BuildRequires: perl(Inline) >= 0.83 +BuildRequires: perl(Inline::C) >= 0.62 +BuildRequires: perl(List::MoreUtils) +BuildRequires: perl(Module::Compile) >= 0.23 +BuildRequires: perl(OpenGL) >= 0.67 +BuildRequires: perl(Pod::Parser) +BuildRequires: perl(Pod::Select) +BuildRequires: perl(Term::ReadKey) >= 2.34 +BuildRequires: perl(Test::Deep) +BuildRequires: perl(Test::Exception) +BuildRequires: perl(Test::Warn) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xi) +BuildRequires: pkgconfig(xmu) Provides: PDL -Provides: perl_pdl -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: perl(Astro::FITS::Header) +Requires: perl(Convert::UU) +Requires: perl(ExtUtils::MakeMaker) >= 6.56 +Requires: perl(File::Map) >= 0.57 +Requires: perl(Filter::Simple) >= 0.88 +Requires: perl(Inline) >= 0.83 +Requires: perl(Inline::C) >= 0.62 +Requires: perl(List::MoreUtils) +Requires: perl(Module::Compile) >= 0.23 +Requires: perl(OpenGL) >= 0.6702 +Requires: perl(Pod::Parser) +Requires: perl(Pod::Select) +Requires: perl(Term::ReadKey) >= 2.34 +%{perl_requires} %description The perlDL project aims to turn perl into an efficient numerical @@ -66,18 +90,17 @@ the ability to compactly store and speedily manipulate the large N-dimensional data sets. %prep -%setup -n PDL-%{version} -q +%setup -q -n %{cpan_name}-%{version} %patch0 %patch1 -%patch2 %patch4 %patch6 %patch7 -%patch9 -p1 +find . -type f ! -path "*/t/*" ! -name "*.pl" ! -path "*/bin/*" ! -path "*/script/*" ! -name "configure" -print0 | xargs -0 chmod 644 %build -perl Makefile.PL -make -j1 CCCDLFLAGS="-fPIC -fno-aggressive-loop-optimizations -DPERL_REENTR_API=1" #to make the tests of srand pass +perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" +make %{?_smp_mflags} CCCDLFLAGS="-fPIC -fno-aggressive-loop-optimizations -DPERL_REENTR_API=1" %check Xvfb :95 & @@ -86,25 +109,19 @@ sleep 5 DISPLAY=:95 make test %install -make DESTDIR=%{buildroot} install_vendor -mv %{buildroot}%{_prefix}/lib/perl5/%{perl_version} %{buildroot}%{_prefix}/lib/perl5/%{perl_version}.tmp -cp -R /usr/lib/perl5/%{perl_version} %{buildroot}%{_prefix}/lib/perl5 -perl -I blib/lib -I blib/arch Doc/scantree.pl %{buildroot}%{perl_vendorarch} -rm -rf %{buildroot}%{_prefix}/lib/perl5/%{perl_version} -mv %{buildroot}%{_prefix}/lib/perl5/%{perl_version}.tmp %{buildroot}%{_prefix}/lib/perl5/%{perl_version} +%perl_make_install %perl_process_packlist -for i in `find %{buildroot}/%{perl_vendorarch}/PDL/HtmlDocs/PDL/ -type f`; do - sed s:%{buildroot}::g < $i > $i.tmp - mv $i.tmp $i -done +rm %{buildroot}/%{perl_vendorarch}/PDL/HtmlDocs/PDL/pod2htmd.tmp mkdir -p %{buildroot}/%{_docdir}/%{name}/PDL/HtmlDocs/PDL/ mv %{buildroot}/%{perl_vendorarch}/PDL/HtmlDocs/PDL/ %{buildroot}/%{_docdir}/%{name}/PDL/HtmlDocs/PDL/ - -%clean +sed -i "s/env //" %{buildroot}%{_bindir}/pdl2 +chmod -x %{buildroot}%{perl_vendorarch}/PDL/Doc/Config.pm %files -%defattr(-,root,root) -%doc Known_problems TODO README COPYING Bugs.pod DEVELOPMENT Changes DEPENDENCIES MANIFEST Example +%defattr(-,root,root,755) +%doc Changes Changes_CVS Bugs.pod DEPENDENCIES DEVELOPMENT INTERNATIONALIZATION README TODO Example +%license COPYING +%{_docdir}/%{name} %doc %{_mandir}/man?/* %{perl_vendorarch}/auto/PDL %{perl_vendorarch}/PDL