packages: perl-PDL/perl-PDL-conf.patch, perl-PDL/perl-PDL.spec, perl-PDL/pe...

baggins baggins at pld-linux.org
Sat Jan 28 17:04:10 CET 2012 

Author: baggins                      Date: Sat Jan 28 16:04:10 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 2.4.9
- karma interface has been removed as of 2.4.8

---- Files affected:
packages/perl-PDL:
   perl-PDL-conf.patch (1.15 -> 1.16) , perl-PDL.spec (1.113 -> 1.114) , perl-PDL-karma.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/perl-PDL/perl-PDL-conf.patch
diff -u packages/perl-PDL/perl-PDL-conf.patch:1.15 packages/perl-PDL/perl-PDL-conf.patch:1.16
--- packages/perl-PDL/perl-PDL-conf.patch:1.15	Thu Jul 29 12:40:17 2010
+++ packages/perl-PDL/perl-PDL-conf.patch	Sat Jan 28 17:04:04 2012
@@ -1,30 +1,24 @@
 diff -urN PDL-2.4.0.org/perldl.conf PDL-2.4.0/perldl.conf
 --- PDL-2.4.0.org/perldl.conf	2003-12-30 14:54:25.663910257 +0100
 +++ PDL-2.4.0/perldl.conf	2003-12-30 15:14:41.363631658 +0100
-@@ -58,12 +58,12 @@
- # There are problems with the build on OS-X, so we turn it off by default
- # for such systems
+@@ -58,15 +58,15 @@
+ # false -> skip build of PDL::Graphics:::TriD
+ # undef -> let PDL build decide based on dependencies present
  #
 -        WITH_3D => undef,
 +        WITH_3D => 1,
  
- # 
- # Build Graphics/TriD using Perl OpenGL (experimental)
+ # Build Graphics/TriD using Perl OpenGL
+ #
+ # true -> use new Perl OpenGL bindings
+ # false -> use legacy, deprecated X11 only bindings
+ # undef -> let PDL build decide (check if Perl OpenGL is present)
  #
 -        USE_POGL => undef,
 +        USE_POGL => 1,
  #       USE_POGL => 0,
  #
-         POGL_VERSION => 0.62,           # minimum compatible OpenGL version
-@@ -76,7 +79,7 @@
- # Whether or not to build the Karma interface module
- 
-         WITH_KARMA => undef,    # Leave it up to PDL to decide
--        WHERE_KARMA => undef,   # you may explicitly specify directory location
-+        WHERE_KARMA => 0,   # you may explicitly specify directory location
- 
- #
- ## Whether or not to build the PLplot interface module
+         POGL_VERSION => 0.63,           # minimum compatible OpenGL version
 @@ -110,7 +110,7 @@
  #    about curses to fix it 
  #  - 1 builds, 0 or undef does not build

================================================================
Index: packages/perl-PDL/perl-PDL.spec
diff -u packages/perl-PDL/perl-PDL.spec:1.113 packages/perl-PDL/perl-PDL.spec:1.114
--- packages/perl-PDL/perl-PDL.spec:1.113	Sat Jan 14 09:48:31 2012
+++ packages/perl-PDL/perl-PDL.spec	Sat Jan 28 17:04:04 2012
@@ -1,7 +1,6 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	karma	# build package with PDL::Graphics::Karma modules
 %bcond_without	html	# don't generate package with PDL documentation in HTML
 %bcond_without	plplot	# don't build / link with plplot (currently broken)
 %bcond_with	tests	# perform "make test"
@@ -13,31 +12,29 @@
 Summary(pl.UTF-8):	perlDL - wydajne obliczenia numeryczne w Perlu
 Summary(pt_BR.UTF-8):	Módulo PDL para perl
 Name:		perl-PDL
-Version:	2.4.6
-Release:	4
+Version:	2.4.9
+Release:	0.1
 Epoch:		1
 # same as perl
 License:	GPL v1+ or Artistic
 Group:		Development/Languages/Perl
 Source0:	http://dl.sourceforge.net/pdl/%{pdir}-%{version}.tar.gz
-# Source0-md5:	a4aa5f3fd7363824e8f555d0245c4ac7
+# Source0-md5:	459e127d3ad7d80a95d6006373b1da6c
 Patch0:		%{name}-conf.patch
 Patch1:		%{name}-dep.patch
 Patch2:		%{name}-Makefile.PL.patch-dumb
 Patch3:		%{name}-fftw-shared.patch
-Patch4:		%{name}-karma.patch
 Patch5:		%{name}-vendorarch.patch
 URL:		http://pdl.perl.org/
 BuildRequires:	fftw-devel >= 2.1.3-5
 BuildRequires:	gd-devel
 BuildRequires:	gsl-devel >= 1.3
-%{?with_karma:BuildRequires:	karma-devel}
 BuildRequires:	libgfortran-static
 BuildRequires:	ncurses-devel >= 5.0
 BuildRequires:	perl-ExtUtils-F77 >= 1.10
 BuildRequires:	perl-Filter
 BuildRequires:	perl-Inline >= 0.43
-BuildRequires:	perl-OpenGL >= 0.62
+BuildRequires:	perl-OpenGL >= 0.63
 BuildRequires:	perl-PGPLOT
 BuildRequires:	perl-Tk
 BuildRequires:	perl-devel >= 1:5.8.0
@@ -134,21 +131,6 @@
 %description Graphics-IIS -l pl.UTF-8
 Wyświetlanie grafiki PDL na urządzeniach IIS (saoimage/ximtool).
 
-%package Graphics-Karma
-Summary:	Interface to Karma visualisation applications
-Summary(pl.UTF-8):	Interfejs do aplikacji wizualizujących Karma
-Group:		Development/Languages/Perl
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-
-%description Graphics-Karma
-PDL::Graphics::Karma is an interface to Karma visualisation
-applications. It can send PDL 2D/3D data to kview, xray, kslice_3d,
-etc.
-
-%description Graphics-Karma -l pl.UTF-8
-PDL::Graphics::Karma to interfejs do aplikacji wizualizujących Karma.
-Może wysyłać dane 2D i 3D do kview, xray, kslice_3d itp.
-
 %package Graphics-LUT
 Summary:	Provides access to a number of look-up tables for PDL
 Summary(pl.UTF-8):	Dostęp do tablic kolorów dla PDL
@@ -490,7 +472,6 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%{?with_karma:%patch4 -p1}
 %patch5 -p1
 
 %{__perl} -pi -e 's/\b(pdlpp_postamble)\b/$1_int/g' Graphics/PLplot/Makefile.PL
@@ -499,7 +480,6 @@
 
 %{__perl} -pi -e "s@(FFTW_LIBS.*)'/lib','/usr/lib','/usr/local/lib'@\$1'/usr/%{_lib}'@" perldl.conf
 %{__perl} -pi -e "s@(OPENGL_LIBS.*)'-L/usr/lib@\$1'-L/usr/%{_lib}@" perldl.conf
-%{__perl} -pi -e "s@(WHERE_KARMA.*)\"/usr/lib/karma@\$1\"/usr/%{_lib}/karma@" perldl.conf
 %{__perl} -pi -e "s@(WHERE_PLPLOT_LIBS.*)undef@\$1'/usr/%{_lib}'@" perldl.conf
 
 %build
@@ -549,11 +529,6 @@
 	/usr/bin/perl %{perl_vendorarch}/PDL/scantree.pl %{perl_vendorarch}
 fi
 
-%post Graphics-Karma
-if [ -f %{perl_vendorarch}/PDL/scantree.pl ]; then
-	/usr/bin/perl %{perl_vendorarch}/PDL/scantree.pl %{perl_vendorarch}
-fi
-
 %post Graphics-LUT
 if [ -f %{perl_vendorarch}/PDL/scantree.pl ]; then
 	/usr/bin/perl %{perl_vendorarch}/PDL/scantree.pl %{perl_vendorarch}
@@ -669,11 +644,6 @@
 	/usr/bin/perl %{perl_vendorarch}/PDL/scantree.pl %{perl_vendorarch}
 fi
 
-%postun Graphics-Karma
-if [ -f %{perl_vendorarch}/PDL/scantree.pl ]; then
-	/usr/bin/perl %{perl_vendorarch}/PDL/scantree.pl %{perl_vendorarch}
-fi
-
 %postun Graphics-LUT
 if [ -f %{perl_vendorarch}/PDL/scantree.pl ]; then
 	/usr/bin/perl %{perl_vendorarch}/PDL/scantree.pl %{perl_vendorarch}
@@ -953,16 +923,6 @@
 %attr(755,root,root) %{perl_vendorarch}/auto/PDL/Graphics/IIS/*.so
 %{_mandir}/man3/PDL::Graphics::IIS*
 
-%if %{with karma}
-%files Graphics-Karma
-%defattr(644,root,root,755)
-%{perl_vendorarch}/PDL/Graphics/Karma.pm
-%dir %{perl_vendorarch}/auto/PDL/Graphics/Karma
-%{perl_vendorarch}/auto/PDL/Graphics/Karma/*.bs
-%attr(755,root,root) %{perl_vendorarch}/auto/PDL/Graphics/Karma/*.so
-%{_mandir}/man3/PDL::Graphics::Karma*
-%endif
-
 %files Graphics-LUT
 %defattr(644,root,root,755)
 %{perl_vendorarch}/PDL/Graphics/LUT*
@@ -1163,6 +1123,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.114  2012/01/28 16:04:04  baggins
+- 2.4.9
+- karma interface has been removed as of 2.4.8
+
 Revision 1.113  2012/01/14 08:48:31  arekm
 - release 4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl-PDL/perl-PDL-conf.patch?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl-PDL/perl-PDL.spec?r1=1.113&r2=1.114&f=u

More information about the pld-cvs-commit mailing list