commit 1c261e392e0c1a3e97edc006fba3cff29c97981f Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Sun Jun 17 21:31:52 2018 +0200
- updated to 2.0.25 - updated link patch - removed obsolete pthread,avoid-echo-e,missing patches OpenIPMI-link.patch | 10 +++++----- OpenIPMI-missing.patch | 43 ------------------------------------------- OpenIPMI-pthread.patch | 10 ---------- OpenIPMI.spec | 12 +++--------- avoid-echo-e.patch | 32 -------------------------------- 5 files changed, 8 insertions(+), 99 deletions(-) --- diff --git a/OpenIPMI.spec b/OpenIPMI.spec index c9b9e90..46532f5 100644 --- a/OpenIPMI.spec +++ b/OpenIPMI.spec @@ -5,16 +5,13 @@ Summary: IPMI abstraction layer Summary(pl.UTF-8): Warstwa abstrakcji IPMI Name: OpenIPMI -Version: 2.0.22 -Release: 4 +Version: 2.0.25 +Release: 1 License: LGPL v2+ (library), GPL v2+ (ipmicmd) Group: Libraries Source0: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz -# Source0-md5: 9a4e1f6bb073379c494839201ea10aee +# Source0-md5: 1461ac4d78fc516646fd0a6e605a8b05 Patch0: %{name}-link.patch -Patch1: %{name}-pthread.patch -Patch2: avoid-echo-e.patch -Patch3: %{name}-missing.patch URL: http://openipmi.sourceforge.net/ BuildRequires: autoconf >= 2.50 BuildRequires: automake @@ -116,9 +113,6 @@ Graficzny interfejs użytkownika do OpenIPMI. %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build %{__libtoolize} diff --git a/OpenIPMI-link.patch b/OpenIPMI-link.patch index dd8cae9..def160f 100644 --- a/OpenIPMI-link.patch +++ b/OpenIPMI-link.patch @@ -1,11 +1,11 @@ ---- OpenIPMI-2.0.1/ui/Makefile.am.orig 2005-03-31 22:57:41.000000000 +0200 -+++ OpenIPMI-2.0.1/ui/Makefile.am 2005-06-26 21:44:21.903589616 +0200 -@@ -22,7 +22,7 @@ +--- OpenIPMI-2.0.25/ui/Makefile.am.orig 2018-06-17 10:15:38.938408822 +0200 ++++ OpenIPMI-2.0.25/ui/Makefile.am 2018-06-17 10:16:26.528408279 +0200 +@@ -14,7 +14,7 @@ lib_LTLIBRARIES = libOpenIPMIui.la libOpenIPMIui_la_SOURCES = ui.c ui_os.c ui_keypad.c ui_command.c -libOpenIPMIui_la_LIBADD = +libOpenIPMIui_la_LIBADD = $(top_builddir)/lib/libOpenIPMI.la $(top_builddir)/unix/libOpenIPMIposix.la -lncurses - libOpenIPMIui_la_LDFLAGS = -version-info $(LD_VERSION) \ - -Wl,-Map -Wl,libOpenIPMIui.map + libOpenIPMIui_la_LDFLAGS = -version-info $(LD_VERSION) + ipmi_ui_SOURCES = basic_ui.c diff --git a/OpenIPMI-missing.patch b/OpenIPMI-missing.patch deleted file mode 100644 index ebcf90d..0000000 --- a/OpenIPMI-missing.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- OpenIPMI-2.0.22/swig/python/openipmigui/gui_winsys.py.orig 1970-01-01 01:00:00.000000000 +0100 -+++ OpenIPMI-2.0.22/swig/python/openipmigui/gui_winsys.py 2016-10-16 08:07:29.744173337 +0200 -@@ -0,0 +1,40 @@ -+# gui.py -+# -+# main openipmi GUI handling -+# -+# Author: MontaVista Software, Inc. -+# Corey Minyard <miny...@mvista.com> -+# sou...@mvista.com -+# -+# Copyright 2005 MontaVista Software Inc. -+# -+# This program is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Lesser General Public License -+# as published by the Free Software Foundation; either version 2 of -+# the License, or (at your option) any later version. -+# -+# -+# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED -+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR -+# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -+# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+# -+# You should have received a copy of the GNU Lesser General Public -+# License along with this program; if not, write to the Free -+# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+# -+ -+try: -+ winsys = self.tk.eval("return [ tk windowingsystem ]") -+ pass -+except: -+ # Assume x11 -+ winsys = "x11" -+ pass -+ diff --git a/OpenIPMI-pthread.patch b/OpenIPMI-pthread.patch deleted file mode 100644 index 358a528..0000000 --- a/OpenIPMI-pthread.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ./OpenIPMIpthread.pc.in.org 2005-08-17 05:56:02.000000000 +0200 -+++ ./OpenIPMIpthread.pc.in 2008-11-02 00:50:16.748169294 +0100 -@@ -6,6 +6,6 @@ includedir=@includedir@ - Name: OpenIPMIpthread - Description: Pthread OS handler for OpenIPMI - Version: @VERSION@ --Requires: OpenIPMI pthread -+Requires: OpenIPMI - Libs: -L${libdir} -lOpenIPMIutils -lOpenIPMIpthread - Cflags: -I${includedir} diff --git a/avoid-echo-e.patch b/avoid-echo-e.patch deleted file mode 100644 index bf0c7b4..0000000 --- a/avoid-echo-e.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- OpenIPMI-2.0.18/configure.ac.wiget 2011-08-15 14:56:33.536069856 +0200 -+++ OpenIPMI-2.0.18/configure.ac 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" ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/OpenIPMI.git/commitdiff/1c261e392e0c1a3e97edc006fba3cff29c97981f _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit