Author: wiget Date: Mon Aug 15 13:22:11 2011 GMT Module: packages Tag: HEAD ---- Log message: - added avoid-echo-e.patch (fix compilation when /bin/sh points to mksh) - cleanup after fixing ncurses linking - rel. 9
---- Files affected: packages/OpenIPMI: OpenIPMI.spec (1.73 -> 1.74) , avoid-echo-e.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/OpenIPMI/OpenIPMI.spec diff -u packages/OpenIPMI/OpenIPMI.spec:1.73 packages/OpenIPMI/OpenIPMI.spec:1.74 --- packages/OpenIPMI/OpenIPMI.spec:1.73 Tue Jul 19 19:10:32 2011 +++ packages/OpenIPMI/OpenIPMI.spec Mon Aug 15 15:22:06 2011 @@ -7,7 +7,7 @@ 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 @@ -15,6 +15,7 @@ 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 @@ -37,8 +38,7 @@ 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 @@ -118,6 +118,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %{__libtoolize} @@ -254,6 +255,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.74 2011/08/15 13:22:06 wiget +- added avoid-echo-e.patch (fix compilation when /bin/sh points to mksh) +- cleanup after fixing ncurses linking +- rel. 9 + Revision 1.73 2011/07/19 17:10:32 mmazur - fix building against current ncurses; remove unneeded link patches - rel 8.1; doesn't build by default (problem with -gui subpackage) ================================================================ Index: packages/OpenIPMI/avoid-echo-e.patch diff -u /dev/null packages/OpenIPMI/avoid-echo-e.patch:1.1 --- /dev/null Mon Aug 15 15:22:12 2011 +++ packages/OpenIPMI/avoid-echo-e.patch Mon Aug 15 15:22:06 2011 @@ -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" ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/OpenIPMI/OpenIPMI.spec?r1=1.73&r2=1.74&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
