rpms/plplot/devel plplot-5.5.3-matwrap.patch, 1.1, 1.2 plplot-5.5.3-tk.patch, 1.1, 1.2 plplot.spec, 1.6, 1.7
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Thu Dec 22 20:18:54 UTC 2005
Author: orion
Update of /cvs/extras/rpms/plplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21641
Modified Files:
plplot-5.5.3-matwrap.patch plplot-5.5.3-tk.patch plplot.spec
Log Message:
- Add patch to strip X check from configure for modular X
- Rework patches to patch configure and avoid autoconf
- Teporarily add BR on libXau-devel and libXdmcp (bz #176313)
plplot-5.5.3-matwrap.patch:
Index: plplot-5.5.3-matwrap.patch
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/plplot-5.5.3-matwrap.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plplot-5.5.3-matwrap.patch 10 Aug 2005 17:15:10 -0000 1.1
+++ plplot-5.5.3-matwrap.patch 22 Dec 2005 20:18:54 -0000 1.2
@@ -18,20 +18,59 @@
$remember_defs_in_file = 0; # We're not really interested in this file.
} else {
$remember_defs_in_file = 1; # This is a file we are actually
---- plplot-5.5.3/cf/octave.ac.orig 2005-08-09 09:34:00.000000000 -0600
-+++ plplot-5.5.3/cf/octave.ac 2005-08-09 09:34:52.000000000 -0600
-@@ -35,13 +35,7 @@
+--- plplot-5.5.3/configure.matwrap 2005-12-22 11:24:27.000000000 -0700
++++ plplot-5.5.3/configure 2005-12-22 11:25:04.000000000 -0700
+@@ -24312,52 +24312,7 @@
+ enable_octave=no;
+ fi
- # check for matwrap
- if test "$enable_octave" = "yes"; then
-- AC_CHECK_PROG(has_matwrap, matwrap, yes, no)
+-# check for matwrap
+- if test "$enable_octave" = "yes"; then
+- # Extract the first word of "matwrap", so it can be a program name with args.
+-set dummy matwrap; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_has_matwrap+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$has_matwrap"; then
+- ac_cv_prog_has_matwrap="$has_matwrap" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_has_matwrap="yes"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-
+- test -z "$ac_cv_prog_has_matwrap" && ac_cv_prog_has_matwrap="no"
+-fi
+-fi
+-has_matwrap=$ac_cv_prog_has_matwrap
+-if test -n "$has_matwrap"; then
+- echo "$as_me:$LINENO: result: $has_matwrap" >&5
+-echo "${ECHO_T}$has_matwrap" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
- if test "$has_matwrap" = "yes"; then
- MATWRAP=`which matwrap`
- else
- MATWRAP=`pwd`"/bindings/octave/matwrap/matwrap"
-- AC_MSG_WARN([Using builtin matwrap.]);
+- { echo "$as_me:$LINENO: WARNING: Using builtin matwrap." >&5
+-echo "$as_me: WARNING: Using builtin matwrap." >&2;};
- fi
-+ MATWRAP=`pwd`"/bindings/octave/matwrap/matwrap"
- fi
+- fi
++MATWRAP=`pwd`"/bindings/octave/matwrap/matwrap"
# check for user supplied mkoctfile
+ if test "$enable_octave" = "yes"; then
plplot-5.5.3-tk.patch:
Index: plplot-5.5.3-tk.patch
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/plplot-5.5.3-tk.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plplot-5.5.3-tk.patch 10 Aug 2005 17:15:10 -0000 1.1
+++ plplot-5.5.3-tk.patch 22 Dec 2005 20:18:54 -0000 1.2
@@ -1,6 +1,6 @@
---- plplot-5.5.3/cf/tcl.ac.orig 2005-08-04 13:42:51.000000000 -0600
-+++ plplot-5.5.3/cf/tcl.ac 2005-08-04 13:43:27.000000000 -0600
-@@ -55,13 +55,10 @@
+--- plplot-5.5.3/configure.tk 2005-12-22 11:17:02.000000000 -0700
++++ plplot-5.5.3/configure 2005-12-22 11:17:40.000000000 -0700
+@@ -24638,13 +24638,10 @@
# "/usr" which would give bad result under Linux without this ordering.
incdirs_default="\
Index: plplot.spec
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plplot.spec 15 Dec 2005 16:24:44 -0000 1.6
+++ plplot.spec 22 Dec 2005 20:18:54 -0000 1.7
@@ -2,7 +2,7 @@
Name: plplot
Version: 5.5.3
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Library of functions for making scientific plots
Group: Applications/Engineering
@@ -15,15 +15,17 @@
Patch3: plplot-5.5.3-x86_64.patch
Patch4: plplot-5.5.3-octave.patch
Patch5: plplot-5.5.3-check.patch
+Patch6: plplot-5.5.3-x.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: autoconf
BuildRequires: gcc-gfortran, freetype-devel, octave-devel, qhull-devel
BuildRequires: java-devel, libgcj-devel
BuildRequires: gd-devel, tcl-devel, tk-devel
BuildRequires: python-devel, pygtk2-devel, python-numeric
BuildRequires: libgnomeui-devel, libgnomeprintui22-devel, gnome-python2
BuildRequires: perl(XML::DOM)
+#Temporary until bz #176313 is fixed
+BuildRequires: libXau-devel, libXdmcp-devel
#BuildRequires: libunicode-devel
%description
@@ -133,10 +135,10 @@
%patch3 -p1 -b .orig
%patch4 -p1 -b .orig
%patch5 -p1 -b .orig
+%patch6 -p1 -b .orig
%build
-autoconf
%configure --disable-static --without-rpath --with-pthreads \
--with-freetype-font-dir=/usr/share/fonts \
--with-libunicode=no --disable-cgm --disable-linuxvga \
@@ -308,6 +310,11 @@
%{_datadir}/plplot%{version}/examples/tk/
%changelog
+* Thu Dec 22 2005 - Orion Poplawski <orion at cora.nwra.com> - 5.5.3-10
+- Add patch to strip X check from configure for modular X
+- Rework patches to patch configure and avoid autoconf
+- Teporarily add BR on libXau-devel and libXdmcp (bz #176313)
+
* Thu Dec 15 2005 - Orion Poplawski <orion at cora.nwra.com> - 5.5.3-9
- Rebuild for gcc 4.1
More information about the scm-commits
mailing list