[packages/OpenIPMI] - updated to 2.0.28 - added tcl patch (support tcl headers directly in /usr/include again)

qboosh qboosh at pld-linux.org
Fri Feb 14 15:39:14 CET 2020


commit 7a27fd13cf82af527e8ae65f1107a37bd938b7f4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Feb 14 15:39:41 2020 +0100

    - updated to 2.0.28
    - added tcl patch (support tcl headers directly in /usr/include again)

 OpenIPMI-tcl.patch | 11 +++++++++++
 OpenIPMI.spec      | 16 +++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)
---
diff --git a/OpenIPMI.spec b/OpenIPMI.spec
index dbd93c6..dd390f0 100644
--- a/OpenIPMI.spec
+++ b/OpenIPMI.spec
@@ -1,3 +1,4 @@
+# TODO: python3 module
 #
 # Conditional build:
 %bcond_without	gui	# don't build tkinter-based GUI
@@ -5,13 +6,14 @@
 Summary:	IPMI abstraction layer
 Summary(pl.UTF-8):	Warstwa abstrakcji IPMI
 Name:		OpenIPMI
-Version:	2.0.25
-Release:	5
+Version:	2.0.28
+Release:	1
 License:	LGPL v2+ (library), GPL v2+ (ipmicmd)
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz
-# Source0-md5:	1461ac4d78fc516646fd0a6e605a8b05
+# Source0-md5:	ba37f08e306062ec73c7ed2a2bd4d5f4
 Patch0:		%{name}-link.patch
+Patch1:		%{name}-tcl.patch
 URL:		http://openipmi.sourceforge.net/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -113,6 +115,7 @@ Graficzny interfejs użytkownika do OpenIPMI.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -125,7 +128,7 @@ CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses"
 	--with-pythoninstall=%{py_sitescriptdir} \
 	--with-pythoninstalllib=%{py_sitedir} \
 	--without-glib12 \
-	%{!?with_gui:--without-tkinter}
+	--with-tkinter%{!?with_gui:=no}
 %{__make} %{?with_gui:-j1}
 
 %install
@@ -134,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install -j1 \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%py_comp $RPM_BUILD_ROOT%{py_sitescriptdir}
+%py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}
+
 %{__rm} $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a} \
 	$RPM_BUILD_ROOT%{py_sitescriptdir}/*.py \
 	%{?with_gui:$RPM_BUILD_ROOT%{py_sitescriptdir}/openipmigui/*.py}
@@ -212,7 +218,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libOpenIPMItcl.la
 %{_libdir}/libOpenIPMIui.la
 %{_libdir}/libOpenIPMIutils.la
-%{_includedir}/%{name}
+%{_includedir}/OpenIPMI
 %{_pkgconfigdir}/OpenIPMI.pc
 %{_pkgconfigdir}/OpenIPMIcmdlang.pc
 %{_pkgconfigdir}/OpenIPMIglib.pc
diff --git a/OpenIPMI-tcl.patch b/OpenIPMI-tcl.patch
new file mode 100644
index 0000000..85bfd3d
--- /dev/null
+++ b/OpenIPMI-tcl.patch
@@ -0,0 +1,11 @@
+--- OpenIPMI-2.0.28/configure.ac.orig	2019-12-12 17:39:40.000000000 +0100
++++ OpenIPMI-2.0.28/configure.ac	2020-02-14 07:15:42.849858578 +0100
+@@ -369,7 +369,7 @@
+    FOUND_TCL_HEADER=no
+    ver=`echo 'puts \$tcl_version' | tclsh`
+    if test "x$tclcflags" = "x"; then
+-      AC_CHECK_HEADER(tcl/tcl.h, FOUND_TCL_HEADER=yes; )
++      AC_CHECK_HEADER(tcl.h, FOUND_TCL_HEADER=yes; )
+       if test "x$FOUND_TCL_HEADER" != "xyes"; then
+          AC_CHECK_HEADER(tcl/tcl.h, FOUND_TCL_HEADER=yes; )
+ 	 if test "x$FOUND_TCL_HEADER" == "xyes"; then
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/OpenIPMI.git/commitdiff/7a27fd13cf82af527e8ae65f1107a37bd938b7f4



More information about the pld-cvs-commit mailing list