- Delete system-libs.patch

OBS-URL: https://build.opensuse.org/package/show/security:forensics/libfmos?expand=0&rev=4
This commit is contained in:
Jan Engelhardt 2022-11-26 23:45:57 +00:00 committed by Git OBS Bridge
parent 3120cb87c3
commit 9570b50167
3 changed files with 7 additions and 52 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Nov 26 16:43:24 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
- Delete system-libs.patch
-------------------------------------------------------------------
Thu Sep 1 08:32:29 UTC 2022 - Jan Engelhardt <jengelh@inai.de>

View File

@ -27,7 +27,6 @@ URL: https://github.com/libyal/libfmos
Source: https://github.com/libyal/libfmos/releases/download/%version/libfmos-experimental-%version.tar.gz
Source2: https://github.com/libyal/libfmos/releases/download/%version/libfmos-experimental-%version.tar.gz.asc
Source3: %name.keyring
Patch1: system-libs.patch
BuildRequires: %{python_module devel}
BuildRequires: c_compiler
BuildRequires: gettext-tools >= 0.21
@ -37,6 +36,7 @@ BuildRequires: pkgconfig(libcerror) >= 20220101
BuildRequires: pkgconfig(libcnotify) >= 20220108
BuildRequires: pkgconfig(libcthreads) >= 20220102
%python_subpackages
# Various notes: https://en.opensuse.org/libyal
%description
libfmos is a library for MacOS data types.
@ -64,13 +64,12 @@ applications that want to make use of libfmos.
%build
autoreconf -fi
# OOT builds are presently broken, so we have to install
# within each python iteration now, not in %%install.
%{python_expand #
# see libcdata for version-sc
echo "V_%version { global: *; };" >v.sym
%configure --disable-static LDFLAGS="-Wl,--version-script=$PWD/v.sym" \
--enable-python PYTHON_VERSION="%{$python_bin_suffix}"
grep ' '' ''local' config.log && exit 1
%make_build
%make_install DESTDIR="%_builddir/rt"
%make_build clean

View File

@ -1,49 +0,0 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2022-09-01 10:18:04.991878890 +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: libfmos-20220811/Makefile.am
===================================================================
--- libfmos-20220811.orig/Makefile.am
+++ libfmos-20220811/Makefile.am
@@ -3,9 +3,6 @@ ACLOCAL_AMFLAGS = -I m4
SUBDIRS = \
include \
common \
- libcerror \
- libcthreads \
- libcnotify \
libfmos \
pyfmos \
pyfmos-python2 \
@@ -63,9 +60,6 @@ lib: library
library:
(cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS))
- (cd $(srcdir)/libcerror && $(MAKE) $(AM_MAKEFLAGS))
- (cd $(srcdir)/libcthreads && $(MAKE) $(AM_MAKEFLAGS))
- (cd $(srcdir)/libcnotify && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/libfmos && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
Index: libfmos-20220811/configure.ac
===================================================================
--- libfmos-20220811.orig/configure.ac
+++ libfmos-20220811/configure.ac
@@ -120,9 +120,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([libcnotify/Makefile])
AC_CONFIG_FILES([libfmos/Makefile])
AC_CONFIG_FILES([pyfmos/Makefile])
AC_CONFIG_FILES([pyfmos-python2/Makefile])