[plplot: 1/2] - Update to 5.9.7 - Rebase multiarch patch - Drop info patch fixed upstream
Orion Poplawski
orion at fedoraproject.org
Mon Oct 11 18:22:46 UTC 2010
commit 7b877300e9aa62d5b1000271aaa10835f6ef67e0
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Mon Oct 11 12:21:55 2010 -0600
- Update to 5.9.7
- Rebase multiarch patch
- Drop info patch fixed upstream
.gitignore | 1 +
plplot-5.9.2-info.patch | 11 ----
...multiarch.patch => plplot-5.9.7-multiarch.patch | 52 +++++++++++--------
plplot.spec | 13 +++--
sources | 2 +-
5 files changed, 40 insertions(+), 39 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 187bec5..8973076 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
plplot-5.9.6.tar.gz
+/plplot-5.9.7.tar.gz
diff --git a/plplot-5.9.3-multiarch.patch b/plplot-5.9.7-multiarch.patch
similarity index 71%
rename from plplot-5.9.3-multiarch.patch
rename to plplot-5.9.7-multiarch.patch
index 08a49fd..c288426 100644
--- a/plplot-5.9.3-multiarch.patch
+++ b/plplot-5.9.7-multiarch.patch
@@ -1,6 +1,7 @@
---- plplot-5.9.2/examples/c/Makefile.examples.in.multiarch 2009-04-29 15:41:24.000000000 -0600
-+++ plplot-5.9.2/examples/c/Makefile.examples.in 2009-04-29 15:45:54.000000000 -0600
-@@ -25,8 +25,6 @@
+diff -up plplot-5.9.7/examples/c/Makefile.examples.in.multiarch plplot-5.9.7/examples/c/Makefile.examples.in
+--- plplot-5.9.7/examples/c/Makefile.examples.in.multiarch 2010-10-03 07:11:57.000000000 -0600
++++ plplot-5.9.7/examples/c/Makefile.examples.in 2010-10-11 12:15:53.248142693 -0600
+@@ -25,8 +25,6 @@ CC = @CC@
EXEEXT = @EXEEXT@
@pkg_config_true at LIB_TAG = @LIB_TAG@
@@ -9,7 +10,7 @@
@gcw_true at PLPLOTCANVAS_EXECUTABLES_list = \
@gcw_true@ plplotcanvas_demo$(EXEEXT) \
-@@ -80,29 +78,29 @@
+@@ -81,29 +79,29 @@ clean:
rm -f $(EXECUTABLES_list)
@gcw_true at plplotcanvas_demo$(EXEEXT): plplotcanvas_demo.c
@@ -48,9 +49,10 @@
@pkg_config_false@ $(CC) $< -o $@ `plplot-config --cflags --libs`
.SUFFIXES: .c $(EXEEXT)
---- plplot-5.9.2/examples/c++/Makefile.examples.in.multiarch 2009-04-29 15:41:25.000000000 -0600
-+++ plplot-5.9.2/examples/c++/Makefile.examples.in 2009-04-29 15:46:49.000000000 -0600
-@@ -25,10 +25,7 @@
+diff -up plplot-5.9.7/examples/c++/Makefile.examples.in.multiarch plplot-5.9.7/examples/c++/Makefile.examples.in
+--- plplot-5.9.7/examples/c++/Makefile.examples.in.multiarch 2010-10-03 07:11:57.000000000 -0600
++++ plplot-5.9.7/examples/c++/Makefile.examples.in 2010-10-11 12:16:25.047202989 -0600
+@@ -25,10 +25,7 @@ CXX = @CXX@
EXEEXT = @EXEEXT@
@pkg_config_true at LIB_TAG = @LIB_TAG@
@@ -61,19 +63,22 @@
@wxwidgets_true@@pkg_config_true at PLPLOTWXWIDGETS_EXECUTABLES_list = \
@wxwidgets_true@@pkg_config_true@ wxPLplotDemo$(EXEEXT)
-@@ -79,16 +76,16 @@
+@@ -79,18 +76,18 @@ clean:
rm -f $(EXECUTABLES_list)
@wxwidgets_true@@pkg_config_true at wxPLplotDemo$(EXEEXT): wxPLplotDemo.cpp
- at wxwidgets_true@@pkg_config_true@ $(CXX) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-wxwidgets`
+ at wxwidgets_true@@pkg_config_true@ $(CXX) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-wxwidgets`
+ # Note, must filter out -p options which confuse $(QT_MOC_EXECUTABLE). Such
+ # options (e.g., -pthread) tend to appear in the static driver case.
@qt_gui_true@@pkg_config_true at moc_qt_PlotWindow.cpp: qt_PlotWindow.h
- @qt_gui_true@@pkg_config_true@ $(QT_MOC_EXECUTABLE) `$(PKG_CONFIG_ENV) pkg-config --cflags plplot$(LIB_TAG)-qt` $< -o $@
+- at qt_gui_true@@pkg_config_true@ $(QT_MOC_EXECUTABLE) `$(PKG_CONFIG_ENV) pkg-config --cflags-only-I plplot$(LIB_TAG)-qt` $< -o $@
++ at qt_gui_true@@pkg_config_true@ $(QT_MOC_EXECUTABLE) `pkg-config --cflags-only-I plplot$(LIB_TAG)-qt` $< -o $@
@qt_gui_true@@pkg_config_true at qt_example$(EXEEXT): qt_example.cpp qt_PlotWindow.cpp moc_qt_PlotWindow.cpp
- at qt_gui_true@@pkg_config_true@ $(CXX) qt_example.cpp qt_PlotWindow.cpp moc_qt_PlotWindow.cpp -o $@ $(qt_RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-qt`
-+ at qt_gui_true@@pkg_config_true@ $(CXX) qt_example.cpp qt_PlotWindow.cpp moc_qt_PlotWindow.cpp -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-qt`
++ at qt_gui_true@@pkg_config_true@ $(CXX) qt_example.cpp qt_PlotWindow.cpp moc_qt_PlotWindow.cpp -o $@ $(qt_RPATHCMD) `pkg-config --cflags --libs plplot$(LIB_TAG)-qt`
.cc$(EXEEXT):
- at pkg_config_true@ $(CXX) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-c++`
@@ -81,9 +86,10 @@
@pkg_config_false@ $(CXX) $< -o $@ `plplot-config --cflags --libs --with-c++`
.SUFFIXES: .cc $(EXEEXT)
---- plplot-5.9.2/examples/f77/Makefile.examples.in.multiarch 2009-01-18 13:24:12.000000000 -0700
-+++ plplot-5.9.2/examples/f77/Makefile.examples.in 2009-04-29 15:41:41.000000000 -0600
-@@ -25,8 +25,6 @@
+diff -up plplot-5.9.7/examples/f77/Makefile.examples.in.multiarch plplot-5.9.7/examples/f77/Makefile.examples.in
+--- plplot-5.9.7/examples/f77/Makefile.examples.in.multiarch 2010-10-03 07:11:57.000000000 -0600
++++ plplot-5.9.7/examples/f77/Makefile.examples.in 2010-10-11 12:15:53.251143648 -0600
+@@ -25,8 +25,6 @@ F77 = @F77@
EXEEXT = @EXEEXT@
@pkg_config_true at LIB_TAG = @LIB_TAG@
@@ -92,7 +98,7 @@
EXECUTABLES_list = \
x01f$(EXEEXT) \
-@@ -69,7 +67,7 @@
+@@ -69,7 +67,7 @@ clean:
rm -f $(EXECUTABLES_list)
.f$(EXEEXT):
@@ -101,9 +107,10 @@
@pkg_config_false@ $(F77) $< -o $@ `plplot-config --cflags --libs --with-f77`
.SUFFIXES: .f $(EXEEXT)
---- plplot-5.9.2/examples/f95/Makefile.examples.in.multiarch 2009-01-18 13:24:12.000000000 -0700
-+++ plplot-5.9.2/examples/f95/Makefile.examples.in 2009-04-29 15:41:40.000000000 -0600
-@@ -25,8 +25,6 @@
+diff -up plplot-5.9.7/examples/f95/Makefile.examples.in.multiarch plplot-5.9.7/examples/f95/Makefile.examples.in
+--- plplot-5.9.7/examples/f95/Makefile.examples.in.multiarch 2010-10-03 07:11:57.000000000 -0600
++++ plplot-5.9.7/examples/f95/Makefile.examples.in 2010-10-11 12:15:53.252143716 -0600
+@@ -25,8 +25,6 @@ F95 = @FC@
EXEEXT = @EXEEXT@
@pkg_config_true at LIB_TAG = @LIB_TAG@
@@ -112,7 +119,7 @@
EXECUTABLES_list = \
x01f$(EXEEXT) \
-@@ -68,7 +66,7 @@
+@@ -68,7 +66,7 @@ clean:
rm -f $(EXECUTABLES_list)
.f90$(EXEEXT):
@@ -121,9 +128,10 @@
@pkg_config_false@ $(F95) @MODULESINCCMD@ $< -o $@ `plplot-config --cflags --libs --with-f95`
.SUFFIXES: .f90 $(EXEEXT)
---- plplot-5.9.2/examples/tk/Makefile.examples.in.multiarch 2009-04-29 15:41:30.000000000 -0600
-+++ plplot-5.9.2/examples/tk/Makefile.examples.in 2009-04-29 15:43:55.000000000 -0600
-@@ -24,8 +24,6 @@
+diff -up plplot-5.9.7/examples/tk/Makefile.examples.in.multiarch plplot-5.9.7/examples/tk/Makefile.examples.in
+--- plplot-5.9.7/examples/tk/Makefile.examples.in.multiarch 2010-10-03 07:11:57.000000000 -0600
++++ plplot-5.9.7/examples/tk/Makefile.examples.in 2010-10-11 12:15:53.253143630 -0600
+@@ -24,8 +24,6 @@ CC = @CC@
EXEEXT = @EXEEXT@
@pkg_config_true at LIB_TAG = @LIB_TAG@
@@ -132,7 +140,7 @@
EXECUTABLES_list = xtk01$(EXEEXT)
# Second and fourth examples depend on itk.
-@@ -37,7 +35,7 @@
+@@ -37,7 +35,7 @@ clean:
rm -f $(EXECUTABLES_list) $(itk_EXECUTABLES_list)
.c$(EXEEXT):
diff --git a/plplot.spec b/plplot.spec
index 183d473..9f723a6 100644
--- a/plplot.spec
+++ b/plplot.spec
@@ -9,16 +9,15 @@
%bcond_without pdl
Name: plplot
-Version: 5.9.6
-Release: 6%{?dist}
+Version: 5.9.7
+Release: 1%{?dist}
Summary: Library of functions for making scientific plots
Group: Applications/Engineering
License: LGPLv2+
URL: http://plplot.sourceforge.net/
Source0: http://downloads.sourceforge.net/plplot/%{name}-%{version}.tar.gz
-Patch1: plplot-5.9.3-multiarch.patch
-Patch2: plplot-5.9.2-info.patch
+Patch1: plplot-5.9.7-multiarch.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake, libtool-ltdl-devel, swig
@@ -300,7 +299,6 @@ Requires: pkgconfig
%prep
%setup -q
%patch1 -p1 -b .multiarch
-%patch2 -p1 -b .info
# Convert to UTF-8
for file in ChangeLog NEWS
do
@@ -671,6 +669,11 @@ fi
%changelog
+* Mon Oct 11 2010 Orion Poplawski <orion at cora.nwra.com> - 5.9.7-1
+- Update to 5.9.7
+- Rebase multiarch patch
+- Drop info patch fixed upstream
+
* Fri Jul 30 2010 Orion Poplawski <orion at cora.nwra.com> - 5.9.6-6
- Add licenses to libs sub-package
diff --git a/sources b/sources
index 19fcd90..8aa4789 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-772c772bde3a107e5f06d21cefa7f6b6 plplot-5.9.6.tar.gz
+c53c484ed93ce8446513c31707551b5b plplot-5.9.7.tar.gz
More information about the scm-commits
mailing list