[packages/reiser4progs] - updated to 1.1.0 (note: new sonames) - added minimal patch (fixes libreiser4-minimal)

[qboosh]

commit 9f6a326ec5aa80bf5247e9a21610632fd962aba2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Oct 31 22:42:01 2015 +0100

    - updated to 1.1.0 (note: new sonames)
    - added minimal patch (fixes libreiser4-minimal)

 reiser4progs-minimal.patch | 20 ++++++++++++++++++++
 reiser4progs.spec          | 20 +++++++++++---------
 2 files changed, 31 insertions(+), 9 deletions(-)
---
diff --git a/reiser4progs.spec b/reiser4progs.spec
index 130f97a..f4cda37 100644
--- a/reiser4progs.spec
+++ b/reiser4progs.spec
@@ -4,17 +4,18 @@ Summary(pt_BR.UTF-8):	Este pacote contém os utilitários para manipulação do
 Summary(ru.UTF-8):	Утилиты для работы с файловой системой Reiser4
 Summary(uk.UTF-8):	Утиліти для роботы з файловою системою Reiser4
 Name:		reiser4progs
-Version:	1.0.9
-Release:	2
+Version:	1.1.0
+Release:	1
 License:	GPL v2
 Group:		Applications/System
 Source0:	http://downloads.sourceforge.net/reiser4/%{name}-%{version}.tar.gz
-# Source0-md5:	1fe5dce409277d8209ea28f32c6b199f
+# Source0-md5:	4abfda040a0ef152bc2f42152e247a5e
 Patch0:		%{name}-opt.patch
 Patch1:		%{name}-libaal.patch
 Patch2:		%{name}-libreiser4-no-libmisc.patch
 Patch3:		%{name}-am.patch
 Patch4:		%{name}-format-security.patch
+Patch5:		%{name}-minimal.patch
 URL:		http://sourceforge.net/projects/reiser4/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -95,6 +96,7 @@ Statyczne biblioteki reiser4progs.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %{__libtoolize}
@@ -138,12 +140,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/make_reiser4
 %attr(755,root,root) %{_sbindir}/measurefs.reiser4
 %attr(755,root,root) %{_sbindir}/mkfs.reiser4
-%attr(755,root,root) /%{_lib}/libreiser4-1.0.so.*.*.*
-%attr(755,root,root) %ghost /%{_lib}/libreiser4-1.0.so.9
-%attr(755,root,root) /%{_lib}/libreiser4-minimal-1.0.so.*.*.*
-%attr(755,root,root) %ghost /%{_lib}/libreiser4-minimal-1.0.so.9
-%attr(755,root,root) /%{_lib}/librepair-1.0.so.*.*.*
-%attr(755,root,root) %ghost /%{_lib}/librepair-1.0.so.9
+%attr(755,root,root) /%{_lib}/libreiser4-1.1.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libreiser4-1.1.so.0
+%attr(755,root,root) /%{_lib}/libreiser4-minimal-1.1.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libreiser4-minimal-1.1.so.0
+%attr(755,root,root) /%{_lib}/librepair-1.1.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/librepair-1.1.so.0
 %{_mandir}/man8/debugfs.reiser4.8*
 %{_mandir}/man8/fsck.reiser4.8*
 %{_mandir}/man8/measurefs.reiser4.8*
diff --git a/reiser4progs-minimal.patch b/reiser4progs-minimal.patch
new file mode 100644
index 0000000..33e2e13
--- /dev/null
+++ b/reiser4progs-minimal.patch
@@ -0,0 +1,20 @@
+In case of libreiser4-minimal, disable node41_sync() as it isn't used in function table
+and references node40_sync(), which is disabled in minimal build.
+--- reiser4progs-1.1.0/plugin/node/node41/node41.c.orig	2015-08-23 19:14:57.000000000 +0200
++++ reiser4progs-1.1.0/plugin/node/node41/node41.c	2015-10-31 21:49:54.038318250 +0100
+@@ -74,13 +74,13 @@
+ 	return entity;
+ }
+ 
++#ifndef ENABLE_MINIMAL
++
+ errno_t node41_sync(reiser4_node_t *entity) {
+ 	csum_node41(entity, 0 /* update */);
+ 	return node40_sync(entity);
+ }
+ 
+-#ifndef ENABLE_MINIMAL
+-
+ /* Returns maximal size of item possible for passed node instance */
+ static uint16_t node41_maxspace(reiser4_node_t *entity) {
+ 	aal_assert("edward-8", entity != NULL);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/reiser4progs.git/commitdiff/9f6a326ec5aa80bf5247e9a21610632fd962aba2