diff --git a/.gitignore b/.gitignore
index 70b1b4e..68d134f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/librtas-1.4.1.tar.gz
+SOURCES/v2.0.1.tar.gz
diff --git a/.librtas.metadata b/.librtas.metadata
index 75ffebd..ef69c26 100644
--- a/.librtas.metadata
+++ b/.librtas.metadata
@@ -1 +1 @@
-afc6a102535cfc5bc65045a89e4ae2370fee68be SOURCES/librtas-1.4.1.tar.gz
+183b0f8770a14c3203f20107414d3e0d9ead7c52 SOURCES/v2.0.1.tar.gz
diff --git a/SOURCES/librtas-1.3.4-libdir.patch b/SOURCES/librtas-1.3.4-libdir.patch
deleted file mode 100644
index f1cb553..0000000
--- a/SOURCES/librtas-1.3.4-libdir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up librtas-1.3.5/rules.mk.libdir librtas-1.3.5/rules.mk
---- librtas-1.3.5/rules.mk.libdir 2010-01-28 20:04:30.000000000 +0100
-+++ librtas-1.3.5/rules.mk 2011-08-09 15:47:16.842521606 +0200
-@@ -145,7 +145,7 @@ define install_sbin
- endef
-
- define install_lib
-- $(call install_files,$1,755,$2/$(LIB_DIR)$(call is_lib64,$1))
-+ $(call install_files,$1,755,$2/$(LIB_DIR))
- endef
-
- define install_inc
-@@ -188,7 +188,7 @@ define uninstall_sbin
- endef
-
- define uninstall_lib
-- $(call uninstall_files,$1,$2/$(LIB_DIR)$(call is_lib64,$1))
-+ $(call uninstall_files,$1,$2/$(LIB_DIR))
- endef
-
- define uninstall_inc
diff --git a/SOURCES/librtas-1.3.6-ln.patch b/SOURCES/librtas-1.3.6-ln.patch
deleted file mode 100644
index 4168293..0000000
--- a/SOURCES/librtas-1.3.6-ln.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -upr librtas-1.4.1/librtasevent_src/Makefile librtas-1.4.1p/librtasevent_src/Makefile
---- librtas-1.4.1/librtasevent_src/Makefile 2016-03-28 21:59:38.000000000 +0530
-+++ librtas-1.4.1p/librtasevent_src/Makefile 2016-04-29 19:05:27.550567796 +0530
-@@ -39,14 +39,14 @@ all: $(LIBRE_OBJS) $(HEADERS)
- install:
- @$(call install_lib,$(LIBRE),$(DESTDIR))
- @$(call install_inc,$(LIBRE_HDRS),$(DESTDIR))
-- @ln -sf $(LIBRE) $(DESTDIR)/$(LIB_DIR)$(call is_lib64,$(LIBRE))/$(LIBRE_SONAME)
-- @ln -sf $(LIBRE) $(DESTDIR)/$(LIB_DIR)$(call is_lib64,$(LIBRE))/$(LIBRE_SONAME).1
-+ @ln -sf $(LIBRE) $(DESTDIR)/$(LIB_DIR)/$(LIBRE_SONAME)
-+ @ln -sf $(LIBRE) $(DESTDIR)/$(LIB_DIR)/$(LIBRE_SONAME).1
-
- uninstall:
- @$(call uninstall_lib,$(LIBRE),$(DESTDIR))
- @$(call uninstall_inc,$(LIBRE_HDRS),$(DESTDIR))
-- @rm -f $(DESTDIR)/$(LIB_DIR)$(call is_lib64,$(LIBRE))/$(LIBRE_SONAME)
-- @rm -f $(DESTDIR)/$(LIB_DIR)$(call is_lib64,$(LIBRE))/$(LIBRE_SONAME).1
-+ @rm -f $(DESTDIR)/$(LIB_DIR)/$(LIBRE_SONAME)
-+ @rm -f $(DESTDIR)/$(LIB_DIR)/$(LIBRE_SONAME).1
-
- clean:
- @echo "Cleaning up $(WORK_DIR) files..."
-Only in librtas-1.4.1p/librtasevent_src: Makefile.orig
-diff -upr librtas-1.4.1/librtas_src/Makefile librtas-1.4.1p/librtas_src/Makefile
---- librtas-1.4.1/librtas_src/Makefile 2016-03-28 21:59:38.000000000 +0530
-+++ librtas-1.4.1p/librtas_src/Makefile 2016-04-29 19:05:27.550567796 +0530
-@@ -44,14 +44,14 @@ librtas_static: $(LIBRTAS_OBJS) $(HEADER
- install:
- @$(call install_lib,$(LIBRTAS),$(DESTDIR))
- @$(call install_inc,$(HEADERS),$(DESTDIR))
-- @ln -sf $(LIBRTAS) $(DESTDIR)/$(LIB_DIR)$(call is_lib64,$(LIBRTAS))/$(LIBRTAS_SONAME)
-- @ln -sf $(LIBRTAS) $(DESTDIR)/$(LIB_DIR)$(call is_lib64,$(LIBRTAS))/$(LIBRTAS_SONAME).1
-+ @ln -sf $(LIBRTAS) $(DESTDIR)/$(LIB_DIR)/$(LIBRTAS_SONAME)
-+ @ln -sf $(LIBRTAS) $(DESTDIR)/$(LIB_DIR)/$(LIBRTAS_SONAME).1
-
- uninstall:
- @$(call uninstall_lib,$(LIBRTAS),$(DESTDIR))
-- @$(call uninstall_inc,$(HEADERS),$(DESTDIR))
-- @rm -f $(DESTDIR)/$(LIB_DIR)$(call is_lib64,$(LIBRTAS))/$(LIBRTAS_SONAME)
-- @rm -f $(DESTDIR)/$(LIB_DIR)$(call is_lib64,$(LIBRTAS))/$(LIBRTAS_SONAME).1
-+ @$(call uninstall_inc,$(LIBRTAS_HDR),$(DESTDIR))
-+ @rm -f $(DESTDIR)/$(LIB_DIR)/$(LIBRTAS_SONAME)
-+ @rm -f $(DESTDIR)/$(LIB_DIR)/$(LIBRTAS_SONAME).1
-
- clean:
- @echo "Cleaning up $(WORK_DIR) files..."
-Only in librtas-1.4.1p/librtas_src: Makefile.orig
diff --git a/SOURCES/librtas-1.4.1-eeh_tool.patch b/SOURCES/librtas-1.4.1-eeh_tool.patch
deleted file mode 100644
index ea5463e..0000000
--- a/SOURCES/librtas-1.4.1-eeh_tool.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 7f841902eb50ca77c3aa884e3fd924c2bbd817ca Mon Sep 17 00:00:00 2001
-From: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
-Date: Mon, 13 Jun 2016 09:33:57 -0400
-Subject: [PATCH] librtas: Fix endianess issue in errinjct rtas call
-
-Unlike other RTAS calls, first output parameter of "ibm,open-errinjct"
-is "open token", not status value.
-
-With commit ee457b1c, we endedup calling be32toh twice for otoken and
-didn't convert status from BE to host format.
-
-This patch fixes above issue.
-
-Fixes: ee457b1c (librtas: consolidate common actions in making a rtas call)
-
-Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
-Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
-Reviewed-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
----
- librtas_src/syscall_calls.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/librtas_src/syscall_calls.c b/librtas_src/syscall_calls.c
-index cb668dc..a194e4b 100644
---- a/librtas_src/syscall_calls.c
-+++ b/librtas_src/syscall_calls.c
-@@ -466,15 +466,20 @@ int rtas_errinjct_close(int otoken)
- */
- int rtas_errinjct_open(int *otoken)
- {
-- __be32 be_otoken;
-+ __be32 be_status;
- int rc, status;
-
- rc = sanity_check();
- if (rc)
- return rc;
-
-- rc = rtas_call("ibm,open-errinjct", 0, 2, &be_otoken, &status);
-- *otoken = be32toh(be_otoken);
-+ /*
-+ * Unlike other RTAS calls, here first output parameter is otoken,
-+ * not status. rtas_call converts otoken to host endianess. We
-+ * have to convert status parameter.
-+ */
-+ rc = rtas_call("ibm,open-errinjct", 0, 2, otoken, &be_status);
-+ status = be32toh(be_status);
-
- dbg("(%p) = %d, %d\n", otoken, rc ? rc : status, *otoken);
- return rc ? rc : status;
---
-2.4.11
-
diff --git a/SOURCES/librtas-2.0.1-libversion.patch b/SOURCES/librtas-2.0.1-libversion.patch
new file mode 100644
index 0000000..e572c3a
--- /dev/null
+++ b/SOURCES/librtas-2.0.1-libversion.patch
@@ -0,0 +1,27 @@
+From 2c954feaa59657fd8a13cf6e7208c4bf8c46f0dc Mon Sep 17 00:00:00 2001
+From: Sinny Kumari <sinny@redhat.com>
+Date: Sun, 19 Mar 2017 00:21:22 +0530
+Subject: [PATCH] Update library version to 2.0.1 to match with release version
+
+---
+ Makefile.am | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index e02d007..5f819c3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -19,7 +19,9 @@ AM_CFLAGS = -I$(top_srcdir)/librtas_src/ -I$(top_srcdir)/librtasevent_src/
+
+ library_includedir=$(includedir)
+
+-LIBRTAS_LIBRARY_VERSION = 2:0:0
++# CURRENT:REVISION:AGE(C:R:A)
++# For calculating version number of library, formula used is (C - A).(A).(R)
++LIBRTAS_LIBRARY_VERSION = 2:1:0
+
+ lib_LTLIBRARIES += librtas.la
+ librtas_la_LDFLAGS = -version-info $(LIBRTAS_LIBRARY_VERSION)
+--
+2.9.3
+
diff --git a/SPECS/librtas.spec b/SPECS/librtas.spec
index 42e2e39..15393d0 100644
--- a/SPECS/librtas.spec
+++ b/SPECS/librtas.spec
@@ -1,16 +1,17 @@
Summary: Libraries to provide access to RTAS calls and RTAS events
Name: librtas
-Version: 1.4.1
-Release: 2%{?dist}
+Version: 2.0.1
+Release: 1%{?dist}
URL: http://librtas.ozlabs.org
License: LGPL
Group: System Environment/Libraries
-Source: https://github.com/nfont/librtas/archive/%{name}-%{version}.tar.gz
-#Fedora specific patch
-Patch0: %{name}-1.3.4-libdir.patch
-Patch1: %{name}-1.3.6-ln.patch
-Patch2: %{name}-1.4.1-eeh_tool.patch
+Source: https://github.com/nfont/librtas/archive/v%{version}.tar.gz
+
+BuildRequires: autoconf
+BuildRequires: libtool
+
+Patch0: librtas-2.0.1-libversion.patch
Obsoletes: librtas(ppc)
ExclusiveArch: ppc64 ppc64le
@@ -35,48 +36,46 @@ The librtas-devel packages contains the header files necessary for
developing programs using librtas.
%prep
-%setup -q
-%patch0 -p1 -b .libdir
-%patch1 -p1 -b .ln
-%patch2 -p1 -b .ln
-find . -name "*.so.*" -print -delete
-
+%setup -q -n %{name}-%{version}
+%patch0 -p1 -b .ln
%build
+./autogen.sh
# disable "-Werror=format-security" checking gcc option until we fix
# these errors in our code.
+%configure --disable-silent-rules --disable-static
CFLAGS="%{optflags} -fPIC -DPIC -I."
CFLAGS=`echo $CFLAGS | sed 's/-Werror=format-security//'`
-%{__make} CFLAGS="$CFLAGS" %{?_smp_mflags}
+%make_build CFLAGS="$CFLAGS"
%install
-mkdir -p %{buildroot}/%{_libdir}
-%{__make} install DESTDIR=%{buildroot} LIB_DIR=%{_libdir} INSTALL="install -p"
-%{__rm} -rf %{buildroot}%{_datadir}/doc
+%make_install
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+rm -f %{buildroot}/%{_docdir}/librtas/*
+
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%clean
-%{__rm} -rf %{buildroot}
-
%files
%doc COPYING.LESSER README Changelog
-%{_libdir}/librtas.so.%{version}
-%{_libdir}/librtas.so.1
-%{_libdir}/librtasevent.so.%{version}
-%{_libdir}/librtasevent.so.1
+%{_libdir}/librtas.so.*
+%{_libdir}/librtasevent.so.*
%files devel
%{_libdir}/librtas.so
%{_libdir}/librtasevent.so
+%{_libdir}/pkgconfig/librtas.pc
%{_includedir}/librtas.h
%{_includedir}/librtasevent.h
%{_includedir}/librtasevent_v4.h
%{_includedir}/librtasevent_v6.h
%changelog
+* Fri Mar 17 2017 Sinny Kumari <skumari@redhat.com> 2.0.1-1
+- Resolves: #1380656 Rebase to 2.0.1
+
* Mon Jun 27 2016 Sinny Kumari <skumari@redhat.com> 1.4.1-2
- Resolves: #1349878 - EEH_Tool fails to inject error with librtas-1.4.1-1.ppc64le file