[plplot] Specify Tk, iTcl, iTk, and iwidgets versions; Add BR iwidgets

Orion Poplawski orion at fedoraproject.org
Sat Feb 15 14:49:27 UTC 2014


commit 092cd2a5aec9a2e5dac8c24985dff8b0cd108007
Author: Orion Poplawski <orion at nwra.com>
Date:   Thu Feb 13 17:14:02 2014 -0700

    Specify Tk, iTcl, iTk, and iwidgets versions; Add BR iwidgets

 plplot.spec |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/plplot.spec b/plplot.spec
index de28ddf..172286f 100644
--- a/plplot.spec
+++ b/plplot.spec
@@ -65,6 +65,7 @@ BuildRequires:  java-devel, libgcj-devel
 BuildRequires:  freetype-devel, qhull-devel , ncurses-devel
 BuildRequires:  gd-devel, tcl-devel, tk-devel
 BuildRequires:  itcl-devel, itk-devel
+BuildRequires:  iwidgets
 BuildRequires:  python-devel, pygtk2-devel, numpy
 BuildRequires:  perl(XML::DOM), lasi-devel, wxGTK-devel
 BuildRequires:  gnu-free-mono-fonts
@@ -366,6 +367,12 @@ export FFLAGS="$RPM_OPT_FLAGS"
 #Needed for octave output to not have control characters
 unset TERM
 printenv
+# We assume that tk version is the same as tcl, cannot check without DISPLAY
+tkver=$(echo 'puts [info patchlevel]; exit' | tclsh)
+# Hardcode for now - need a way to determine versions
+itclver=3.4
+itkver=3.4
+iwidgetsver=4.0.2
 %cmake .. \
         -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \
         -DF95_MOD_DIR:PATH=%{_fmoddir} \
@@ -398,6 +405,10 @@ printenv
         -DPLD_vlt:BOOL=ON \
         -DPLD_xterm:BOOL=ON \
         -DPLD_wxwidgets:BOOL=ON \
+        -DPLPLOT_TK_VERSION=$tkver \
+        -DPLPLOT_ITCL_VERSION=$itclver \
+        -DPLPLOT_ITK_VERSION=$itkver \
+        -DIWIDGETS_VERSIONS_LIST:STRING="$iwidgetsver;$itkver;$itclver" \
 %if %{with doc}
         -DXML_DECL:FILEPATH=/usr/share/sgml/xml.dcl \
         -DBUILD_DOC:BOOL=ON \


More information about the scm-commits mailing list