[packages/librtas] - up to 2.0.1 (new sonames, license is LGPL now) - removed outdated lib64,format,verbose patches - a

qboosh qboosh at pld-linux.org
Mon Sep 5 22:34:38 CEST 2016 

commit dce6260344b47fcd6ff5e9ac9224cddaf3952fac
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Sep 5 22:36:00 2016 +0200

    - up to 2.0.1 (new sonames, license is LGPL now)
    - removed outdated lib64,format,verbose patches
    - added pc patch (fix Libs in .pc file)

 librtas-format.patch  | 33 --------------------------------
 librtas-lib64.patch   | 11 -----------
 librtas-pc.patch      |  9 +++++++++
 librtas-verbose.patch | 22 ---------------------
 librtas.spec          | 53 ++++++++++++++++++++++++++++-----------------------
 5 files changed, 38 insertions(+), 90 deletions(-)
---
diff --git a/librtas.spec b/librtas.spec
index de53ee6..7af96b5 100644
--- a/librtas.spec
+++ b/librtas.spec
@@ -1,16 +1,19 @@
 Summary:	Libraries for user-space access to the Run-Time Abstraction Services
 Summary(pl.UTF-8):	Biblioteki do dostępu do RTAS z przestrzeni użytkownika
 Name:		librtas
-Version:	1.3.13
+Version:	2.0.1
 Release:	1
-License:	CPL v1.0
+License:	LGPL v2.1+
 Group:		Libraries
-Source0:	http://downloads.sourceforge.net/librtas/%{name}-%{version}.tar.gz
-# Source0-md5:	4b3e2ef81f80d8f05dad878f3d2bb640
-Patch0:		%{name}-lib64.patch
-Patch1:		%{name}-format.patch
-Patch2:		%{name}-verbose.patch
-URL:		http://librtas.sourceforge.net/
+#Source0Download: https://github.com/nfont/librtas/releases
+Source0:	https://github.com/nfont/librtas/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	3a3ee6c9aecef7721b5045bdd14daaa8
+Patch0:		%{name}-pc.patch
+URL:		https://github.com/nfont/librtas
+BuildRequires:	autoconf >= 2.50
+BuildRequires:	automake >= 1:1.11
+BuildRequires:	libtool >= 2:2
+BuildRequires:	pkgconfig
 # uses PowerPC-specific RTAS proc files/syscalls
 ExclusiveArch:	ppc ppc64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -51,13 +54,17 @@ Statyczna biblioteka librtas.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
-CFLAGS="%{rpmcflags}" \
-%{__make} \
-	CC="%{__cc}"
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+	--disable-silent-rules
+
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -65,8 +72,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install librtas_src/librtas.a $RPM_BUILD_ROOT%{_libdir}
-/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/librtas*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -76,23 +83,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc COPYRIGHT Changelog README
-%attr(755,root,root) %{_libdir}/libofdt.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libofdt.so.1
+%doc Changelog README
 %attr(755,root,root) %{_libdir}/librtas.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/librtas.so.1
+%attr(755,root,root) %ghost %{_libdir}/librtas.so.2
 %attr(755,root,root) %{_libdir}/librtasevent.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/librtasevent.so.1
+%attr(755,root,root) %ghost %{_libdir}/librtasevent.so.2
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libofdt.so
 %attr(755,root,root) %{_libdir}/librtas.so
 %attr(755,root,root) %{_libdir}/librtasevent.so
-%{_includedir}/common.h
-%{_includedir}/libofdt.h
-%{_includedir}/librtas*.h
+%{_includedir}/librtas.h
+%{_includedir}/librtasevent*.h
+%{_pkgconfigdir}/librtas.pc
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/librtas.a
+%{_libdir}/librtasevent.a
diff --git a/librtas-format.patch b/librtas-format.patch
deleted file mode 100644
index 710dafd..0000000
--- a/librtas-format.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- librtas-1.3.13/librtasevent_src/print_rtas_event.c.orig	2014-10-23 04:23:41.000000000 +0200
-+++ librtas-1.3.13/librtasevent_src/print_rtas_event.c	2015-07-01 21:23:45.884757758 +0200
-@@ -330,7 +330,7 @@
- 
-             if (newline != NULL) {
-                 prnt_len = newline - &tmpbuf[offset] + 1;
--                snprintf(buf + buf_offset, prnt_len, &tmpbuf[offset]);
-+                snprintf(buf + buf_offset, prnt_len, "%s", &tmpbuf[offset]);
-                 buf_offset = strlen(buf);
-                 buf_offset += snprintf(buf + buf_offset,
- 				       sizeof(buf) - buf_offset, "\n");
-@@ -350,7 +350,7 @@
-             }
- 
-             /* print up to the last brkpt */
--            snprintf(buf + buf_offset, prnt_len, &tmpbuf[offset]);
-+            snprintf(buf + buf_offset, prnt_len, "%s", &tmpbuf[offset]);
-             buf_offset = strlen(buf);
-             buf_offset += snprintf(buf + buf_offset, sizeof(buf) - buf_offset,
- 				   "\n");
-@@ -361,10 +361,10 @@
-     } 
- 
-     prnt_len = snprintf(buf + buf_offset, sizeof(buf) - buf_offset,
--			&tmpbuf[offset]);
-+			"%s", &tmpbuf[offset]);
-     line_offset += prnt_len;
- 
--    return fprintf(ostream, buf);
-+    return fprintf(ostream, "%s", buf);
- }
- 
- /** 
diff --git a/librtas-lib64.patch b/librtas-lib64.patch
deleted file mode 100644
index bd19c5a..0000000
--- a/librtas-lib64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- librtas-1.3.8/rules.mk.orig	2013-01-31 19:30:53.000000000 +0100
-+++ librtas-1.3.8/rules.mk	2013-02-02 16:54:44.392521243 +0100
-@@ -111,7 +111,7 @@
- #
- # $1 library to examine
- define is_lib64
--$(findstring 64,$(shell file $(firstword $1)))
-+$(subst -bit,,$(findstring 64-bit,$(shell file $(firstword $1))))
- endef
- 
- #
diff --git a/librtas-pc.patch b/librtas-pc.patch
new file mode 100644
index 0000000..84dfc7c
--- /dev/null
+++ b/librtas-pc.patch
@@ -0,0 +1,9 @@
+--- librtas-2.0.1/librtas.pc.in.orig	2016-07-12 00:06:49.000000000 +0200
++++ librtas-2.0.1/librtas.pc.in	2016-09-05 21:55:02.052294029 +0200
+@@ -6,5 +6,4 @@
+ Name: librtas
+ Description: The librtas package provides an interface for Run-Time Abstraction Services (RTAS) calls on PAPR platforms. The libraries allow users to examine and manipulate hardware, and parse RTAS events.
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lrtas-2.0 -lofdt-2.0 -lrtasevent-2.0
+-Cflags: -I${includedir}/librtas-2.0 -I${libdir}/librtas-2.0/include
++Libs: -L${libdir} -lrtas -lrtasevent
diff --git a/librtas-verbose.patch b/librtas-verbose.patch
deleted file mode 100644
index 5ff7950..0000000
--- a/librtas-verbose.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- librtas-1.3.13/rules.mk.orig	2015-07-01 21:13:58.128115757 +0200
-+++ librtas-1.3.13/rules.mk	2015-07-01 21:24:28.838089289 +0200
-@@ -210,7 +210,6 @@
- 
- # Default target for building object files
- %.o: %.c
--	@echo "CC $(WORK_DIR)/$@"
--	@$(CC) -c $(CFLAGS) $<
-+	$(CC) -c $(CFLAGS) $<
- 
- 
---- librtas-1.3.13/Makefile.orig	2014-10-23 04:23:41.000000000 +0200
-+++ librtas-1.3.13/Makefile	2015-07-01 21:35:00.668062773 +0200
-@@ -4,8 +4,6 @@
- 
- include rules.mk
- 
--.SILENT:
--
- FILES = README COPYRIGHT
- SUBDIRS = librtas_src librtasevent_src libofdt_src
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/librtas.git/commitdiff/dce6260344b47fcd6ff5e9ac9224cddaf3952fac

More information about the pld-cvs-commit mailing list