From b7f6de1d8eea98de78edce998873542742615a6d95a036f6c4710af6d3873ce3 Mon Sep 17 00:00:00 2001 From: Andy Cress Date: Thu, 22 Jan 2015 13:31:56 +0000 Subject: [PATCH] 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 --- automake-1_13.patch | 12 +++++------ ipmiutil-2.9.2.tar.gz | 3 --- ...patch => ipmiutil-2.9.5-fix-bashisms.patch | 2 +- ipmiutil-2.9.5.tar.gz | 3 +++ ipmiutil.changes | 10 +++++++++ ipmiutil.spec | 21 +++++++------------ 6 files changed, 28 insertions(+), 23 deletions(-) delete mode 100644 ipmiutil-2.9.2.tar.gz rename ipmiutil-2.9.2-fix-bashisms.patch => ipmiutil-2.9.5-fix-bashisms.patch (99%) create mode 100644 ipmiutil-2.9.5.tar.gz diff --git a/automake-1_13.patch b/automake-1_13.patch index 9537da0..f5ec570 100644 --- a/automake-1_13.patch +++ b/automake-1_13.patch @@ -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 --- ../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 -@@ -1,7 +1,7 @@ - dnl Process this file with autoconf to produce a configure script. - AC_INIT(util/ipmiutil.c) - AM_INIT_AUTOMAKE(ipmiutil,2.9.2) +@@ -2,7 +2,7 @@ + AC_INIT(ipmiutil,2.9.5) + AC_CONFIG_SRCDIR(util/ipmiutil.c) + echo "ipmiutil version ${PACKAGE_VERSION}" -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS(config.h) - - AC_PREFIX_DEFAULT(/usr) + AC_PREFIX_DEFAULT(/usr) + AM_INIT_AUTOMAKE() diff --git a/ipmiutil-2.9.2.tar.gz b/ipmiutil-2.9.2.tar.gz deleted file mode 100644 index 2f2ef49..0000000 --- a/ipmiutil-2.9.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c32687d233390364a91d16920dcd7df80c06365ade9e51d74b2af5c5d1acead8 -size 1651542 diff --git a/ipmiutil-2.9.2-fix-bashisms.patch b/ipmiutil-2.9.5-fix-bashisms.patch similarity index 99% rename from ipmiutil-2.9.2-fix-bashisms.patch rename to ipmiutil-2.9.5-fix-bashisms.patch index 51ac5dd..37e491e 100644 --- a/ipmiutil-2.9.2-fix-bashisms.patch +++ b/ipmiutil-2.9.5-fix-bashisms.patch @@ -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 - retval=1 + retval=0 PID=0 @@ -66,7 +66,7 @@ diff --git a/ipmiutil-2.9.5.tar.gz b/ipmiutil-2.9.5.tar.gz new file mode 100644 index 0000000..04d5db4 --- /dev/null +++ b/ipmiutil-2.9.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb00f0582ee75e1f8d371e398d546ddd7639595b9a0a1f27a84cc6ecb038dbe6 +size 1700918 diff --git a/ipmiutil.changes b/ipmiutil.changes index 85a86af..c7e6af4 100644 --- a/ipmiutil.changes +++ b/ipmiutil.changes @@ -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 diff --git a/ipmiutil.spec b/ipmiutil.spec index 5cf3ec2..7c70e7f 100644 --- a/ipmiutil.spec +++ b/ipmiutil.spec @@ -1,7 +1,7 @@ # # 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 # # All modifications and additions to the file contributed by third parties @@ -18,33 +18,30 @@ Name: ipmiutil -Version: 2.9.2 +Version: 2.9.5 Release: 1%{?dist} Summary: Easy-to-use IPMI server management utilities License: BSD-3-Clause Group: System/Management Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} >= 1210 %define req_systemd 1 %endif %if 0%{?req_systemd} -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: libtool -BuildRequires: openssl-devel BuildRequires: systemd %define systemd_fls %{_unitdir} %else +%define systemd_fls %{_datadir}/%{name} +%endif BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: openssl-devel -%define systemd_fls %{_datadir}/%{name} -%endif +BuildRequires: perl(Exporter) %define init_dir %{_initrddir} @@ -84,15 +81,11 @@ autoreconf -fiv make %install -rm -rf %{buildroot} make install DESTDIR=%{buildroot} rm -rf %{buildroot}%{_datadir}/%{name}/ievents.[ch] rm -rf %{buildroot}%{_datadir}/%{name}/ipmi_sample_evt.[ch] rm -rf %{buildroot}%{_datadir}/%{name}/isensor.[ch] -%clean -rm -rf %{buildroot} - %files %defattr(-, root, root, -) %dir %{_datadir}/%{name} @@ -118,6 +111,7 @@ rm -rf %{buildroot} %{_sbindir}/ifirewall %{_sbindir}/ifwum %{_sbindir}/ihpm +%{_sbindir}/iseltime %{_datadir}/%{name}/ipmiutil_evt %{_datadir}/%{name}/ipmiutil_asy %{_datadir}/%{name}/ipmiutil_wdt @@ -172,6 +166,7 @@ rm -rf %{buildroot} %{_datadir}/%{name}/ipmi_sample.c %{_datadir}/%{name}/Makefile %{_libdir}/libipmiutil.a +%{_libdir}/libipmiutil.so %post devel /sbin/ldconfig