[packages/libfvalue] - updated to 20190626 (experimental) - old system-libs patch is obsolete; new one adjusts optional l

qboosh qboosh at pld-linux.org
Thu Jul 18 17:48:14 CEST 2019 

commit 8b189a1eed7147b9acbdb95335cbc5829c14e834
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Jul 18 17:50:00 2019 +0200

    - updated to 20190626 (experimental)
    - old system-libs patch is obsolete; new one adjusts optional libraries checks in case of system libs detection using pkg-config

 libfvalue-system-libs.patch | 238 +++++++++++++++++++++++++++++++-------------
 libfvalue.spec              |  71 +++++++------
 2 files changed, 208 insertions(+), 101 deletions(-)
---
diff --git a/libfvalue.spec b/libfvalue.spec
index 40766f0..90580b4 100644
--- a/libfvalue.spec
+++ b/libfvalue.spec
@@ -1,38 +1,45 @@
+# see m4/${libname}.m4 />= for required version of particular library
+%define		libcdata_ver		20190112
+%define		libcerror_ver		20120425
+%define		libcnotify_ver		20120425
+%define		libcthreads_ver		20160404
+%define		libfdatetime_ver	20180910
+%define		libfguid_ver		20120426
+%define		libfwnt_ver		20161103
+%define		libuna_ver		20181006
 Summary:	Library to support various format value types
 Summary(pl.UTF-8):	Biblioteka obsługująca różne typy formatów wartości
 Name:		libfvalue
-Version:	20150104
-Release:	2
+Version:	20190626
+Release:	1
 License:	LGPL v3+
 Group:		Libraries
-Source0:	https://github.com/libyal/libfvalue/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	bd1744914612ada381ca4c18d5348493
+#Source0Download: https://github.com/libyal/libfvalue/releases
+Source0:	https://github.com/libyal/libfvalue/releases/download/%{version}/%{name}-experimental-%{version}.tar.gz
+# Source0-md5:	d5720a0206e2b9a9ea034e3a732ec796
 Patch0:		%{name}-system-libs.patch
 URL:		https://github.com/libyal/libfvalue/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1.6
 BuildRequires:	gettext-tools >= 0.18.1
-BuildRequires:	libcdata-devel >= 20150102
-BuildRequires:	libcerror-devel >= 20120425
-BuildRequires:	libcnotify-devel >= 20120425
-BuildRequires:	libcstring-devel >= 20120425
-BuildRequires:	libcthreads-devel >= 20130509
-BuildRequires:	libfdatetime-devel >= 20130928
-BuildRequires:	libfguid-devel >= 20120426
-BuildRequires:	libfwnt-devel >= 20120426
-BuildRequires:	libuna-devel >= 20120425
+BuildRequires:	libcdata-devel >= %{libcdata_ver}
+BuildRequires:	libcerror-devel >= %{libcerror_ver}
+BuildRequires:	libcnotify-devel >= %{libcnotify_ver}
+BuildRequires:	libcthreads-devel >= %{libcthreads_ver}
+BuildRequires:	libfdatetime-devel >= %{libfdatetime_ver}
+BuildRequires:	libfguid-devel >= %{libfguid_ver}
+BuildRequires:	libfwnt-devel >= %{libfwnt_ver}
+BuildRequires:	libuna-devel >= %{libuna_ver}
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
-BuildRequires:	sed >= 4.0
-Requires:	libcdata >= 20150102
-Requires:	libcerror >= 20120425
-Requires:	libcnotify >= 20120425
-Requires:	libcstring >= 20120425
-Requires:	libcthreads >= 20130509
-Requires:	libfdatetime >= 20130928
-Requires:	libfguid >= 20120426
-Requires:	libfwnt >= 20120426
-Requires:	libuna >= 20120425
+Requires:	libcdata >= %{libcdata_ver}
+Requires:	libcerror >= %{libcerror_ver}
+Requires:	libcnotify >= %{libcnotify_ver}
+Requires:	libcthreads >= %{libcthreads_ver}
+Requires:	libfdatetime >= %{libfdatetime_ver}
+Requires:	libfguid >= %{libfguid_ver}
+Requires:	libfwnt >= %{libfwnt_ver}
+Requires:	libuna >= %{libuna_ver}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -46,15 +53,14 @@ Summary:	Header files for libfvalue library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libfvalue
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	libcdata-devel >= 20150102
-Requires:	libcerror-devel >= 20120425
-Requires:	libcnotify-devel >= 20120425
-Requires:	libcstring-devel >= 20120425
-Requires:	libcthreads-devel >= 20130509
-Requires:	libfdatetime-devel >= 20130928
-Requires:	libfguid-devel >= 20120426
-Requires:	libfwnt-devel >= 20120426
-Requires:	libuna-devel >= 20120425
+Requires:	libcdata-devel >= %{libcdata_ver}
+Requires:	libcerror-devel >= %{libcerror_ver}
+Requires:	libcnotify-devel >= %{libcnotify_ver}
+Requires:	libcthreads-devel >= %{libcthreads_ver}
+Requires:	libfdatetime-devel >= %{libfdatetime_ver}
+Requires:	libfguid-devel >= %{libfguid_ver}
+Requires:	libfwnt-devel >= %{libfwnt_ver}
+Requires:	libuna-devel >= %{libuna_ver}
 
 %description devel
 Header files for libfvalue library.
@@ -80,7 +86,6 @@ Statyczna biblioteka libfvalue.
 
 %build
 %{__gettextize}
-%{__sed} -i -e 's/ po\/Makefile.in//' configure.ac
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
diff --git a/libfvalue-system-libs.patch b/libfvalue-system-libs.patch
index 2e3a4f8..9329a4e 100644
--- a/libfvalue-system-libs.patch
+++ b/libfvalue-system-libs.patch
@@ -1,68 +1,170 @@
---- libfvalue-20150104/configure.ac.orig	2015-01-22 18:32:08.452473545 +0100
-+++ libfvalue-20150104/configure.ac	2015-01-22 20:48:07.308797816 +0100
-@@ -148,15 +148,6 @@ dnl Have configure make the Makefiles
- AC_CONFIG_FILES([Makefile])
- AC_CONFIG_FILES([include/Makefile])
- AC_CONFIG_FILES([common/Makefile])
--AC_CONFIG_FILES([libcstring/Makefile])
--AC_CONFIG_FILES([libcerror/Makefile])
--AC_CONFIG_FILES([libcthreads/Makefile])
--AC_CONFIG_FILES([libcdata/Makefile])
--AC_CONFIG_FILES([libcnotify/Makefile])
--AC_CONFIG_FILES([libuna/Makefile])
--AC_CONFIG_FILES([libfdatetime/Makefile])
--AC_CONFIG_FILES([libfguid/Makefile])
--AC_CONFIG_FILES([libfwnt/Makefile])
- AC_CONFIG_FILES([libfvalue/Makefile])
- AC_CONFIG_FILES([po/Makefile.in])
- AC_CONFIG_FILES([po/Makevars])
---- libfvalue-20150104/Makefile.am.orig	2015-01-22 18:32:07.832473571 +0100
-+++ libfvalue-20150104/Makefile.am	2015-01-22 20:48:22.792130500 +0100
-@@ -3,15 +3,6 @@ ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = \
- 	include \
- 	common \
--	libcstring \
--	libcerror \
--	libcthreads \
--	libcdata \
--	libcnotify \
--	libuna \
--	libfdatetime \
--	libfguid \
--	libfwnt \
- 	libfvalue \
- 	po \
- 	manuals	\
-@@ -62,15 +53,6 @@ lib: library
- 
- library:
- 	(cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libcstring && $(MAKE) $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libcerror && $(MAKE) $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libcthreads && $(MAKE) $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libcdata && $(MAKE) $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libcnotify && $(MAKE) $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libuna && $(MAKE) $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libfdatetime && $(MAKE) $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libfguid && $(MAKE) $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libfwnt && $(MAKE) $(AM_MAKEFLAGS))
- 	(cd $(srcdir)/libfvalue && $(MAKE) $(AM_MAKEFLAGS))
- 	(cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
- 
-@@ -87,15 +69,6 @@ distclean: clean
- 	done && test -z "$$fail"
- 
- splint:
--	(cd $(srcdir)/libcstring && $(MAKE) splint $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libcerror && $(MAKE) splint $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libcthreads && $(MAKE) splint $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libcdate && $(MAKE) splint $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libcnotify && $(MAKE) splint $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libuna && $(MAKE) splint $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libfdatetime && $(MAKE) splint $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libfguid && $(MAKE) splint $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libfwnt && $(MAKE) splint $(AM_MAKEFLAGS))
- 	(cd $(srcdir)/libfvalue && $(MAKE) splint $(AM_MAKEFLAGS))
- 	(cd $(srcdir)/po && $(MAKE) splint $(AM_MAKEFLAGS))
- 	(cd $(srcdir)/tests && $(MAKE) splint $(AM_MAKEFLAGS))
+--- libfvalue-20190626.orig/libfvalue/libfvalue_filetime.c	2019-06-24 06:09:47.000000000 +0200
++++ libfvalue-20190626/libfvalue/libfvalue_filetime.c	2019-07-18 17:32:18.065229647 +0200
+@@ -27,7 +27,7 @@
+ #include "libfvalue_libcerror.h"
+ #include "libfvalue_libfdatetime.h"
+ 
+-#if defined( HAVE_LIBFDATETIME_H ) || defined( HAVE_LOCAL_LIBFDATETIME )
++#if defined( HAVE_LIBFDATETIME ) || defined( HAVE_LOCAL_LIBFDATETIME )
+ 
+ /* Copies the filetime from an integer value
+  * Returns 1 if successful or -1 on error
+@@ -109,5 +109,5 @@
+ 	return( 1 );
+ }
+ 
+-#endif /* defined( HAVE_LIBFDATETIME_H ) || defined( HAVE_LOCAL_LIBFDATETIME ) */
++#endif /* defined( HAVE_LIBFDATETIME ) || defined( HAVE_LOCAL_LIBFDATETIME ) */
+ 
+--- libfvalue-20190626.orig/libfvalue/libfvalue_filetime.h	2019-06-24 06:09:47.000000000 +0200
++++ libfvalue-20190626/libfvalue/libfvalue_filetime.h	2019-07-18 17:32:18.065229647 +0200
+@@ -32,7 +32,7 @@
+ extern "C" {
+ #endif
+ 
+-#if defined( HAVE_LIBFDATETIME_H ) || defined( HAVE_LOCAL_LIBFDATETIME )
++#if defined( HAVE_LIBFDATETIME ) || defined( HAVE_LOCAL_LIBFDATETIME )
+ 
+ int libfvalue_filetime_copy_from_integer(
+      libfdatetime_filetime_t *filetime,
+@@ -46,7 +46,7 @@
+      size_t *integer_value_size,
+      libcerror_error_t **error );
+ 
+-#endif /* defined( HAVE_LIBFDATETIME_H ) || defined( HAVE_LOCAL_LIBFDATETIME ) */
++#endif /* defined( HAVE_LIBFDATETIME ) || defined( HAVE_LOCAL_LIBFDATETIME ) */
+ 
+ #if defined( __cplusplus )
+ }
+--- libfvalue-20190626.orig/libfvalue/libfvalue_libfdatetime.h	2019-06-24 06:11:02.000000000 +0200
++++ libfvalue-20190626/libfvalue/libfvalue_libfdatetime.h	2019-07-18 17:32:18.065229647 +0200
+@@ -41,7 +41,7 @@
+ 
+ /* Note that libfvalue does not require to have libfdatetime support
+  */
+-#elif defined( HAVE_LIBFDATETIME_H )
++#elif defined( HAVE_LIBFDATETIME )
+ 
+ /* If libtool DLL support is enabled set LIBFDATETIME_DLL_IMPORT
+  * before including libfdatetime.h
+--- libfvalue-20190626.orig/libfvalue/libfvalue_libfguid.h	2019-06-24 06:11:02.000000000 +0200
++++ libfvalue-20190626/libfvalue/libfvalue_libfguid.h	2019-07-18 17:32:18.065229647 +0200
+@@ -34,7 +34,7 @@
+ 
+ /* Note that libfvalue does not require to have libfguid support
+  */
+-#elif defined( HAVE_LIBFGUID_H )
++#elif defined( HAVE_LIBFGUID )
+ 
+ /* If libtool DLL support is enabled set LIBFGUID_DLL_IMPORT
+  * before including libfguid.h
+--- libfvalue-20190626.orig/libfvalue/libfvalue_libfwnt.h	2019-06-24 06:11:02.000000000 +0200
++++ libfvalue-20190626/libfvalue/libfvalue_libfwnt.h	2019-07-18 17:32:18.065229647 +0200
+@@ -40,7 +40,7 @@
+ 
+ /* Note that libfvalue does not require to have libfwnt support
+  */
+-#elif defined( HAVE_LIBFWNT_H )
++#elif defined( HAVE_LIBFWNT )
+ 
+ /* If libtool DLL support is enabled set LIBFWNT_DLL_IMPORT
+  * before including libfwnt.h
+--- libfvalue-20190626.orig/libfvalue/libfvalue_value_type.c	2019-06-25 21:10:52.000000000 +0200
++++ libfvalue-20190626/libfvalue/libfvalue_value_type.c	2019-07-18 17:32:18.068562963 +0200
+@@ -36,15 +36,15 @@
+ #include "libfvalue_value.h"
+ #include "libfvalue_value_type.h"
+ 
+-#if defined( HAVE_LIBFDATETIME_H ) || defined( HAVE_LOCAL_LIBFDATETIME )
++#if defined( HAVE_LIBFDATETIME ) || defined( HAVE_LOCAL_LIBFDATETIME )
+ #include "libfvalue_libfdatetime.h"
+ #endif
+ 
+-#if defined( HAVE_LIBFGUID_H ) || defined( HAVE_LOCAL_LIBFGUID )
++#if defined( HAVE_LIBFGUID ) || defined( HAVE_LOCAL_LIBFGUID )
+ #include "libfvalue_libfguid.h"
+ #endif
+ 
+-#if defined( HAVE_LIBFWNT_H ) || defined( HAVE_LOCAL_LIBFWNT )
++#if defined( HAVE_LIBFWNT ) || defined( HAVE_LOCAL_LIBFWNT )
+ #include "libfvalue_libfwnt.h"
+ #endif
+ 
+@@ -383,7 +383,7 @@
+ 			          error );
+ 			break;
+ 
+-#if defined( HAVE_LIBFDATETIME_H ) || defined( HAVE_LOCAL_LIBFDATETIME )
++#if defined( HAVE_LIBFDATETIME ) || defined( HAVE_LOCAL_LIBFDATETIME )
+ 		case LIBFVALUE_VALUE_TYPE_FAT_DATE_TIME:
+ 			result = libfvalue_value_initialize(
+ 			          value,
+@@ -605,9 +605,9 @@
+ 			          flags,
+ 			          error );
+ 			break;
+-#endif /* defined( HAVE_LIBFDATETIME_H ) || defined( HAVE_LOCAL_LIBFDATETIME ) */
++#endif /* defined( HAVE_LIBFDATETIME ) || defined( HAVE_LOCAL_LIBFDATETIME ) */
+ 
+-#if defined( HAVE_LIBFGUID_H ) || defined( HAVE_LOCAL_LIBFGUID )
++#if defined( HAVE_LIBFGUID ) || defined( HAVE_LOCAL_LIBFGUID )
+ 		case LIBFVALUE_VALUE_TYPE_GUID:
+ 			result = libfvalue_value_initialize(
+ 			          value,
+@@ -644,9 +644,9 @@
+ 			          flags,
+ 			          error );
+ 			break;
+-#endif /* defined( HAVE_LIBFGUID_H ) || defined( HAVE_LOCAL_LIBFGUID ) */
++#endif /* defined( HAVE_LIBFGUID ) || defined( HAVE_LOCAL_LIBFGUID ) */
+ 
+-#if defined( HAVE_LIBFWNT_H ) || defined( HAVE_LOCAL_LIBFWNT )
++#if defined( HAVE_LIBFWNT ) || defined( HAVE_LOCAL_LIBFWNT )
+ 		case LIBFVALUE_VALUE_TYPE_NT_SECURITY_IDENTIFIER:
+ 			result = libfvalue_value_initialize(
+ 			          value,
+@@ -683,7 +683,7 @@
+ 			          flags,
+ 			          error );
+ 			break;
+-#endif /* defined( HAVE_LIBFWNT_H ) || defined( HAVE_LOCAL_LIBFWNT ) */
++#endif /* defined( HAVE_LIBFWNT ) || defined( HAVE_LOCAL_LIBFWNT ) */
+ 
+ 		default:
+ 			libcerror_error_set(
+@@ -1077,7 +1077,7 @@
+ 	return( last_data_index );
+ }
+ 
+-#if defined( HAVE_LIBFDATETIME_H ) || defined( HAVE_LOCAL_LIBFDATETIME )
++#if defined( HAVE_LIBFDATETIME ) || defined( HAVE_LOCAL_LIBFDATETIME )
+ 
+ /* Helper function for libfvalue value type to covert a byte stream into a POSIX time using libfdatetime
+  * Returns 1 if successful or -1 on error
+@@ -1175,5 +1175,5 @@
+ 	return( 1 );
+ }
+ 
+-#endif /* defined( HAVE_LIBFDATETIME_H ) || defined( HAVE_LOCAL_LIBFDATETIME ) */
++#endif /* defined( HAVE_LIBFDATETIME ) || defined( HAVE_LOCAL_LIBFDATETIME ) */
+ 
+--- libfvalue-20190626.orig/libfvalue/libfvalue_value_type.h	2019-06-25 20:48:17.000000000 +0200
++++ libfvalue-20190626/libfvalue/libfvalue_value_type.h	2019-07-18 17:32:18.065229647 +0200
+@@ -81,7 +81,7 @@
+          int encoding,
+          libcerror_error_t **error );
+ 
+-#if defined( HAVE_LIBFDATETIME_H ) || defined( HAVE_LOCAL_LIBFDATETIME )
++#if defined( HAVE_LIBFDATETIME ) || defined( HAVE_LOCAL_LIBFDATETIME )
+ 
+ int libfvalue_value_type_posix_time_copy_from_byte_stream(
+      libfdatetime_posix_time_t *posix_time,
+@@ -90,7 +90,7 @@
+      int encoding,
+      libcerror_error_t **error );
+ 
+-#endif /* defined( HAVE_LIBFDATETIME_H ) || defined( HAVE_LOCAL_LIBFDATETIME ) */
++#endif /* defined( HAVE_LIBFDATETIME ) || defined( HAVE_LOCAL_LIBFDATETIME ) */
+ 
+ #if defined( __cplusplus )
+ }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libfvalue.git/commitdiff/8b189a1eed7147b9acbdb95335cbc5829c14e834

More information about the pld-cvs-commit mailing list