From f8491fac662df72b76de6c7b74aa8c13304d73b6d4b3d2c0278767faefff17a9 Mon Sep 17 00:00:00 2001 From: Greg Freemyer Date: Wed, 9 Jun 2021 00:13:26 +0000 Subject: [PATCH] Accepting request 898224 from home:jengelh:forensics also for creg - Update to snapshot 20210414 (fa85a383) * No changelog was provided - Add system-libs.patch OBS-URL: https://build.opensuse.org/request/show/898224 OBS-URL: https://build.opensuse.org/package/show/security:forensics/libfdata?expand=0&rev=13 --- _service | 14 +++++++++ libfdata-20210414.tar.xz | 3 ++ libfdata-alpha-20201129.tar.gz | 3 -- libfdata.changes | 7 +++++ libfdata.spec | 43 ++++++++++++-------------- system-libs.patch | 55 ++++++++++++++++++++++++++++++++++ 6 files changed, 98 insertions(+), 27 deletions(-) create mode 100644 _service create mode 100644 libfdata-20210414.tar.xz delete mode 100644 libfdata-alpha-20201129.tar.gz create mode 100644 system-libs.patch diff --git a/_service b/_service new file mode 100644 index 0000000..b161efa --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + git + https://github.com/libyal/libfdata + fa85a38343aab347bcdc37a9ac5c5c1aabad468e + + 20210414 + + + *.tar + xz + + + diff --git a/libfdata-20210414.tar.xz b/libfdata-20210414.tar.xz new file mode 100644 index 0000000..6776d2d --- /dev/null +++ b/libfdata-20210414.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9fce2623e3958063f72ed8a4fd435239377e2f82680d98a7305aa7e105d79eba +size 104588 diff --git a/libfdata-alpha-20201129.tar.gz b/libfdata-alpha-20201129.tar.gz deleted file mode 100644 index d7d59d6..0000000 --- a/libfdata-alpha-20201129.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:05d235de86b700346ff375234c7d99877d4b9e0c2f2e9bc7dfe2fd842a9d86ce -size 725653 diff --git a/libfdata.changes b/libfdata.changes index 4b15fb3..04003e2 100644 --- a/libfdata.changes +++ b/libfdata.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed May 12 22:04:57 UTC 2021 - Jan Engelhardt + +- Update to snapshot 20210414 (fa85a383) + * No changelog was provided +- Add system-libs.patch + ------------------------------------------------------------------- Tue Dec 29 22:40:21 UTC 2020 - Greg Freemyer diff --git a/libfdata.spec b/libfdata.spec index f8fbd69..ae2c922 100644 --- a/libfdata.spec +++ b/libfdata.spec @@ -1,7 +1,7 @@ # # spec file for package libfdata # -# 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,23 +18,23 @@ Name: libfdata %define lname libfdata1 -%define timestamp 20201129 -Version: 0~%{timestamp} +Version: 20210414 Release: 0 Summary: Library to provide generic file data functions License: LGPL-3.0-or-later Group: Productivity/File utilities -URL: https://github.com/libyal/libfdata/wiki -Source: https://github.com/libyal/libfdata/releases/download/%timestamp/%{name}-alpha-%{timestamp}.tar.gz -#BuildRequires: pkg-config -BuildRequires: python-devel -BuildRequires: pkgconfig(libcdata) >= 20140105 -BuildRequires: pkgconfig(libcerror) >= 20140105 -BuildRequires: pkgconfig(libcnotify) -BuildRequires: pkgconfig(libcstring) >= 20120425 -BuildRequires: pkgconfig(libcthreads) >= 20130723 -BuildRequires: pkgconfig(libfcache) -BuildRoot: %{_tmppath}/%{name}-%{version}-build +URL: https://github.com/libyal/libfdata +Source: %{name}-%{version}.tar.xz +Patch1: system-libs.patch +BuildRequires: c_compiler +BuildRequires: gettext-tools >= 0.18.1 +BuildRequires: libtool +BuildRequires: pkg-config +BuildRequires: pkgconfig(libcdata) >= 20200509 +BuildRequires: pkgconfig(libcerror) >= 20201121 +BuildRequires: pkgconfig(libcnotify) >= 20200913 +BuildRequires: pkgconfig(libcthreads) >= 20200508 +BuildRequires: pkgconfig(libfcache) >= 20200708 %description Library to provide generic file data functions for the libyal family of libraries. @@ -58,30 +58,25 @@ This subpackage contains libraries and header files for developing applications that want to make use of libfdata. %prep -%setup -q -n libfdata-%{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* %{_libdir}/libfdata.so.* %files devel -%defattr(-,root,root) -%doc AUTHORS README ChangeLog -%license COPYING* %{_includedir}/libfdata.h %{_includedir}/libfdata/ %{_libdir}/libfdata.so diff --git a/system-libs.patch b/system-libs.patch new file mode 100644 index 0000000..0e39309 --- /dev/null +++ b/system-libs.patch @@ -0,0 +1,55 @@ +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 | 10 ---------- + configure.ac | 5 ----- + 2 files changed, 15 deletions(-) + +Index: libfdata/Makefile.am +=================================================================== +--- libfdata.orig/Makefile.am ++++ libfdata/Makefile.am +@@ -3,11 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = \ + include \ + common \ +- libcerror \ +- libcthreads \ +- libcdata \ +- libcnotify \ +- libfcache \ + libfdata \ + po \ + manuals \ +@@ -57,11 +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)/libfcache && $(MAKE) $(AM_MAKEFLAGS)) + (cd $(srcdir)/libfdata && $(MAKE) $(AM_MAKEFLAGS)) + (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) + +Index: libfdata/configure.ac +=================================================================== +--- libfdata.orig/configure.ac ++++ libfdata/configure.ac +@@ -109,11 +109,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([libfcache/Makefile]) + AC_CONFIG_FILES([libfdata/Makefile]) + AC_CONFIG_FILES([po/Makefile.in]) + AC_CONFIG_FILES([po/Makevars])