From 43c2ea847f5c490b6dd430b0eb462efd3ff25aabf3db8c510608f55afdb56c23 Mon Sep 17 00:00:00 2001 From: Greg Freemyer Date: Wed, 9 Jun 2021 00:10:53 +0000 Subject: [PATCH] Accepting request 898223 from home:jengelh:forensics also for creg - Update to snapshot 20210413 (33c1ab96) * No changelog was provided - Add system-libs.patch OBS-URL: https://build.opensuse.org/request/show/898223 OBS-URL: https://build.opensuse.org/package/show/security:forensics/libfcache?expand=0&rev=10 --- _service | 14 ++++++++++ libfcache-20210413.tar.xz | 3 ++ libfcache-alpha-20200708.tar.gz | 3 -- libfcache.changes | 7 +++++ libfcache.spec | 39 ++++++++++++-------------- system-libs.patch | 49 +++++++++++++++++++++++++++++++++ 6 files changed, 91 insertions(+), 24 deletions(-) create mode 100644 _service create mode 100644 libfcache-20210413.tar.xz delete mode 100644 libfcache-alpha-20200708.tar.gz create mode 100644 system-libs.patch diff --git a/_service b/_service new file mode 100644 index 0000000..60c548b --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + git + https://github.com/libyal/libfcache + 33c1ab96ddf80f53fa6bc0cb2f55345ebfeab667 + + 20210413 + + + *.tar + xz + + + diff --git a/libfcache-20210413.tar.xz b/libfcache-20210413.tar.xz new file mode 100644 index 0000000..e29a09b --- /dev/null +++ b/libfcache-20210413.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:375809fed0e5c55784aa4e5e3a0c93030dd9ff4863a3a0138583b09e0572dcf2 +size 61812 diff --git a/libfcache-alpha-20200708.tar.gz b/libfcache-alpha-20200708.tar.gz deleted file mode 100644 index d30e9ee..0000000 --- a/libfcache-alpha-20200708.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8b12bb4ad3aa26b53dfa2ab5b30349be30d1eecab2d2e970a18fad29bca038a1 -size 608441 diff --git a/libfcache.changes b/libfcache.changes index d3bdb67..7045c86 100644 --- a/libfcache.changes +++ b/libfcache.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed May 12 21:10:38 UTC 2021 - Jan Engelhardt + +- Update to snapshot 20210413 (33c1ab96) + * No changelog was provided +- Add system-libs.patch + ------------------------------------------------------------------- Mon Dec 28 18:44:32 UTC 2020 - Greg Freemyer diff --git a/libfcache.spec b/libfcache.spec index 8c4546a..90601de 100644 --- a/libfcache.spec +++ b/libfcache.spec @@ -1,7 +1,7 @@ # # spec file for package libfcache # -# 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,20 +18,21 @@ Name: libfcache %define lname libfcache1 -%define timestamp 20200708 -Version: 0~%{timestamp} +Version: 20210413 Release: 0 Summary: Library to provide generic file data cache functions License: LGPL-3.0-or-later Group: Productivity/File utilities -URL: https://github.com/libyal/libfcache/wiki -Source: https://github.com/libyal/libfcache/releases/download/%timestamp/%{name}-alpha-%{timestamp}.tar.gz +URL: https://github.com/libyal/libfcache +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(libcdata) >= 20140105 -BuildRequires: pkgconfig(libcerror) >= 20140105 -BuildRequires: pkgconfig(libcthreads) >= 20130723 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(libcdata) >= 20200509 +BuildRequires: pkgconfig(libcerror) >= 20201121 +BuildRequires: pkgconfig(libcthreads) >= 20200508 %description Library to provide generic file data cache functions for the libyal family of libraries. @@ -55,30 +56,26 @@ This subpackage contains libraries and header files for developing applications that want to make use of libfcache. %prep -%setup -q -n libfcache-%{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 COPYING.LESSER +%license COPYING* %{_libdir}/libfcache.so.* %files devel -%defattr(-,root,root) -%doc AUTHORS README ChangeLog -%license COPYING COPYING.LESSER +%license COPYING* %{_includedir}/libfcache.h %{_includedir}/libfcache/ %{_libdir}/libfcache.so diff --git a/system-libs.patch b/system-libs.patch new file mode 100644 index 0000000..ddc7b59 --- /dev/null +++ b/system-libs.patch @@ -0,0 +1,49 @@ +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 | 6 ------ + configure.ac | 3 --- + 2 files changed, 9 deletions(-) + +Index: libfcache/Makefile.am +=================================================================== +--- libfcache.orig/Makefile.am ++++ libfcache/Makefile.am +@@ -3,9 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = \ + include \ + common \ +- libcerror \ +- libcthreads \ +- libcdata \ + libfcache \ + po \ + manuals \ +@@ -55,9 +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)/libfcache && $(MAKE) $(AM_MAKEFLAGS)) + (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) + +Index: libfcache/configure.ac +=================================================================== +--- libfcache.orig/configure.ac ++++ libfcache/configure.ac +@@ -97,9 +97,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([libfcache/Makefile]) + AC_CONFIG_FILES([po/Makefile.in]) + AC_CONFIG_FILES([po/Makevars])