commit 97ad9816fbc704b1dd47119b245a8d44c81d2898
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Sun Jun 18 08:04:37 2023 +0200
- updated to 20220120
libfvalue-system-libs.patch | 170 --------------------------------------------
libfvalue.spec | 12 ++--
2 files changed, 5 insertions(+), 177 deletions(-)
---
diff --git a/libfvalue.spec b/libfvalue.spec
index 90580b4..ebbf463 100644
--- a/libfvalue.spec
+++ b/libfvalue.spec
@@ -1,23 +1,22 @@
# see m4/${libname}.m4 />= for required version of particular library
-%define libcdata_ver 20190112
+%define libcdata_ver 20220115
%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
+%define libfwnt_ver 20191217
+%define libuna_ver 20210801
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: 20190626
+Version: 20220120
Release: 1
License: LGPL v3+
Group: Libraries
#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
+# Source0-md5: 61b91521fc5ac42d6e8192446c473864
URL: https://github.com/libyal/libfvalue/
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1.6
@@ -82,7 +81,6 @@ Statyczna biblioteka libfvalue.
%prep
%setup -q
-%patch0 -p1
%build
%{__gettextize}
diff --git a/libfvalue-system-libs.patch b/libfvalue-system-libs.patch
deleted file mode 100644
index 9329a4e..0000000
--- a/libfvalue-system-libs.patch
+++ /dev/null
@@ -1,170 +0,0 @@
---- 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/97ad9816fbc704b1dd47119b245a8d44c81d2898
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
