- added avoid-echo-e.patch (fix compilation when /bin/sh points to mksh)

- cleanup after fixing ncurses linking
- rel. 9

Changed files:
    OpenIPMI.spec -> 1.74
    avoid-echo-e.patch -> 1.1

diff --git a/OpenIPMI.spec b/OpenIPMI.spec
index 693297c2818c64ea7d2415d668758de55f261d58..7bb518aa81173faa6fe500eb15f408faa85260ea 100644 (file)
--- a/OpenIPMI.spec
+++ b/OpenIPMI.spec
@@ -6,7 +6,7 @@ Summary:        IPMI abstraction layer
 Summary(pl.UTF-8):     Warstwa abstrakcji IPMI
 Name:          OpenIPMI
 Version:       2.0.18
-Release:       8.1
+Release:       9
 License:       LGPL v2+ (library), GPL v2+ (ipmicmd)
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz
@@ -14,6 +14,7 @@ Source0:      http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz
 Patch0:                %{name}-link.patch
 Patch1:                %{name}-popt.patch
 Patch2:                %{name}-pthread.patch
+Patch3:                avoid-echo-e.patch
 URL:           http://openipmi.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -36,8 +37,7 @@ BuildRequires:        swig-python >= 1.3.25
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # refers to global ipmi_cmdlang_{global_err,report_event} symbols
-# and ncurses nodelay,keypad,meta (now in libtinfo, not found somehow)
-%define                skip_post_check_so      libOpenIPMI(cmdlang|ui)\.so\..*
+%define                skip_post_check_so      libOpenIPMIcmdlang\.so\..*
 
 %description
 OpenIPMI project aims to develop an open code base to allow access to
@@ -117,6 +117,7 @@ Graficzny interfejs użytkownika do OpenIPMI.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}

diff --git a/avoid-echo-e.patch b/avoid-echo-e.patch
new file mode 100644 (file)
index 0000000..4f038d9
--- /dev/null
+++ b/avoid-echo-e.patch
@@ -0,0 +1,32 @@
+--- OpenIPMI-2.0.18/configure.in.wiget 2011-08-15 14:56:33.536069856 +0200
++++ OpenIPMI-2.0.18/configure.in       2011-08-15 15:05:50.412874577 +0200
+@@ -647,7 +647,13 @@ else
+ fi
+ if test "x$pythonprog" != "x"; then
+    if test "x$pythonusepthreads" = "x"; then
+-      pythonusepthreads=`echo -e "try:\n  import thread\n  print 'yes'\nexcept:\n  print 'no'\n" | python`
++      pythonusepthreads=`$pythonprog <<EOF
++try:
++      import thread
++      print 'yes'
++except:
++      print 'no'
++EOF`
+    fi
+    echo "checking for python threads... $pythonusepthreads"
+ fi
+@@ -671,7 +677,13 @@ AC_SUBST(PYTHON_POSIX_SO)
+ # Check for Tkinter/Tix
+ if test "x$tkinter" = "x"; then
+    if test "x$pythonprog" != "x"; then
+-      tkinter=`echo -e "try:\n  import Tix\n  print 'yes'\nexcept:\n  print 'no'\n" | python`
++      tkinter=`$pythonprog <<EOF
++try:
++      import Tix
++      print 'yes'
++except:
++      print 'no'
++EOF`
+    fi
+ fi
+ echo "checking for tkinter... $tkinter"