rpms/perl-PDL/devel perl-PDL-x86_64.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 perl-PDL-settings.patch, 1.5, 1.6 perl-PDL.spec, 1.57, 1.58 sources, 1.11, 1.12 perl-PDL-2.4.3-Xext.patch, 1.1, NONE perl-PDL-2.4.3-test.patch, 1.2, NONE perl-PDL-2.4.3-x86_64.patch, 1.1, NONE perl-PDL-2.4.4-x86_64.patch, 1.1, NONE

Štěpán Kasal kasal at fedoraproject.org
Wed Jan 13 09:17:57 UTC 2010 

Author: kasal

Update of /cvs/extras/rpms/perl-PDL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21257

Modified Files:
	.cvsignore perl-PDL-settings.patch perl-PDL.spec sources 
Added Files:
	perl-PDL-x86_64.patch 
Removed Files:
	perl-PDL-2.4.3-Xext.patch perl-PDL-2.4.3-test.patch 
	perl-PDL-2.4.3-x86_64.patch perl-PDL-2.4.4-x86_64.patch 
Log Message:
- new upstream version
- add BR perl(OpenGL) and other needed BRs

perl-PDL-x86_64.patch:
 Graphics/TriD/Makefile.PL |    2 +-
 perldl.conf               |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE perl-PDL-x86_64.patch ---
diff -up PDL-2.4.6/Graphics/TriD/Makefile.PL.x86_64 PDL-2.4.6/Graphics/TriD/Makefile.PL
--- PDL-2.4.6/Graphics/TriD/Makefile.PL.x86_64	2009-10-24 18:04:29.000000000 +0200
+++ PDL-2.4.6/Graphics/TriD/Makefile.PL	2010-01-06 12:07:36.000000000 +0100
@@ -23,7 +23,7 @@ if ( $PDL::Config{USE_POGL} ) {
    } else {
       #
       # default locations:
-      my @check_dirs = qw( /lib/ /usr/lib/ /usr/local/lib/ /usr/X11R6/lib/ /usr/local/X11R6/lib/ /usr/X11/lib/ /usr/local/X11/lib/ );
+      my @check_dirs = qw( /lib/ /usr/lib64/ /usr/lib/ /usr/local/lib/ /usr/X11R6/lib/ /usr/local/X11R6/lib/ /usr/X11/lib/ /usr/local/X11/lib/ );
 
       # append locations from perldl.conf, if specified:
       @check_dirs =
diff -up PDL-2.4.6/perldl.conf.x86_64 PDL-2.4.6/perldl.conf
--- PDL-2.4.6/perldl.conf.x86_64	2009-12-27 18:20:50.000000000 +0100
+++ PDL-2.4.6/perldl.conf	2010-01-06 12:07:36.000000000 +0100
@@ -184,7 +184,7 @@
         WITH_FFTW => undef,    # Leave it up to PDL to decide
         
 # Location to search for the FFTW libs
-        FFTW_LIBS => [ '/lib','/usr/lib','/usr/local/lib'],
+        FFTW_LIBS => [ '/lib','/usr/lib64','/usr/lib','/usr/local/lib'],
 # Location to find FFTW includes:
         FFTW_INC => ['/usr/include/','/usr/local/include'],
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PDL/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	20 Jul 2009 23:25:05 -0000	1.10
+++ .cvsignore	13 Jan 2010 09:17:55 -0000	1.11
@@ -1,2 +1 @@
-PDL-2.4.4_05.tar.gz
-PDL-Graphics-PLplot-0.50.tar.gz
+PDL-2.4.6.tar.gz

perl-PDL-settings.patch:
 perldl.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: perl-PDL-settings.patch
===================================================================
RCS file: /cvs/extras/rpms/perl-PDL/devel/perl-PDL-settings.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- perl-PDL-settings.patch	29 Nov 2008 23:58:36 -0000	1.5
+++ perl-PDL-settings.patch	13 Jan 2010 09:17:56 -0000	1.6
@@ -1,15 +1,11 @@
+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
-@@ -91,7 +91,7 @@
- # There are problems with the build on OS-X, so we turn it off by default
- # for such systems
- #
--	WITH_3D => $^O eq "darwin" || $^O eq 'MSWin32' ? 0 : undef,
-+	WITH_3D => 1,
- 
- #
- #  For Mesa 3.2
-@@ -205,7 +205,7 @@
+@@ -217,7 +217,7 @@
  #    about curses to fix it 
  #  - 1 builds, 0 or undef does not build
  #


Index: perl-PDL.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-PDL/devel/perl-PDL.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- perl-PDL.spec	8 Dec 2009 21:53:06 -0000	1.57
+++ perl-PDL.spec	13 Jan 2010 09:17:56 -0000	1.58
@@ -1,6 +1,6 @@
 Name:           perl-PDL
-Version:        2.4.4_05
-Release:        7%{?dist}
+Version:        2.4.6
+Release:        1%{?dist}
 Summary:        The Perl Data Language
 
 Group:          Development/Libraries
@@ -10,34 +10,43 @@ Source0:        http://search.cpan.org/C
 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-2.4.4-x86_64.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
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch8:         perl-PDL-2.4.3-test_hdf.patch
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(ExtUtils::F77)
 BuildRequires:  perl(Inline)
+BuildRequires:  perl(OpenGL)
 BuildRequires:  perl(Test::More)
 BuildRequires:  fftw2-devel
 BuildRequires:  gcc-gfortran
 BuildRequires:  gd-devel
 BuildRequires:  gsl-devel
 BuildRequires:  hdf-static hdf-devel
-BuildRequires:  libGLU-devel
+BuildRequires:  freeglut-devel libXmu-devel libXi-devel
 BuildRequires:  proj-devel
 BuildRequires:  proj-nad
 BuildRequires:  ncurses-devel
 BuildRequires:  sharutils
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-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::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)
 
-%{?!DEBUG:      %define DEBUG 0}
+%{!?DEBUG:      %define DEBUG 0}
+%if %{DEBUG}
+%define debug_package %{nil}
+%endif
+
+%{?filter_setup:
+%filter_from_requires /^perl(\(Tk\|Win32::DDE::Client\))$/d
+%filter_from_provides /^perl(Inline)$/d
+%?perl_default_filter
+}
 
 %description
 PDL ("Perl Data Language") gives standard Perl the ability to
@@ -50,7 +59,7 @@ such commercial packages as IDL and MatL
 %prep
 %setup -q -n PDL-%{version}
 %patch0 -p1 -b .settings
-%patch1 -p1
+%patch1 -p1 -b .fix_ia64_sdump
 %patch2 -p1 -b .cleanup
 %patch4 -p1 -b .x86_64
 %patch5 -p1 -b .hdf
@@ -58,25 +67,10 @@ such commercial packages as IDL and MatL
 %patch7 -p1 -b .fortran
 %patch8 -p1 -b .patch_hdf
 
-# Provides: explicitly filter perl(Inline)
-cat <<__EOF__ > %{name}-findperlprovides
-#!/bin/sh
-%{__perl_provides} \$* | grep -v 'perl(Inline)'
-__EOF__
-%define __perl_provides %{_builddir}/PDL-%{version}/%{name}-findperlprovides
-chmod +x %{__perl_provides}
-
-# Requires: explicitly filter perl(Tk)
-cat <<__EOF__ > %{name}-findperlrequires
-#!/bin/sh
-%{__perl_requires} \$* | grep -v 'perl(Tk)' | grep -v 'perl(Win32::DDE::Client)'
-__EOF__
-%define __perl_requires %{_builddir}/PDL-%{version}/%{name}-findperlrequires
-chmod +x %{__perl_requires}
-
-%if %{DEBUG}
-%define debug_package %{nil}
-%endif
+for file in Lib/Func.pm Basic/Complex/complex.pd; do
+  iconv -f iso-8859-1 -t utf-8 < "$file" > "${file}_" &&
+    mv -f "${file}_" "$file"
+done
 
 %build
 export PERL5LIB=`pwd`/blib/lib:`pwd`/blib/arch:
@@ -107,11 +101,6 @@ find $RPM_BUILD_ROOT -type f -name '*.bs
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
-for file in $RPM_BUILD_ROOT%{_mandir}/man3/PDL::Func.3pm $RPM_BUILD_ROOT%{_mandir}/man3/PDL::Complex.3pm; do
-  iconv -f iso-8859-1 -t utf-8 < "$file" > "${file}_"
-  mv -f "${file}_" "$file"
-done
-
 %if %{DEBUG}
 /usr/lib/rpm/brp-compress
 exit 0
@@ -120,7 +109,7 @@ exit 0
 %check
 unset DISPLAY
 export PERL5LIB=`pwd`/blib/lib
- set PERL_DL_NONLAZY=0
+# 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/OpenGL/Makefile
@@ -142,6 +131,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jan  6 2010 Stepan Kasal <skasal at redhat.com> - 2.4.6-1
+- new upstream version
+- add BR perl(OpenGL) and other needed BR's
+- use better BuildRoot
+- use filtering macros
+- update patches settings and x86_64
+- move the charset conversion before the build
+
 * Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4.4_05-7
 - Explicitly BR hdf-static in accordance with the Packaging
   Guidelines (hdf-devel is still static-only).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PDL/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	18 Sep 2009 21:40:26 -0000	1.11
+++ sources	13 Jan 2010 09:17:56 -0000	1.12
@@ -1 +1 @@
-f00bf655a28d9bb0fdc968b7327b83f1  PDL-2.4.4_05.tar.gz
+a4aa5f3fd7363824e8f555d0245c4ac7  PDL-2.4.6.tar.gz


--- perl-PDL-2.4.3-Xext.patch DELETED ---


--- perl-PDL-2.4.3-test.patch DELETED ---


--- perl-PDL-2.4.3-x86_64.patch DELETED ---


--- perl-PDL-2.4.4-x86_64.patch DELETED ---

More information about the scm-commits mailing list