[plplot] - Update to 5.9.11 - Rebase multiarch patch - Drop upstream soperms, rpmlint patch

Orion Poplawski orion at fedoraproject.org
Mon Dec 30 02:56:36 UTC 2013 

commit 5d5c8ff72a6c9afa1d6483180f6e0f481673f04c
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Sun Dec 29 19:56:31 2013 -0700

    - Update to 5.9.11
    - Rebase multiarch patch
    - Drop upstream soperms, rpmlint patch

 .gitignore             |    1 +
 plplot-multiarch.patch |   44 +++++++------------
 plplot-rpmlint.patch   |  104 -------------------------------------------
 plplot-soperms.patch   |  115 ------------------------------------------------
 plplot.spec            |   15 +++---
 sources                |    2 +-
 6 files changed, 25 insertions(+), 256 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0782dd0..accb868 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /plplot-5.9.9-svn12479.tar.xz
 /plplot-5.9.9-svn12530.tar.xz
 /plplot-5.9.10.tar.gz
+/plplot-5.9.11.tar.gz
diff --git a/plplot-multiarch.patch b/plplot-multiarch.patch
index f0f3c80..8f4512b 100644
--- a/plplot-multiarch.patch
+++ b/plplot-multiarch.patch
@@ -1,18 +1,6 @@
-diff -up plplot-5.9.9-svn12474/examples/c/Makefile.examples.in.multiarch plplot-5.9.9-svn12474/examples/c/Makefile.examples.in
---- plplot-5.9.9-svn12474/examples/c/Makefile.examples.in.multiarch	2012-01-05 06:59:36.000000000 -0700
-+++ plplot-5.9.9-svn12474/examples/c/Makefile.examples.in	2013-08-07 21:08:11.652873335 -0600
-@@ -25,8 +25,6 @@ CC = @CC@
- EXEEXT = @EXEEXT@
- 
- LIB_TAG = @LIB_TAG@
--PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
--RPATHCMD = @RPATHCMD@
- 
- @gcw_true at PLPLOTCANVAS_EXECUTABLES_list = \
- @gcw_true@		 plplotcanvas_demo$(EXEEXT) \
-diff -up plplot-5.9.9-svn12474/examples/c++/Makefile.examples.in.multiarch plplot-5.9.9-svn12474/examples/c++/Makefile.examples.in
---- plplot-5.9.9-svn12474/examples/c++/Makefile.examples.in.multiarch	2013-04-24 14:36:28.000000000 -0600
-+++ plplot-5.9.9-svn12474/examples/c++/Makefile.examples.in	2013-08-07 21:08:11.652873335 -0600
+diff -up plplot-5.9.11/examples/c++/Makefile.examples.in.multiarch plplot-5.9.11/examples/c++/Makefile.examples.in
+--- plplot-5.9.11/examples/c++/Makefile.examples.in.multiarch	2013-04-24 14:36:28.000000000 -0600
++++ plplot-5.9.11/examples/c++/Makefile.examples.in	2013-12-29 19:48:17.574496673 -0700
 @@ -25,10 +25,7 @@ CXX = @CXX@
  EXEEXT = @EXEEXT@
  
@@ -24,21 +12,21 @@ diff -up plplot-5.9.9-svn12474/examples/c++/Makefile.examples.in.multiarch plplo
  
  @wxwidgets_true at PLPLOTWXWIDGETS_EXECUTABLES_list = \
  @wxwidgets_true@	wxPLplotDemo$(EXEEXT)
-diff -up plplot-5.9.9-svn12474/examples/f77/Makefile.examples.in.multiarch plplot-5.9.9-svn12474/examples/f77/Makefile.examples.in
---- plplot-5.9.9-svn12474/examples/f77/Makefile.examples.in.multiarch	2013-08-07 21:08:11.652873335 -0600
-+++ plplot-5.9.9-svn12474/examples/f77/Makefile.examples.in	2013-08-07 21:08:48.713756483 -0600
-@@ -25,8 +25,6 @@ F77 = @F77@
+diff -up plplot-5.9.11/examples/c/Makefile.examples.in.multiarch plplot-5.9.11/examples/c/Makefile.examples.in
+--- plplot-5.9.11/examples/c/Makefile.examples.in.multiarch	2012-01-05 06:59:36.000000000 -0700
++++ plplot-5.9.11/examples/c/Makefile.examples.in	2013-12-29 19:48:17.574496673 -0700
+@@ -25,8 +25,6 @@ CC = @CC@
  EXEEXT = @EXEEXT@
  
  LIB_TAG = @LIB_TAG@
 -PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
 -RPATHCMD = @RPATHCMD@
  
- EXECUTABLES_list = \
- 		 x00f$(EXEEXT) \
-diff -up plplot-5.9.9-svn12474/examples/f95/Makefile.examples.in.multiarch plplot-5.9.9-svn12474/examples/f95/Makefile.examples.in
---- plplot-5.9.9-svn12474/examples/f95/Makefile.examples.in.multiarch	2012-02-19 11:33:33.000000000 -0700
-+++ plplot-5.9.9-svn12474/examples/f95/Makefile.examples.in	2013-08-07 21:08:11.652873335 -0600
+ @gcw_true at PLPLOTCANVAS_EXECUTABLES_list = \
+ @gcw_true@		 plplotcanvas_demo$(EXEEXT) \
+diff -up plplot-5.9.11/examples/f95/Makefile.examples.in.multiarch plplot-5.9.11/examples/f95/Makefile.examples.in
+--- plplot-5.9.11/examples/f95/Makefile.examples.in.multiarch	2012-02-19 11:33:33.000000000 -0700
++++ plplot-5.9.11/examples/f95/Makefile.examples.in	2013-12-29 19:48:20.960557580 -0700
 @@ -25,8 +25,6 @@ F95 = @FC@
  EXEEXT = @EXEEXT@
  
@@ -48,15 +36,15 @@ diff -up plplot-5.9.9-svn12474/examples/f95/Makefile.examples.in.multiarch plplo
  
  EXECUTABLES_list = \
  		 x00f$(EXEEXT) \
-diff -up plplot-5.9.9-svn12474/examples/tk/Makefile.examples.in.multiarch plplot-5.9.9-svn12474/examples/tk/Makefile.examples.in
---- plplot-5.9.9-svn12474/examples/tk/Makefile.examples.in.multiarch	2012-01-05 06:59:36.000000000 -0700
-+++ plplot-5.9.9-svn12474/examples/tk/Makefile.examples.in	2013-08-07 21:08:11.652873335 -0600
+diff -up plplot-5.9.11/examples/tk/Makefile.examples.in.multiarch plplot-5.9.11/examples/tk/Makefile.examples.in
+--- plplot-5.9.11/examples/tk/Makefile.examples.in.multiarch	2013-12-29 19:48:20.961557593 -0700
++++ plplot-5.9.11/examples/tk/Makefile.examples.in	2013-12-29 19:49:19.876587409 -0700
 @@ -24,8 +24,6 @@ CC = @CC@
  EXEEXT = @EXEEXT@
  
  LIB_TAG = @LIB_TAG@
 -PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
--RPATHCMD = @RPATHCMD@
+-plplottcltk_Main_RPATHCMD = @plplottcltk_Main_RPATHCMD@
  
  EXECUTABLES_list = xtk01$(EXEEXT)
  # Second and fourth examples depend on itk.
diff --git a/plplot.spec b/plplot.spec
index e75bd93..097eb27 100644
--- a/plplot.spec
+++ b/plplot.spec
@@ -25,8 +25,8 @@
 %global svnver 12530
 
 Name:           plplot
-Version:        5.9.10
-Release:        4%{?dist}
+Version:        5.9.11
+Release:        1%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -43,10 +43,6 @@ Patch3:         plplot-lua52.patch
 # Fix pkgconfig libs
 # https://bugzilla.redhat.com/show_bug.cgi?id=998988
 Patch4:         plplot-pkgconfig.patch
-# Upstream patch (svn commit r12617) to fix ocaml/octave so permissions
-Patch5:         plplot-soperms.patch
-# Fix various rpmlint issues - reported upstream
-Patch6:         plplot-rpmlint.patch
 # Don't use -custom with ocamlc
 Patch7:         plplot-ocaml.patch
 
@@ -356,8 +352,6 @@ Requires:       %{name}-wxGTK%{?_isa} = %{version}-%{release}
 %patch3 -p1 -b .lua52
 %endif
 %patch4 -p1 -b .pkgconfig
-%patch5 -p0 -b .soperms
-%patch6 -p1 -b .rpmlint
 %patch7 -p1 -b .ocaml
 # Emtpy file - fixed upstream
 sed -i -e '/plplotdoc-html.proc/d' doc/docbook/src/HTML-MANIFEST
@@ -709,6 +703,11 @@ fi
 
 
 %changelog
+* Sun Dec 29 2013 Orion Poplawski <orion at cora.nwra.com> - 5.9.11-1
+- Update to 5.9.11
+- Rebase multiarch patch
+- Drop upstream soperms, rpmlint patch
+
 * Sat Dec 28 2013 Orion Poplawski <orion at cora.nwra.com> - 5.9.10-4
 - Rebuild for octave 3.8.0
 
diff --git a/sources b/sources
index 9a8e9f8..1940d04 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1f8a420aa3ef1739e36f0b043fbe149b  plplot-5.9.10.tar.gz
+153782509a13938230f740ee446389d0  plplot-5.9.11.tar.gz

More information about the scm-commits mailing list