From 47379ff7cfc0c6f4ae5b54526a2f9e077aa87cba9244f98b18577b52c63d2d32 Mon Sep 17 00:00:00 2001 From: Greg Freemyer Date: Wed, 9 Jun 2021 09:35:09 +0000 Subject: [PATCH] Accepting request 898676 from home:jengelh:forensics - Update to snapshot 20210415 (c8bed427) OBS-URL: https://build.opensuse.org/request/show/898676 OBS-URL: https://build.opensuse.org/package/show/security:forensics/libfguid?expand=0&rev=11 --- _service | 14 +++++++++++ libfguid-20210415.tar.xz | 3 +++ libfguid-alpha-20180724.tar.gz | 3 --- libfguid.changes | 7 ++++++ libfguid.spec | 29 +++++++++++------------ system-libs.patch | 43 ++++++++++++++++++++++++++++++++++ 6 files changed, 81 insertions(+), 18 deletions(-) create mode 100644 _service create mode 100644 libfguid-20210415.tar.xz delete mode 100644 libfguid-alpha-20180724.tar.gz create mode 100644 system-libs.patch diff --git a/_service b/_service new file mode 100644 index 0000000..f3d5bcc --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + git + https://github.com/libyal/libfguid + c8bed42795056d108d9ae67848246ad2d71f01d7 + + 20210415 + + + *.tar + xz + + + diff --git a/libfguid-20210415.tar.xz b/libfguid-20210415.tar.xz new file mode 100644 index 0000000..0b3f2d7 --- /dev/null +++ b/libfguid-20210415.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86c710cc1e77419bbb477e6ce27b5d3ed1592a0dfc175c80d1211e503baa2ff1 +size 58684 diff --git a/libfguid-alpha-20180724.tar.gz b/libfguid-alpha-20180724.tar.gz deleted file mode 100644 index 380b799..0000000 --- a/libfguid-alpha-20180724.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cd4618d030330dab2bb70dcd1ca2c66cda067705da43d9bc2b48654f7d019191 -size 500741 diff --git a/libfguid.changes b/libfguid.changes index 1c05283..0ad6d11 100644 --- a/libfguid.changes +++ b/libfguid.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed May 12 22:21:09 UTC 2021 - Jan Engelhardt + +- Update to snapshot 20210415 (c8bed427) + * No changelog was provided +- Add system-libs.patch + ------------------------------------------------------------------- Mon Apr 15 19:51:42 UTC 2019 - Greg Freemyer diff --git a/libfguid.spec b/libfguid.spec index c476edf..d1543ba 100644 --- a/libfguid.spec +++ b/libfguid.spec @@ -1,7 +1,7 @@ # # spec file for package libfguid # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# 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,18 +18,19 @@ Name: libfguid %define lname libfguid1 -%define timestamp 20180724 -Version: 0~%timestamp +Version: 20210415 Release: 0 Summary: A library for GUID/UUID data types License: LGPL-3.0-or-later Group: Development/Libraries/C and C++ -Url: https://github.com/libyal/libfguid/wiki -Source: https://github.com/libyal/libfguid/releases/download/%timestamp/%{name}-alpha-%timestamp.tar.gz +URL: https://github.com/libyal/libfguid +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(libcerror) >= 20130609 -BuildRequires: pkgconfig(libcstring) >= 20120425 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(libcerror) >= 20201121 %description A library for GUID/UUID data types. Part of the libyal family of libraries. @@ -53,11 +54,12 @@ This subpackage contains libraries and header files for developing applications that want to make use of libfguid. %prep -%setup -qn libfguid-%timestamp +%autosetup -p1 %build -%configure --disable-static --enable-wide-character-type -make %{?_smp_mflags} +if [ ! -e configure ]; then ./autogen.sh; fi +%configure --disable-static +%make_build %install %make_install @@ -67,13 +69,10 @@ rm -f "%{buildroot}/%{_libdir}"/*.la %postun -n %lname -p /sbin/ldconfig %files -n %lname -%defattr(-,root,root) -%doc AUTHORS ChangeLog -%license COPYING +%license COPYING* %{_libdir}/libfguid.so.1* %files devel -%defattr(-,root,root) %{_includedir}/libfguid* %{_libdir}/libfguid.so %{_libdir}/pkgconfig/libfguid.pc diff --git a/system-libs.patch b/system-libs.patch new file mode 100644 index 0000000..680b71f --- /dev/null +++ b/system-libs.patch @@ -0,0 +1,43 @@ +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 | 2 -- + configure.ac | 1 - + 2 files changed, 3 deletions(-) + +Index: libfguid/Makefile.am +=================================================================== +--- libfguid.orig/Makefile.am ++++ libfguid/Makefile.am +@@ -3,7 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = \ + include \ + common \ +- libcerror \ + libfguid \ + po \ + manuals \ +@@ -53,7 +52,6 @@ lib: library + + library: + (cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libcerror && $(MAKE) $(AM_MAKEFLAGS)) + (cd $(srcdir)/libfguid && $(MAKE) $(AM_MAKEFLAGS)) + (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) + +Index: libfguid/configure.ac +=================================================================== +--- libfguid.orig/configure.ac ++++ libfguid/configure.ac +@@ -91,7 +91,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([libfguid/Makefile]) + AC_CONFIG_FILES([po/Makefile.in]) + AC_CONFIG_FILES([po/Makevars])