From 33c2574f1d092a53e76c2586b2cc77ed275fbcdcca239b29c0a6161bee854f67 Mon Sep 17 00:00:00 2001 From: Greg Freemyer Date: Wed, 9 Jun 2021 09:39:13 +0000 Subject: [PATCH] Accepting request 898675 from home:jengelh:forensics - Update to snapshot 20210414 (da968c35) OBS-URL: https://build.opensuse.org/request/show/898675 OBS-URL: https://build.opensuse.org/package/show/security:forensics/libfdatetime?expand=0&rev=9 --- _service | 14 ++++++++++ libfdatetime-20210414.tar.xz | 3 +++ libfdatetime-alpha-20180910.tar.gz | 3 --- libfdatetime.changes | 7 +++++ libfdatetime.spec | 31 +++++++++++---------- system-libs.patch | 43 ++++++++++++++++++++++++++++++ 6 files changed, 82 insertions(+), 19 deletions(-) create mode 100644 _service create mode 100644 libfdatetime-20210414.tar.xz delete mode 100644 libfdatetime-alpha-20180910.tar.gz create mode 100644 system-libs.patch diff --git a/_service b/_service new file mode 100644 index 0000000..24ee5af --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + git + https://github.com/libyal/libfdatetime + da968c35b74f6b74b9e4884254c258701a95d198 + + 20210414 + + + *.tar + xz + + + diff --git a/libfdatetime-20210414.tar.xz b/libfdatetime-20210414.tar.xz new file mode 100644 index 0000000..907b470 --- /dev/null +++ b/libfdatetime-20210414.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d8597d813aa26d7d38f403fe59dbdb553c055ade5ae28685930426141a051d8 +size 81616 diff --git a/libfdatetime-alpha-20180910.tar.gz b/libfdatetime-alpha-20180910.tar.gz deleted file mode 100644 index e9ea28f..0000000 --- a/libfdatetime-alpha-20180910.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:71a56caa11ec576b4504e9af2a858258402c44f3815c1f8bf24402cce0a86afe -size 557052 diff --git a/libfdatetime.changes b/libfdatetime.changes index 0dfaeed..e7a2584 100644 --- a/libfdatetime.changes +++ b/libfdatetime.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed May 12 22:14:43 UTC 2021 - Jan Engelhardt + +- Update to snapshot 20210414 (da968c35) + * No changelog was provided +- Add system-libs.patch + ------------------------------------------------------------------- Mon Apr 15 19:45:48 UTC 2019 - Greg Freemyer diff --git a/libfdatetime.spec b/libfdatetime.spec index eec93af..f2e31af 100644 --- a/libfdatetime.spec +++ b/libfdatetime.spec @@ -1,7 +1,7 @@ # # spec file for package libfdatetime # -# 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: libfdatetime %define lname libfdatetime1 -%define timestamp 20180910 -Version: 0~%timestamp +Version: 20210414 Release: 0 Summary: A library for date and time data types License: LGPL-3.0-or-later Group: Development/Libraries/C and C++ -Url: https://github.com/libyal/libfdatetime/wiki -Source: https://github.com/libyal/libfdatetime/releases/download/%timestamp/%name-alpha-%timestamp.tar.gz +URL: https://github.com/libyal/libfdatetime +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) >= 20150101 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(libcerror) >= 20201121 %description A library for date and time data types. Part of the libyal family of libraries. @@ -53,27 +54,25 @@ This subpackage contains libraries and header files for developing applications that want to make use of libfdatetime. %prep -%setup -qn libfdatetime-%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 DESTDIR="%buildroot" +%make_install rm -f "%buildroot/%_libdir"/*.la %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/libfdatetime.so.1* %files devel -%defattr(-,root,root) %_includedir/libfdatetime* %_libdir/libfdatetime.so %_libdir/pkgconfig/libfdatetime.pc diff --git a/system-libs.patch b/system-libs.patch new file mode 100644 index 0000000..59b3301 --- /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: libfdatetime/Makefile.am +=================================================================== +--- libfdatetime.orig/Makefile.am ++++ libfdatetime/Makefile.am +@@ -3,7 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = \ + include \ + common \ +- libcerror \ + libfdatetime \ + po \ + tests \ +@@ -53,7 +52,6 @@ lib: library + + library: + (cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libcerror && $(MAKE) $(AM_MAKEFLAGS)) + (cd $(srcdir)/libfdatetime && $(MAKE) $(AM_MAKEFLAGS)) + (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) + +Index: libfdatetime/configure.ac +=================================================================== +--- libfdatetime.orig/configure.ac ++++ libfdatetime/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([libfdatetime/Makefile]) + AC_CONFIG_FILES([po/Makefile.in]) + AC_CONFIG_FILES([po/Makevars])