Hello community, here is the log from the commit of package OpenIPMI for openSUSE:Factory checked in at 2017-07-04 11:53:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/OpenIPMI (Old) and /work/SRC/openSUSE:Factory/.OpenIPMI.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "OpenIPMI" Tue Jul 4 11:53:31 2017 rev:41 rq:507064 version:2.0.23 Changes: -------- --- /work/SRC/openSUSE:Factory/OpenIPMI/OpenIPMI.changes 2016-09-17 14:35:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.OpenIPMI.new/OpenIPMI.changes 2017-07-04 11:53:33.926142700 +0200 @@ -1,0 +2,15 @@ +Tue Jun 27 11:57:28 UTC 2017 - [email protected] + +- Version update to lates trelease 2.0.23: + * There is no longer actively updated changelog + * Various bugfixes since last git pull from 2016-02-26 +- Drop OpenIPMI-libtool.patch which was merged upstream +- Drop OpenIPMI_2.0.21_to_HEAD.patch patch as it is no longer + needed +- Add patch openipmi-tinfo.patch to detect tinfo properly +- Add patch to fix OpenIPMIpthread pc file (from Fedora) + 0001-Apply-OpenIPMI-2.0.18-pthread-pkgconfig.patch.patch +- Add patch to not bundle libedit (from Fedora) + 0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch + +------------------------------------------------------------------- Old: ---- OpenIPMI-2.0.21.tar.gz OpenIPMI-libtool.patch OpenIPMI_2.0.21_to_HEAD.patch New: ---- 0001-Apply-OpenIPMI-2.0.18-pthread-pkgconfig.patch.patch 0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch OpenIPMI-2.0.23.tar.gz openipmi-tinfo.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenIPMI.spec ++++++ --- /var/tmp/diff_new_pack.UtEA8M/_old 2017-07-04 11:53:34.730029569 +0200 +++ /var/tmp/diff_new_pack.UtEA8M/_new 2017-07-04 11:53:34.734029006 +0200 @@ -1,7 +1,7 @@ # # spec file for package OpenIPMI # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: OpenIPMI -Version: 2.0.21 +Version: 2.0.23 Release: 0 Summary: Provides access to service processors via IPMI License: LGPL-2.1+ @@ -29,12 +29,18 @@ Source3: openipmi-helper Source99: OpenIPMI-rpmlintrc Patch0: OpenIPMI-prefer_perl_vendor.patch -Patch1: OpenIPMI-libtool.patch -Patch2: fix-conversions.patch -Patch3: OpenIPMI/OpenIPMI_2.0.21_to_HEAD.patch +Patch1: fix-conversions.patch +# PATCH-FIX-UPSTREAM patche taken from Fedora fixing pthread.pc search that is +# not present on distribution +Patch2: 0001-Apply-OpenIPMI-2.0.18-pthread-pkgconfig.patch.patch +# PATCH-FIX-UPSTREAM do not use bundled libedit +Patch3: 0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch +# PATCH-FIX-UPSTREAM detect tinfo from ncurses properly +Patch4: openipmi-tinfo.patch BuildRequires: gd-devel BuildRequires: gdbm-devel BuildRequires: glib2-devel +BuildRequires: libedit-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libtool @@ -42,26 +48,22 @@ BuildRequires: net-snmp-devel BuildRequires: openssl-devel BuildRequires: perl-macros -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: popt-devel BuildRequires: python-devel BuildRequires: python-tk BuildRequires: python-xml +BuildRequires: readline-devel BuildRequires: swig +BuildRequires: systemd-rpm-macros BuildRequires: tcl-devel BuildRequires: tix -BuildRequires: pkgconfig(systemd) -PreReq: %fillup_prereq -# FIXME: use proper Requires(pre/post/preun/...) -PreReq: %{install_info_prereq} +Requires(post): %fillup_prereq Provides: ipmi_ui Provides: ipmicmd Provides: ipmilan -BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} -%{perl_requires} -# Perl is sometimes installed in /usr/lib, not /usr/lib64 on 64-bit platforms. -# %define perl_libdir %{_exec_prefix}/lib +%{?perl_requires} %description OpenIPMI is an effort to create a full-function IPMI system to allow @@ -102,29 +104,30 @@ %prep %setup -q -%patch0 -p1 -%patch1 -%patch2 -p1 -%patch3 -p1 +%autopatch -p1 + +rm -rf ./libedit %build -autoreconf --install --force +export EDIT_CFLAGS=`pkg-config --cflags libedit` +export EDIT_LIBS=`pkg-config --libs libedit` +export CFLAGS="-fPIC %{optflags} -fno-strict-aliasing" +autoreconf -fvi %configure --disable-static --with-pic \ --with-openssl=yes \ --with-pythoninstall=%{py_sitedir} \ --with-tcl=yes \ --with-tcllibs=-ltcl%{tcl_version} -# parallel make does not work -make +make -j1 %install -make DESTDIR=%{buildroot} install +%make_install install -d %{buildroot}%{_localstatedir}/adm/fillup-templates install -d %{buildroot}%{_unitdir} -install -d %{buildroot}/sbin +install -d %{buildroot}%{_sbindir} install -m 644 %{SOURCE1} %{buildroot}%{_localstatedir}/adm/fillup-templates install -m 644 %{SOURCE2} %{buildroot}%{_unitdir} -ln -sv %{_sbindir}/service %{buildroot}/sbin/rcipmi +ln -sv service %{buildroot}%{_sbindir}/rcipmi install -d %{buildroot}%{_libexecdir} install -m 755 %{SOURCE3} %{buildroot}%{_libexecdir}/openipmi-helper find %{buildroot} -type f -name "*.la" -delete -print @@ -157,7 +160,7 @@ %doc README README.Force README.MotorolaMXP %{_localstatedir}/adm/fillup-templates/sysconfig.ipmi %{_unitdir}/ipmi.service -/sbin/rcipmi +%{_sbindir}/rcipmi %{_libdir}/libOpenIPMI*.so.* %{_libexecdir}/openipmi-helper %dir %{_sysconfdir}/ipmi ++++++ 0001-Apply-OpenIPMI-2.0.18-pthread-pkgconfig.patch.patch ++++++ >From d058bc9be5ef521882e3226a27e81cca8aded5ce Mon Sep 17 00:00:00 2001 From: Boris Ranto <[email protected]> Date: Thu, 2 Jun 2016 12:46:39 +0200 Subject: [PATCH] Apply 'OpenIPMI-2.0.18-pthread-pkgconfig.patch' Signed-off-by: Boris Ranto <[email protected]> --- OpenIPMIpthread.pc.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenIPMIpthread.pc.in b/OpenIPMIpthread.pc.in index 59b52e5..fffa0d0 100644 --- a/OpenIPMIpthread.pc.in +++ b/OpenIPMIpthread.pc.in @@ -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} +Cflags: -I${includedir} -pthread -- 2.7.4 ++++++ 0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch ++++++ >From db70db7ddbbf34806927e279b969b6667005cd5b Mon Sep 17 00:00:00 2001 From: Boris Ranto <[email protected]> Date: Thu, 2 Jun 2016 12:50:03 +0200 Subject: [PATCH] Apply 'OpenIPMI-2.0.21-nobundle.patch' Signed-off-by: Boris Ranto <[email protected]> --- Makefile.am | 4 ++-- cmdlang/Makefile.am | 5 +++-- configure.ac | 1 - sample/Makefile.am | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index b1aacdf..660c693 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,10 @@ RPM = rpmbuild RPMFLAGS = -ta -SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) libedit cmdlang \ +SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) cmdlang \ ui lanserv sample doc man $(SWIG_DIR) -DIST_SUBDIRS = include utils lib unix glib tcl libedit cmdlang \ +DIST_SUBDIRS = include utils lib unix glib tcl cmdlang \ ui lanserv sample doc man swig EXTRA_DIST = FAQ TODO README.Force README.MotorolaMXP OpenIPMI.spec.in \ diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am index e80090d..ae9c65a 100644 --- a/cmdlang/Makefile.am +++ b/cmdlang/Makefile.am @@ -4,7 +4,8 @@ LD_VERSION = 0:5:0 AM_CFLAGS = -Wall -Wsign-compare -I$(top_builddir)/include \ -I$(top_srcdir)/include \ - -I$(top_srcdir)/libedit -DIPMI_CHECK_LOCKS $(GLIB_CFLAGS) \ + -DIPMI_CHECK_LOCKS $(GLIB_CFLAGS) \ + $(EDIT_CFLAGS) \ $(TCL_CFLAGS) lib_LTLIBRARIES = libOpenIPMIcmdlang.la @@ -25,7 +26,7 @@ openipmish_LDADD = libOpenIPMIcmdlang.la \ $(top_builddir)/utils/libOpenIPMIutils.la \ $(top_builddir)/lib/libOpenIPMI.la \ $(top_builddir)/unix/libOpenIPMIposix.la \ - $(top_builddir)/libedit/libedit.a \ + $(EDIT_LIBS) \ $(TERM_LIBS) \ $(SNMPLIBS) $(GLIB_LIB) $(GLIB_LIBS) \ $(TCL_LIB) $(TCL_LIBS) \ diff --git a/configure.ac b/configure.ac index 5103556..ae86ac8 100644 --- a/configure.ac +++ b/configure.ac @@ -926,7 +926,6 @@ AC_OUTPUT(Makefile swig/perl/Makefile swig/python/Makefile swig/python/openipmigui/Makefile - libedit/Makefile cmdlang/Makefile include/Makefile include/OpenIPMI/Makefile diff --git a/sample/Makefile.am b/sample/Makefile.am index 06278bd..91d1351 100644 --- a/sample/Makefile.am +++ b/sample/Makefile.am @@ -59,8 +59,8 @@ solterm_LDADD = $(POPTLIBS) $(top_builddir)/utils/libOpenIPMIutils.la \ rmcp_ping_SOURCES = rmcp_ping.c ipmi_serial_bmc_emu_SOURCES = ipmi_serial_bmc_emu.c -ipmi_serial_bmc_emu_LDADD = $(top_builddir)/libedit/libedit.a $(TERM_LIBS) -ipmi_serial_bmc_emu_CFLAGS = -I $(top_srcdir)/libedit +ipmi_serial_bmc_emu_LDADD = $(EDIT_LIBS) $(TERM_LIBS) +ipmi_serial_bmc_emu_CFLAGS = $(EDIT_CFLAGS) EXTRA_DIST = example_oem.c -- 2.7.4 ++++++ OpenIPMI-2.0.21.tar.gz -> OpenIPMI-2.0.23.tar.gz ++++++ ++++ 41650 lines of diff (skipped) ++++++ openipmi-tinfo.patch ++++++ diff -ur a/configure.ac b/configure.ac --- a/configure.ac 2014-01-28 20:35:02.000000000 +0100 +++ b/configure.ac 2015-09-23 17:05:03.526010122 +0200 @@ -861,10 +861,12 @@ *-sun-*) AC_DEFINE([_SUNOS], [], [Solaris's term.h does horrid things.]);; esac -AC_CHECK_LIB(curses, tgetent, TERM_LIBS=-lcurses, +PKG_CHECK_MODULES(ncurses, ncurses, TERM_LIBS=$ncurses_LIBS, + [AC_CHECK_LIB(tinfo, tgetent, TERM_LIBS=-ltinfo, + [AC_CHECK_LIB(curses, tgetent, TERM_LIBS=-lcurses, [AC_CHECK_LIB(ncursesw, tgetent, TERM_LIBS=-lncursesw, [AC_CHECK_LIB(ncurses, tgetent, TERM_LIBS=-lncurses, - [AC_MSG_ERROR([libtermcap, libcurses or libncurses are required!])])] )] ) + [AC_MSG_ERROR([libtinfo, libtermcap, libcurses or libncurses are required!])])] )] )] )] ) # Checks for header files. AC_FUNC_ALLOCA
