New upstream version 2.0.24
This commit is contained in:
parent
0873fda0d6
commit
509d1d0fb9
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,3 +4,4 @@ OpenIPMI-2.0.18.tar.gz
|
||||
/OpenIPMI-2.0.21.tar.gz
|
||||
/OpenIPMI-2.0.22.tar.gz
|
||||
/OpenIPMI-2.0.23.tar.gz
|
||||
/OpenIPMI-2.0.24.tar.gz
|
||||
|
@ -1,18 +1,3 @@
|
||||
From db70db7ddbbf34806927e279b969b6667005cd5b Mon Sep 17 00:00:00 2001
|
||||
From: Boris Ranto <branto@redhat.com>
|
||||
Date: Thu, 2 Jun 2016 12:50:03 +0200
|
||||
Subject: [PATCH] Apply 'OpenIPMI-2.0.21-nobundle.patch'
|
||||
|
||||
Signed-off-by: Boris Ranto <branto@redhat.com>
|
||||
---
|
||||
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 @@
|
||||
@ -28,8 +13,6 @@ index b1aacdf..660c693 100644
|
||||
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
|
||||
@ -51,8 +34,6 @@ index e80090d..ae9c65a 100644
|
||||
$(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
|
||||
@ -63,21 +44,16 @@ index 5103556..ae86ac8 100644
|
||||
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
|
||||
|
||||
--- OpenIPMI-2.0.24/sample/Makefile.am~ 2017-07-27 23:01:19.000000000 +0100
|
||||
+++ OpenIPMI-2.0.24/sample/Makefile.am 2017-12-19 07:52:45.368954855 +0000
|
||||
@@ -73,7 +73,8 @@
|
||||
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_LDADD = $(top_builddir)/libedit/libedit.a $(TERM_LIBS) \
|
||||
$(SOCKETLIB)
|
||||
-ipmi_serial_bmc_emu_CFLAGS = -I $(top_srcdir)/libedit
|
||||
+ipmi_serial_bmc_emu_LDADD = $(EDIT_LIBS) $(TERM_LIBS)
|
||||
+ipmi_serial_bmc_emu_LDADD = $(EDIT_LIBS)
|
||||
+ipmi_serial_bmc_emu_CFLAGS = $(EDIT_CFLAGS)
|
||||
|
||||
EXTRA_DIST = example_oem.c
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,13 +1,12 @@
|
||||
%global _hardened_build 1
|
||||
|
||||
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
|
||||
%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
|
||||
Summary: IPMI (Intelligent Platform Management Interface) library and tools
|
||||
Name: OpenIPMI
|
||||
|
||||
Version: 2.0.23
|
||||
Release: 6%{?dist}
|
||||
Version: 2.0.24
|
||||
Release: 1%{?dist}
|
||||
License: LGPLv2+ and GPLv2+ or BSD
|
||||
Group: System Environment/Base
|
||||
URL: http://sourceforge.net/projects/openipmi/
|
||||
Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz
|
||||
Source1: openipmi.sysconf
|
||||
@ -18,8 +17,7 @@ Patch2: 0002-Apply-.-OpenIPMI-2.0.19-man.patch.patch
|
||||
Patch3: 0003-Apply-OpenIPMI-2.0.21-nobundle.patch.patch
|
||||
|
||||
BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel
|
||||
BuildRequires: openssl-devel python2-devel perl-devel perl-generators tcl-devel tkinter
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: openssl-devel python2-devel perl-devel perl-generators
|
||||
BuildRequires: systemd-units
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: libedit-devel
|
||||
@ -34,7 +32,6 @@ Requires(postun): systemd-units
|
||||
Requires(post): systemd-sysv
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
|
||||
# switch from libedit bundle to system libedit
|
||||
|
||||
%description
|
||||
The Open IPMI project aims to develop an open code base to allow access to
|
||||
@ -42,7 +39,6 @@ platform information using Intelligent Platform Management Interface (IPMI).
|
||||
This package contains the tools of the OpenIPMI project.
|
||||
|
||||
%package libs
|
||||
Group: Development/Libraries
|
||||
Summary: The OpenIPMI runtime libraries
|
||||
|
||||
%description libs
|
||||
@ -50,7 +46,6 @@ The OpenIPMI-libs package contains the runtime libraries for shared binaries
|
||||
and applications.
|
||||
|
||||
%package perl
|
||||
Group: Development/Libraries
|
||||
Summary: IPMI Perl language bindings
|
||||
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
@ -65,7 +60,6 @@ The OpenIPMI-perl package contains the Perl language bindings for OpenIPMI.
|
||||
Provides: %{name}-python = %{version}-%{release}
|
||||
Provides: %{name}-python%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: %{name}-python < %{version}-%{release}
|
||||
Group: Development/Libraries
|
||||
Summary: IPMI Python language bindings
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
|
||||
@ -73,7 +67,6 @@ Requires: %{name}-libs = %{version}-%{release}
|
||||
The OpenIPMI-python package contains the Python language bindings for OpenIPMI.
|
||||
|
||||
%package devel
|
||||
Group: Development/Libraries
|
||||
Summary: The development environment for the OpenIPMI project
|
||||
Requires: pkgconfig
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
@ -85,7 +78,6 @@ of the OpenIPMI project.
|
||||
|
||||
%package lanserv
|
||||
Summary: Emulates an IPMI network listener
|
||||
Group: Utilities
|
||||
Requires: %{name} = %{version}
|
||||
|
||||
%description lanserv
|
||||
@ -93,16 +85,13 @@ This package contains a network IPMI listener.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%autosetup -p1
|
||||
rm -rf ./libedit
|
||||
|
||||
%build
|
||||
export EDIT_CFLAGS=`pkg-config --cflags libedit`
|
||||
export EDIT_LIBS=`pkg-config --libs libedit`
|
||||
export CFLAGS="-fPIC $RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
export CFLAGS="-fPIC %{optflags} -z now -fno-strict-aliasing"
|
||||
|
||||
# generate new configure script we need this since we removed the libedit directory
|
||||
%{__libtoolize} --copy --force --automake
|
||||
@ -113,10 +102,11 @@ export CFLAGS="-fPIC $RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
# libedit end
|
||||
|
||||
%configure \
|
||||
--with-pythoninstall=%{python_sitearch} \
|
||||
LDFLAGS="%{__global_ldflags} -Wl,--as-needed" \
|
||||
--disable-dependency-tracking \
|
||||
--with-tcl=no \
|
||||
--disable-static \
|
||||
--with-pythoninstall=%{python2_sitearch} \
|
||||
--with-tcl=no \
|
||||
--with-tkinter=no
|
||||
|
||||
# https://fedoraproject.org/wiki/Packaging:Guidelines?rd=Packaging/Guidelines#Beware_of_Rpath
|
||||
@ -127,27 +117,19 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
||||
make # not %{?_smp_mflags} safe
|
||||
|
||||
%install
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la
|
||||
make install DESTDIR=%{buildroot}
|
||||
|
||||
install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
|
||||
install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/ipmi
|
||||
install -d ${RPM_BUILD_ROOT}%{_libexecdir}
|
||||
install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}%{_libexecdir}/openipmi-helper
|
||||
install -d ${RPM_BUILD_ROOT}%{_unitdir}
|
||||
install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}%{_unitdir}/ipmi.service
|
||||
install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/modprobe.d
|
||||
install -d %{buildroot}{%{_sysconfdir}/sysconfig,%{_unitdir},%{_libexecdir}}
|
||||
install -m 644 %SOURCE1 %{buildroot}%{_sysconfdir}/sysconfig/ipmi
|
||||
install -m 755 %SOURCE2 %{buildroot}%{_libexecdir}/openipmi-helper
|
||||
install -m 644 %SOURCE3 %{buildroot}%{_unitdir}/ipmi.service
|
||||
install -d %{buildroot}%{_sysconfdir}/modprobe.d
|
||||
|
||||
rm ${RPM_BUILD_ROOT}/%{_mandir}/man1/openipmigui.1
|
||||
rm %{buildroot}/%{_mandir}/man1/openipmigui.1 %{buildroot}%{_libdir}/*.la
|
||||
|
||||
# add missing documentation symlinks
|
||||
if test -L ${RPM_BUILD_ROOT}/%{_bindir}/ipmicmd && ! test -a ${RPM_BUILD_ROOT}/%{_mandir}/man1/ipmicmd.1.gz ; then
|
||||
%{__ln_s} openipmicmd.1.gz ${RPM_BUILD_ROOT}/%{_mandir}/man1/ipmicmd.1.gz
|
||||
fi
|
||||
|
||||
if test -L ${RPM_BUILD_ROOT}/%{_bindir}/ipmish && ! test -a ${RPM_BUILD_ROOT}/%{_mandir}/man1/ipmish.1.gz ; then
|
||||
%{__ln_s} openipmish.1.gz ${RPM_BUILD_ROOT}/%{_mandir}/man1/ipmish.1.gz
|
||||
fi
|
||||
# add missing documentation
|
||||
echo ".so man1/ipmicmd.1"» > %{buildroot}%{_mandir}/man1/ipmicmd.1
|
||||
echo ".so man1/openipmish.1"» > %{buildroot}%{_mandir}/man1/ipmish.1
|
||||
|
||||
%post
|
||||
%systemd_post ipmi.service
|
||||
@ -158,11 +140,11 @@ fi
|
||||
%postun
|
||||
%systemd_postun_with_restart ipmi.service
|
||||
|
||||
%post libs
|
||||
/sbin/ldconfig
|
||||
%post libs -p /sbin/ldconfig
|
||||
%postun libs -p /sbin/ldconfig
|
||||
|
||||
%postun libs
|
||||
/sbin/ldconfig
|
||||
%post lanserv -p /sbin/ldconfig
|
||||
%postun lanserv -p /sbin/ldconfig
|
||||
|
||||
### A sysv => systemd migration contains all of the same scriptlets as a
|
||||
### systemd package. These are additional scriptlets
|
||||
@ -178,7 +160,8 @@ fi
|
||||
/bin/systemctl try-restart ipmi.service >/dev/null 2>&1 || :
|
||||
|
||||
%files
|
||||
%doc CONFIGURING_FOR_LAN COPYING COPYING.BSD COPYING.LIB FAQ README README.Force README.MotorolaMXP
|
||||
%license COPYING COPYING.BSD COPYING.LIB
|
||||
%doc CONFIGURING_FOR_LAN FAQ README README.Force README.MotorolaMXP
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/ipmi
|
||||
%{_libexecdir}/openipmi-helper
|
||||
%{_bindir}/ipmicmd
|
||||
@ -203,13 +186,13 @@ fi
|
||||
|
||||
%files perl
|
||||
%attr(644,root,root) %{perl_vendorarch}/OpenIPMI.pm
|
||||
%{perl_vendorarch}/auto/OpenIPMI/
|
||||
%{perl_vendorarch}/auto/OpenIPMI
|
||||
|
||||
%files -n python2-openipmi
|
||||
%{python_sitearch}/*OpenIPMI*
|
||||
%{python2_sitearch}/*OpenIPMI*
|
||||
|
||||
%files libs
|
||||
%{_libdir}/*.so.*
|
||||
%{_libdir}/libOpenIPMI*.so.*
|
||||
|
||||
%files devel
|
||||
%{_includedir}/OpenIPMI
|
||||
@ -217,20 +200,32 @@ fi
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
|
||||
%files lanserv
|
||||
%defattr(-,root,root)
|
||||
%config(noreplace) %{_sysconfdir}/ipmi/ipmisim1.emu
|
||||
%config(noreplace) %{_sysconfdir}/ipmi/lan.conf
|
||||
%dir %{_sysconfdir}/ipmi
|
||||
%{_bindir}/ipmilan
|
||||
%{_bindir}/ipmi_sim
|
||||
%{_bindir}/sdrcomp
|
||||
%{_libdir}/libIPMIlanserv.so.*
|
||||
%doc %{_mandir}/man8/ipmilan.8*
|
||||
%doc %{_mandir}/man1/ipmi_sim.1*
|
||||
%doc %{_mandir}/man5/ipmi_lan.5*
|
||||
%doc %{_mandir}/man5/ipmi_sim_cmd.5*
|
||||
%{_mandir}/man8/ipmilan.8*
|
||||
%{_mandir}/man1/ipmi_sim.1*
|
||||
%{_mandir}/man5/ipmi_lan.5*
|
||||
%{_mandir}/man5/ipmi_sim_cmd.5*
|
||||
|
||||
%changelog
|
||||
* Thu Oct 19 2017 Josef Ridky <jridky@redhat.com> - 2.0.24-6
|
||||
* Wed Jan 17 2018 Josef Ridky <jridky@redhat.com> - 2.0.24-1
|
||||
- New upstream release 2.0.24
|
||||
- spec update (based on Tomasz Kłoczko's pull request)
|
||||
- reduce the number of SONAME dependencies by use -Wl,--as-needed in LDFLAGS
|
||||
- change COPYING COPYING.BSD COPYING.LIB files as %%license
|
||||
- add %%{_sysconfdir}/ipmi directory to lanserv %%files list
|
||||
- execute /sbin/ldconfig in %%post and %%postun section for lanserv sub-packages
|
||||
- remove desktop-file-utils and GUI related packages from BuildRequires
|
||||
- use roff links instead symlinks to gzipped man pages
|
||||
- use %%autosetup in %%prep
|
||||
- remove Group tags
|
||||
|
||||
* Thu Oct 19 2017 Josef Ridky <jridky@redhat.com> - 2.0.23-6
|
||||
- Rebuilt for python2 package
|
||||
|
||||
* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.0.23-5
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (OpenIPMI-2.0.23.tar.gz) = c1e9678c725dfe9aed539e8e83bbd21968917c407be6f97c2f513dbd5082a31842f756a7e581ef67deadba199231e3cf3edbc870508ed363432271a6ff255fbe
|
||||
SHA512 (OpenIPMI-2.0.24.tar.gz) = de1e0a46d7e25af06e07a0f5b8e23deac14d2bca854fbe09b221e776b46b5cf13b5af6b7ee1e8d0984eb792aa4bd095d66d98775674809feafe0a357ca95d677
|
||||
|
Loading…
Reference in New Issue
Block a user