Accepting request 282279 from home:posophe:branches:systemsmanagement

Update

OBS-URL: https://build.opensuse.org/request/show/282279
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/ipmiutil?expand=0&rev=29
This commit is contained in:
Andy Cress 2015-01-22 13:31:56 +00:00 committed by Git OBS Bridge
parent ca57894bd0
commit b7f6de1d8e
6 changed files with 28 additions and 23 deletions

View File

@ -1,12 +1,12 @@
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-ipmiutil-2.9.2/configure.ac ./configure.ac diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-ipmiutil-2.9.2/configure.ac ./configure.ac
--- ../orig-ipmiutil-2.9.2/configure.ac 2013-10-09 20:20:02.000000000 +0200 --- ../orig-ipmiutil-2.9.2/configure.ac 2013-10-09 20:20:02.000000000 +0200
+++ ./configure.ac 2013-10-15 08:21:48.521304910 +0200 +++ ./configure.ac 2013-10-15 08:21:48.521304910 +0200
@@ -1,7 +1,7 @@ @@ -2,7 +2,7 @@
dnl Process this file with autoconf to produce a configure script. AC_INIT(ipmiutil,2.9.5)
AC_INIT(util/ipmiutil.c) AC_CONFIG_SRCDIR(util/ipmiutil.c)
AM_INIT_AUTOMAKE(ipmiutil,2.9.2) echo "ipmiutil version ${PACKAGE_VERSION}"
-AM_CONFIG_HEADER(config.h) -AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h) +AC_CONFIG_HEADERS(config.h)
AC_PREFIX_DEFAULT(/usr) AC_PREFIX_DEFAULT(/usr)
AM_INIT_AUTOMAKE()

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c32687d233390364a91d16920dcd7df80c06365ade9e51d74b2af5c5d1acead8
size 1651542

View File

@ -8,7 +8,7 @@ diff -Ndur ipmiutil-2.9.2/scripts/ipmi_info ipmiutil-2.9.2-fix-bashisms/scripts/
- echo -n $"Starting $name: " - echo -n $"Starting $name: "
+ echo -n "Starting $name: " + echo -n "Starting $name: "
echo echo
retval=1 retval=0
PID=0 PID=0
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@

3
ipmiutil-2.9.5.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eb00f0582ee75e1f8d371e398d546ddd7639595b9a0a1f27a84cc6ecb038dbe6
size 1700918

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Jan 21 23:54:03 UTC 2015 - p.drouand@gmail.com
- Update to version 2.9.5
see http://ipmiutil.sourceforge.net/docs/ChangeLog
- Updated patch
* ipmiutil-2.9.2-fix-bashisms.patch > ipmiutil-2.9.5-fix-bashisms.patch
* automake-1_13.patch
- Add a make requirement to perl(Exporter); new upstream dependency
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 17 04:00:00 UTC 2014 - Led <ledest@gmail.com> Mon Nov 17 04:00:00 UTC 2014 - Led <ledest@gmail.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package ipmiutil # spec file for package ipmiutil
# #
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 Andy Cress # Copyright (c) 2012 Andy Cress
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
@ -18,33 +18,30 @@
Name: ipmiutil Name: ipmiutil
Version: 2.9.2 Version: 2.9.5
Release: 1%{?dist} Release: 1%{?dist}
Summary: Easy-to-use IPMI server management utilities Summary: Easy-to-use IPMI server management utilities
License: BSD-3-Clause License: BSD-3-Clause
Group: System/Management Group: System/Management
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch: automake-1_13.patch Patch: automake-1_13.patch
Patch1: %{name}-2.9.2-fix-bashisms.patch Patch1: %{name}-2.9.5-fix-bashisms.patch
Url: http://ipmiutil.sourceforge.net Url: http://ipmiutil.sourceforge.net
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} >= 1210 %if 0%{?suse_version} >= 1210
%define req_systemd 1 %define req_systemd 1
%endif %endif
%if 0%{?req_systemd} %if 0%{?req_systemd}
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: openssl-devel
BuildRequires: systemd BuildRequires: systemd
%define systemd_fls %{_unitdir} %define systemd_fls %{_unitdir}
%else %else
%define systemd_fls %{_datadir}/%{name}
%endif
BuildRequires: gcc BuildRequires: gcc
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libtool BuildRequires: libtool
BuildRequires: openssl-devel BuildRequires: openssl-devel
%define systemd_fls %{_datadir}/%{name} BuildRequires: perl(Exporter)
%endif
%define init_dir %{_initrddir} %define init_dir %{_initrddir}
@ -84,15 +81,11 @@ autoreconf -fiv
make make
%install %install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot}
rm -rf %{buildroot}%{_datadir}/%{name}/ievents.[ch] rm -rf %{buildroot}%{_datadir}/%{name}/ievents.[ch]
rm -rf %{buildroot}%{_datadir}/%{name}/ipmi_sample_evt.[ch] rm -rf %{buildroot}%{_datadir}/%{name}/ipmi_sample_evt.[ch]
rm -rf %{buildroot}%{_datadir}/%{name}/isensor.[ch] rm -rf %{buildroot}%{_datadir}/%{name}/isensor.[ch]
%clean
rm -rf %{buildroot}
%files %files
%defattr(-, root, root, -) %defattr(-, root, root, -)
%dir %{_datadir}/%{name} %dir %{_datadir}/%{name}
@ -118,6 +111,7 @@ rm -rf %{buildroot}
%{_sbindir}/ifirewall %{_sbindir}/ifirewall
%{_sbindir}/ifwum %{_sbindir}/ifwum
%{_sbindir}/ihpm %{_sbindir}/ihpm
%{_sbindir}/iseltime
%{_datadir}/%{name}/ipmiutil_evt %{_datadir}/%{name}/ipmiutil_evt
%{_datadir}/%{name}/ipmiutil_asy %{_datadir}/%{name}/ipmiutil_asy
%{_datadir}/%{name}/ipmiutil_wdt %{_datadir}/%{name}/ipmiutil_wdt
@ -172,6 +166,7 @@ rm -rf %{buildroot}
%{_datadir}/%{name}/ipmi_sample.c %{_datadir}/%{name}/ipmi_sample.c
%{_datadir}/%{name}/Makefile %{_datadir}/%{name}/Makefile
%{_libdir}/libipmiutil.a %{_libdir}/libipmiutil.a
%{_libdir}/libipmiutil.so
%post devel %post devel
/sbin/ldconfig /sbin/ldconfig