diff --git a/_service b/_service new file mode 100644 index 0000000..8386651 --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + git + https://github.com/libyal/libfvalue + 122646449bda14e0e5c7da0e538f0bd4a5477e8b + + 20210510 + + + *.tar + xz + + + diff --git a/libfvalue-20210510.tar.xz b/libfvalue-20210510.tar.xz new file mode 100644 index 0000000..de3f3de --- /dev/null +++ b/libfvalue-20210510.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87c3a6abd23b7383bcd9c04fa2a95a7f635a47ad688f5b265207582311bbfd2a +size 117288 diff --git a/libfvalue-experimental-20201124.tar.gz b/libfvalue-experimental-20201124.tar.gz deleted file mode 100644 index 86edb75..0000000 --- a/libfvalue-experimental-20201124.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ebf9a9b6c8193de75890a5f5fe103e53ded5d87dc9af48d62b09da420a84f6d5 -size 1270349 diff --git a/libfvalue.changes b/libfvalue.changes index fa40253..d09793d 100644 --- a/libfvalue.changes +++ b/libfvalue.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed May 12 22:27:14 UTC 2021 - Jan Engelhardt + +- Update to snapshot 20210510 (12264644) + * No changelog was provided +- Add system-libs.patch + ------------------------------------------------------------------- Mon Dec 14 21:59:13 UTC 2020 - Greg Freemyer diff --git a/libfvalue.spec b/libfvalue.spec index 30db8ad..44faf08 100644 --- a/libfvalue.spec +++ b/libfvalue.spec @@ -1,7 +1,7 @@ # # spec file for package libfvalue # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,26 +18,26 @@ Name: libfvalue %define lname libfvalue1 -%define timestamp 20201124 -Version: 0~%{timestamp} +Version: 20210510 Release: 0 Summary: Library to provide generic file value functions License: LGPL-3.0-or-later Group: Productivity/File utilities -URL: https://github.com/libyal/libfvalue/wiki -Source: https://github.com/libyal/libfvalue/releases/download/%timestamp/%{name}-experimental-%{timestamp}.tar.gz +URL: https://github.com/libyal/libfvalue +Source: %name-%version.tar.xz +Patch1: system-libs.patch +BuildRequires: c_compiler +BuildRequires: gettext-tools >= 0.18.1 +BuildRequires: libtool BuildRequires: pkg-config -BuildRequires: python-devel -BuildRequires: pkgconfig(libcerror) -BuildRequires: pkgconfig(libcnotify) -BuildRequires: pkgconfig(libcthreads) -BuildRequires: pkgconfig(libfdatetime) -BuildRequires: pkgconfig(libfguid) -BuildRequires: pkgconfig(libfwnt) >= 20170115 -BuildRequires: pkgconfig(libuna) -#version from factory causes a sigfault in plaso/run_tests.py (as of Jan 2017) -#BuildRequires: pkgconfig(libcdata) > 20170102 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(libcdata) >= 20200509 +BuildRequires: pkgconfig(libcerror) >= 20201121 +BuildRequires: pkgconfig(libcnotify) >= 20200913 +BuildRequires: pkgconfig(libcthreads) >= 20200508 +BuildRequires: pkgconfig(libfdatetime) >= 20180910 +BuildRequires: pkgconfig(libfguid) >= 20180724 +BuildRequires: pkgconfig(libfwnt) >= 20210421 +BuildRequires: pkgconfig(libuna) >= 20201204 %description Library to provide generic file value functions for the libyal family of libraries. @@ -61,30 +61,25 @@ This subpackage contains libraries and header files for developing applications that want to make use of libfvalue. %prep -%setup -q -n libfvalue-%{timestamp} +%autosetup -p1 %build -%configure --disable-static --enable-wide-character-type --enable-python -make %{?_smp_mflags} +if [ ! -e configure ]; then ./autogen.sh; fi +%configure --disable-static +%make_build %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install find %{buildroot} -type f -name "*.la" -delete -print %post -n %{lname} -p /sbin/ldconfig - %postun -n %{lname} -p /sbin/ldconfig %files -n %{lname} -%defattr(-,root,root) -%doc AUTHORS ChangeLog -%license COPYING +%license COPYING* %{_libdir}/libfvalue.so.* %files devel -%defattr(-,root,root) -%doc AUTHORS README ChangeLog -%license COPYING %{_includedir}/libfvalue.h %{_includedir}/libfvalue/ %{_libdir}/libfvalue.so diff --git a/system-libs.patch b/system-libs.patch new file mode 100644 index 0000000..2eb2103 --- /dev/null +++ b/system-libs.patch @@ -0,0 +1,64 @@ +From: Jan Engelhardt +Date: 2021-05-12 17:36:02.536572543 +0200 + +Some dirs are not present in snapshots directly generated from git +(nor are they marked as a submodule). Patch it out, since we have +them as system libs. +--- + Makefile.am | 16 ---------------- + configure.ac | 8 -------- + 2 files changed, 24 deletions(-) + +Index: libfvalue/Makefile.am +=================================================================== +--- libfvalue.orig/Makefile.am ++++ libfvalue/Makefile.am +@@ -3,14 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = \ + include \ + common \ +- libcerror \ +- libcthreads \ +- libcdata \ +- libcnotify \ +- libuna \ +- libfdatetime \ +- libfguid \ +- libfwnt \ + libfvalue \ + po \ + manuals \ +@@ -60,14 +52,6 @@ lib: library + + library: + (cd $(srcdir)/common && $(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)) + +Index: libfvalue/configure.ac +=================================================================== +--- libfvalue.orig/configure.ac ++++ libfvalue/configure.ac +@@ -118,14 +118,6 @@ dnl Generate Makefiles + AC_CONFIG_FILES([Makefile]) + AC_CONFIG_FILES([include/Makefile]) + AC_CONFIG_FILES([common/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])