[perl-PDL] Update to 2.4.7 - update to 2.4.7 - add new provides PDL::Graphics::TriD* - add BR perl(version) - r

Marcela Mašláňová mmaslano at fedoraproject.org
Thu Oct 14 13:27:49 UTC 2010 

commit 27f0c9c005f387a2228d38804aa039f6cf9b68c8
Author: Marcela Mašláňová <mmaslano at redhat.com>
Date:   Thu Oct 14 15:25:56 2010 +0200

    Update to 2.4.7
    - update to 2.4.7
    - add new provides PDL::Graphics::TriD*
    - add BR perl(version)
    - remove patches included in new version

 .gitignore                          |    1 +
 perl-PDL-2.4.2-fix_ia64_sdump.patch |   11 -
 perl-PDL-2.4.3-fortran.patch        |   31 --
 perl-PDL-2.4.3-test_hdf.patch       |   55 ---
 perl-PDL-2.4.4-cleanup.patch        |  622 -----------------------------------
 perl-PDL-2.4.7-hdf.patch            |   11 +
 perl-PDL-settings.patch             |   16 +-
 perl-PDL-x86_64.patch               |   24 --
 perl-PDL.spec                       |   39 +--
 sources                             |    2 +-
 10 files changed, 38 insertions(+), 774 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 02ce536..82b4f31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 PDL-2.4.6.tar.gz
+/PDL-2.4.7.tar.gz
diff --git a/perl-PDL-2.4.7-hdf.patch b/perl-PDL-2.4.7-hdf.patch
new file mode 100644
index 0000000..2921ece
--- /dev/null
+++ b/perl-PDL-2.4.7-hdf.patch
@@ -0,0 +1,11 @@
+diff -up PDL-2.4.7/IO/HDF/Makefile.PL.hdf PDL-2.4.7/IO/HDF/Makefile.PL
+--- PDL-2.4.7/IO/HDF/Makefile.PL.hdf	2010-07-24 20:38:35.000000000 +0200
++++ PDL-2.4.7/IO/HDF/Makefile.PL	2010-10-14 12:27:07.039237016 +0200
+@@ -28,6 +28,7 @@ BEGIN
+     # default locations:
+     @HDF_lib_locations = (    
+         '/usr/lib64',
++        '/usr/lib64/hdf',
+         '/usr/local/netcdf/lib',
+         '/usr/local/lib',
+         '/usr/local/lib64',
diff --git a/perl-PDL-settings.patch b/perl-PDL-settings.patch
index 1f63f4b..191f6f4 100644
--- a/perl-PDL-settings.patch
+++ b/perl-PDL-settings.patch
@@ -1,13 +1,9 @@
-2010-01-06  Stepan Kasal  <skasal at redhat.com>
-
-Previously, the patch also set WITH_3D => 1, but we can rely on
-autodetection now, see Changes.
-
---- PDL-2.4.4/perldl.conf.settings	2008-11-12 21:14:03.000000000 -0700
-+++ PDL-2.4.4/perldl.conf	2008-11-13 09:13:50.000000000 -0700
-@@ -217,7 +217,7 @@
- #    about curses to fix it 
- #  - 1 builds, 0 or undef does not build
+diff -up PDL-2.4.7/perldl.conf.settings PDL-2.4.7/perldl.conf
+--- PDL-2.4.7/perldl.conf.settings	2010-08-15 19:38:21.000000000 +0200
++++ PDL-2.4.7/perldl.conf	2010-10-14 14:16:14.681238908 +0200
+@@ -229,7 +229,7 @@
+ # Do we build PDL::IO::Browser?
+ # default -> do not build (module needs to be updated)
  #
 -        WITH_IO_BROWSER => 0,
 +        WITH_IO_BROWSER => 1,
diff --git a/perl-PDL.spec b/perl-PDL.spec
index 46afab3..fde0892 100644
--- a/perl-PDL.spec
+++ b/perl-PDL.spec
@@ -1,6 +1,6 @@
 Name:           perl-PDL
-Version:        2.4.6
-Release:        4%{?dist}
+Version:        2.4.7
+Release:        1%{?dist}
 Summary:        The Perl Data Language
 
 Group:          Development/Libraries
@@ -8,19 +8,15 @@ License:        GPL+ or Artistic
 Url:            http://pdl.perl.org/
 Source0:        http://search.cpan.org/CPAN/authors/id/C/CH/CHM/PDL-%{version}.tar.gz
 Patch0:         perl-PDL-settings.patch
-Patch1:         perl-PDL-2.4.2-fix_ia64_sdump.patch
-Patch2:         perl-PDL-2.4.4-cleanup.patch
-Patch4:         perl-PDL-x86_64.patch
-Patch5:         perl-PDL-2.4.3-hdf.patch
-Patch6:         perl-PDL-2.4.4-Xext.patch
-Patch7:         perl-PDL-2.4.3-fortran.patch
-Patch8:         perl-PDL-2.4.3-test_hdf.patch
+Patch1:         perl-PDL-2.4.7-hdf.patch
+Patch2:         perl-PDL-2.4.4-Xext.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  perl(ExtUtils::F77)
 BuildRequires:  perl(Inline)
 BuildRequires:  perl(OpenGL)
 BuildRequires:  perl(Test::More)
+BuildRequires:  perl(version)
 BuildRequires:  fftw2-devel
 BuildRequires:  gcc-gfortran
 BuildRequires:  gd-devel
@@ -35,7 +31,9 @@ Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versi
 Provides:       perl(PDL::Config) perl(PDL::PP::CType) perl(PDL::PP::Dims)
 Provides:       perl(PDL::PP::PDLCode) perl(PDL::PP::SymTab) perl(PDL::PP::XS)
 Provides:       perl(PGPLOT) perl(PDL::LiteF) perl(PDL::Lite)
-Provides:       perl(PDL::Graphics::TriD::GL) perl(PDL::Graphics::TriD::Objects)
+Provides:       perl(PDL::Graphics::TriD) perl(PDL::Graphics::TriD::GL) 
+Provides:       perl(PDL::Graphics::TriD::Objects) perl(PDL::Graphics::TriD::Contours)
+Provides:       perl(PDL::Graphics::TriD::Image) perl(PDL::Graphics::TriD::Tk)
 
 %{!?DEBUG:      %define DEBUG 0}
 %if %{DEBUG}
@@ -59,13 +57,8 @@ such commercial packages as IDL and MatLab.
 %prep
 %setup -q -n PDL-%{version}
 %patch0 -p1 -b .settings
-%patch1 -p1 -b .fix_ia64_sdump
-%patch2 -p1 -b .cleanup
-%patch4 -p1 -b .x86_64
-%patch5 -p1 -b .hdf
-%patch6 -p1 -b .Xext
-%patch7 -p1 -b .fortran
-%patch8 -p1 -b .patch_hdf
+%patch1 -p1 -b .hdf
+%patch2 -p1 -b .Xext
 
 for file in Lib/Func.pm Basic/Complex/complex.pd; do
   iconv -f iso-8859-1 -t utf-8 < "$file" > "${file}_" &&
@@ -90,7 +83,6 @@ make OPTIMIZE="$CFLAGS"
 # smp flags blows up spectacularly (2.4.1-10 May 7th 2005)
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 %{__perl} -Mblib Doc/scantree.pl $RPM_BUILD_ROOT%{perl_vendorarch}
 %{__perl} -pi -e "s|$RPM_BUILD_ROOT/|/|g" \
@@ -112,8 +104,9 @@ export PERL5LIB=`pwd`/blib/lib
 # set PERL_DL_NONLAZY=0
 #   The default behavior causes some problems because opengl.pd builds an interface for all functions
 #   defined in gl.h and glu.h even though they might not actually be in the opengl libraries.
-sed -i 's|PERL_DL_NONLAZY=1 $(FULLPERLRUN)|PERL_DL_NONLAZY=0 $(FULLPERLRUN)|g' \
-    Graphics/TriD/POGL/Makefile
+#sed -i 's|PERL_DL_NONLAZY=1 $(FULLPERLRUN)|PERL_DL_NONLAZY=0 $(FULLPERLRUN)|g' \
+#   Graphics/TriD/POGL/Makefile
+# ^ hopefully fixed in last release
 make test
 
 %clean
@@ -132,6 +125,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 14 2010 Marcela Mašláňová <mmaslano at redhat.com> 2.4.7-1
+- update to 2.4.7
+- add new provides PDL::Graphics::TriD*
+- add BR perl(version)
+- remove patches included in new version
+
 * Sat Jun 05 2010 Iain Arnell <iarnell at gmail.com> 2.4.6-4
 - restore the manual provides
 
diff --git a/sources b/sources
index 1d6715d..7f73f31 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a4aa5f3fd7363824e8f555d0245c4ac7  PDL-2.4.6.tar.gz
+e5d88775ea9b4b81fc4164dcc3ff63b5  PDL-2.4.7.tar.gz

More information about the scm-commits mailing list