Update to latest upstream 1.1.13

Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
This commit is contained in:
Vasant Hegde 2014-09-22 22:08:49 +05:30
parent 8392aff025
commit 1c3ea26f7e
3 changed files with 6 additions and 38 deletions

View File

@ -1,31 +0,0 @@
From 2010e6f69db3e5ab97dc79c46f815d3d4a059816 Mon Sep 17 00:00:00 2001
From: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Date: Wed, 9 Apr 2014 11:02:27 +0530
Subject: [PATCH] License: Grant permission to link with librtas library
Reported-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Reviewed-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
---
COPYING | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/COPYING b/COPYING
index 08ddefd..1d4adb7 100644
--- a/COPYING
+++ b/COPYING
@@ -1,3 +1,11 @@
+Special Exception:
+ As a special exception, IBM gives permission to link the code
+of portions of this program against the librtas library, and
+distribute linked combinations including the two. You must obey
+the GNU General Public License in all respects for all of the
+code used other than librtas.
+
+
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
--
1.8.3.1

View File

@ -1,6 +1,6 @@
Name: servicelog
Version: 1.1.12
Release: 5%{?dist}
Version: 1.1.13
Release: 1%{?dist}
Summary: Servicelog Tools
Group: System Environment/Base
@ -16,9 +16,6 @@ BuildRequires: autoconf libtool librtas-devel help2man
# because of librtas-devel in libservicelog
ExclusiveArch: ppc ppc64 ppc64le
# Grant permission to link with librtas library
Patch0: servicelog-1.1.12-fix-license-issue.patch
%description
Command-line interfaces for viewing and manipulating the contents of
the servicelog database. Contains entries that are useful
@ -27,7 +24,6 @@ of service operations that have been performed on the system.
%prep
%setup -q
%patch0 -p1 -b .fix-license-issue
%build
autoreconf -fiv
@ -51,6 +47,9 @@ help2man -s 8 -N $RPM_BUILD_ROOT/%{_sbindir}/slog_common_event > $RPM_BUILD_ROOT
%{_mandir}/man[18]/*.[18]*
%changelog
* Mon Sep 22 2014 Vasant Hegde <hegdevasant@linux.vnet.ibm.com> - 1.1.13
- Update to latest upstream 1.1.13
* Fri Aug 01 2014 Brent Baude <bbaude@redhat.com> - 1.1.12-5
- NVR bump for Fedora 21 build on merged koji

View File

@ -1 +1 @@
70f14346c480b8da67e116699a2777b7 servicelog-1.1.12.tar.gz
374e7bdf26e13cfd3ecb8c1e31bca732 servicelog-1.1.13.tar.gz