rpms/plplot/devel plplot-5.8.0-multiarch.patch, NONE, 1.1 plplot.spec, 1.43, 1.44 plplot-5.7.2-multilib.patch, 1.1, NONE
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Thu Dec 6 00:06:17 UTC 2007
- Previous message (by thread): rpms/qt4/devel .cvsignore, 1.21, 1.22 qt4.spec, 1.75, 1.76 sources, 1.17, 1.18 qt-x11-opensource-src-4.3.2-rh#334281.patch, 1.1, NONE
- Next message (by thread): rpms/plplot/devel plplot.spec,1.44,1.45
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: orion
Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27210
Modified Files:
plplot.spec
Added Files:
plplot-5.8.0-multiarch.patch
Removed Files:
plplot-5.7.2-multilib.patch
Log Message:
* Wed Dec 4 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.8.0-3
- Updated multiarch patch for all language example makefiles
plplot-5.8.0-multiarch.patch:
--- NEW FILE plplot-5.8.0-multiarch.patch ---
--- plplot-5.8.0/examples/f95/Makefile.examples.in.multiarch 2007-11-18 13:04:09.000000000 -0700
+++ plplot-5.8.0/examples/f95/Makefile.examples.in 2007-12-05 17:00:50.000000000 -0700
@@ -25,8 +25,6 @@
EXEEXT = @EXEEXT@
@pkg_config_true at LIB_TAG = @LIB_TAG@
- at pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
- at pkg_config_true@RPATHCMD = @RPATHCMD@
EXECUTABLES_list = \
x01f$(EXEEXT) \
@@ -59,7 +57,7 @@
rm -f $(EXECUTABLES_list)
.f90$(EXEEXT):
- at pkg_config_true@ $(F95) @MODULESINCCMD@ $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-f95`
+ at pkg_config_true@ $(F95) @MODULESINCCMD@ $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-f95`
@pkg_config_false@ $(F95) @MODULESINCCMD@ $< -o $@ `plplot-config --cflags --libs --with-f95`
.SUFFIXES: .f90 $(EXEEXT)
--- plplot-5.8.0/examples/tk/Makefile.examples.in.multiarch 2007-11-18 13:04:09.000000000 -0700
+++ plplot-5.8.0/examples/tk/Makefile.examples.in 2007-11-19 16:51:13.000000000 -0700
@@ -24,8 +24,6 @@
EXEEXT = @EXEEXT@
@pkg_config_true at LIB_TAG = @LIB_TAG@
- at pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
- at pkg_config_true@RPATHCMD = @RPATHCMD@
EXECUTABLES_list = \
xtk01$(EXEEXT) \
@@ -38,7 +36,7 @@
rm -f $(EXECUTABLES_list)
.c$(EXEEXT):
- at pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-tcl`
+ at pkg_config_true@ $(CC) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-tcl`
@pkg_config_false@ $(CC) $< -o $@ `plplot-config --cflags --libs --with-tcl`
.SUFFIXES: .c $(EXEEXT)
--- plplot-5.8.0/examples/f77/Makefile.examples.in.multiarch 2007-11-18 13:04:09.000000000 -0700
+++ plplot-5.8.0/examples/f77/Makefile.examples.in 2007-12-05 17:01:06.000000000 -0700
@@ -25,8 +25,6 @@
EXEEXT = @EXEEXT@
@pkg_config_true at LIB_TAG = @LIB_TAG@
- at pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
- at pkg_config_true@RPATHCMD = @RPATHCMD@
EXECUTABLES_list = \
x01f$(EXEEXT) \
@@ -59,7 +57,7 @@
rm -f $(EXECUTABLES_list)
.f$(EXEEXT):
- at pkg_config_true@ $(F77) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-f77`
+ at pkg_config_true@ $(F77) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-f77`
@pkg_config_false@ $(F77) $< -o $@ `plplot-config --cflags --libs --with-f77`
.SUFFIXES: .f $(EXEEXT)
--- plplot-5.8.0/examples/c/Makefile.examples.in.multiarch 2007-11-18 13:04:08.000000000 -0700
+++ plplot-5.8.0/examples/c/Makefile.examples.in 2007-12-05 17:01:44.000000000 -0700
@@ -25,8 +25,6 @@
EXEEXT = @EXEEXT@
@pkg_config_true at LIB_TAG = @LIB_TAG@
- at pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
- at pkg_config_true@RPATHCMD = @RPATHCMD@
@gcw_true at PLPLOTCANVAS_EXECUTABLES_list = \
@gcw_true@ plplotcanvas_demo$(EXEEXT) \
@@ -69,21 +67,21 @@
rm -f $(EXECUTABLES_list)
@gcw_true at plplotcanvas_demo$(EXEEXT): plplotcanvas_demo.c
- at gcw_true@@pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) \
- at gcw_true@@pkg_config_true@ `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-gnome2`
+ at gcw_true@@pkg_config_true@ $(CC) $< -o $@ \
+ at gcw_true@@pkg_config_true@ `pkg-config --cflags --libs plplot$(LIB_TAG)-gnome2`
@gcw_true@@pkg_config_false@ $(CC) $< -o $@ \
@gcw_true@@pkg_config_false@ `plplot-config --cflags --libs --with-gcw`
@gcw_true at plplotcanvas_animation$(EXEEXT): plplotcanvas_animation.c
- at gcw_true@@pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) \
- at gcw_true@@pkg_config_true@ `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-gnome2` \
+ at gcw_true@@pkg_config_true@ $(CC) $< -o $@ \
+ at gcw_true@@pkg_config_true@ `pkg-config --cflags --libs plplot$(LIB_TAG)-gnome2` \
@gcw_true@@pkg_config_true@ `pkg-config --cflags --libs gthread-2.0`
@gcw_true@@pkg_config_false@ $(CC) $< -o \
@gcw_true@@pkg_config_false@ $@ `plplot-config --cflags --libs --with-gcw` \
@gcw_true@@pkg_config_false@ @GCWTHREAD_CFLAGS@ @GCWTHREAD_LIBS@
.c$(EXEEXT):
- at pkg_config_true@ $(CC) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)`
+ at pkg_config_true@ $(CC) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)`
@pkg_config_false@ $(CC) $< -o $@ `plplot-config --cflags --libs`
.SUFFIXES: .c $(EXEEXT)
--- plplot-5.8.0/examples/c++/Makefile.examples.in.multiarch 2007-11-18 13:04:09.000000000 -0700
+++ plplot-5.8.0/examples/c++/Makefile.examples.in 2007-12-05 17:02:03.000000000 -0700
@@ -25,8 +25,6 @@
EXEEXT = @EXEEXT@
@pkg_config_true at LIB_TAG = @LIB_TAG@
- at pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
- at pkg_config_true@RPATHCMD = @RPATHCMD@
@wxwidgets_true@@pkg_config_true at PLPLOTWXWIDGETS_EXECUTABLES_list = \
@wxwidgets_true@@pkg_config_true@ wxPLplotDemo$(EXEEXT)
@@ -68,10 +66,10 @@
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`
.cc$(EXEEXT):
- at pkg_config_true@ $(CXX) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-c++`
+ at pkg_config_true@ $(CXX) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-c++`
@pkg_config_false@ $(CXX) $< -o $@ `plplot-config --cflags --libs --with-c++`
.SUFFIXES: .c $(EXEEXT)
Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- plplot.spec 29 Nov 2007 15:48:23 -0000 1.43
+++ plplot.spec 6 Dec 2007 00:05:40 -0000 1.44
@@ -5,15 +5,15 @@
Name: plplot
Version: 5.8.0
-Release: 2%{?dist}
+Release: 3%{?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.8.0-multiarch.patch
Patch2: plplot-5.7.4-info.patch
-Patch5: plplot-5.7.2-multilib.patch
Patch6: plplot-5.7.3-jni.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -200,8 +200,8 @@
%prep
%setup -q
+%patch1 -p1 -b .multiarch
%patch2 -p1 -b .orig
-%patch5 -p1 -b .multilib
%patch6 -p1 -b .jni
@@ -483,6 +483,9 @@
%changelog
+* Wed Dec 4 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.8.0-3
+- Updated multiarch patch for all language example makefiles
+
* Thu Nov 29 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.8.0-2
- Rebuild for new octave api
--- plplot-5.7.2-multilib.patch DELETED ---
- Previous message (by thread): rpms/qt4/devel .cvsignore, 1.21, 1.22 qt4.spec, 1.75, 1.76 sources, 1.17, 1.18 qt-x11-opensource-src-4.3.2-rh#334281.patch, 1.1, NONE
- Next message (by thread): rpms/plplot/devel plplot.spec,1.44,1.45
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list