- Delete system-libs.patch

OBS-URL: https://build.opensuse.org/package/show/security:forensics/libfsntfs?expand=0&rev=39

libfsntfs.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Nov 26 16:43:24 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
+
+- Delete system-libs.patch (not needed - system libs are
+  autodetected)
+
 -------------------------------------------------------------------
 Sun Oct 23 12:06:48 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
 

libfsntfs.spec

@@ -27,7 +27,6 @@ URL:            https://github.com/libyal/libfsntfs
 Source:         https://github.com/libyal/libfsntfs/releases/download/%version/libfsntfs-experimental-%version.tar.gz
 Source2:        https://github.com/libyal/libfsntfs/releases/download/%version/libfsntfs-experimental-%version.tar.gz.asc
 Source3:        %name.keyring
-Patch1:         system-libs.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  c_compiler
 BuildRequires:  gettext-tools >= 0.21
@@ -53,6 +52,7 @@ BuildRequires:  pkgconfig(libfwnt) >= 20220922
 BuildRequires:  pkgconfig(libhmac) >= 20220425
 BuildRequires:  pkgconfig(libuna) >= 20220611
 %python_subpackages
+# Various notes: https://en.opensuse.org/libyal
 
 %description
 Library and tools to access the New Technology File System (NTFS).
@@ -96,21 +96,20 @@ applications that want to make use of %{name}.
 
 %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 --enable-wide-character-type \
 	--enable-python PYTHON_VERSION="%{$python_bin_suffix}" \
 	LDFLAGS="-Wl,--version-script=$PWD/v.sym"
+grep ' '' ''local' config.log && exit 1
 %make_build
 %make_install DESTDIR="%_builddir/rt"
 %make_build clean
 }
 
 %install
-mv %_builddir/rt/* %buildroot/
+mv "%_builddir/rt"/* %buildroot/
 find %{buildroot} -type f -name "*.la" -delete -print
 
 %post   -n %{lname} -p /sbin/ldconfig

system-libs.patch

@@ -1,94 +0,0 @@
-From: Jan Engelhardt <jengelh@inai.de>
-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  |   32 --------------------------------
- configure.ac |   17 -----------------
- 2 files changed, 49 deletions(-)
-
-Index: libfsntfs/Makefile.am
-===================================================================
---- libfsntfs.orig/Makefile.am
-+++ libfsntfs/Makefile.am
-@@ -3,24 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = \
- 	include \
- 	common \
--	libcerror \
--	libcthreads \
--	libcdata \
--	libclocale \
--	libcnotify \
--	libcsplit \
--	libuna \
--	libcfile \
--	libcpath \
--	libbfio \
--	libfcache \
--	libfdata \
--	libfdatetime \
--	libfguid \
--	libfwnt \
- 	libfsntfs \
--	libfusn \
--	libhmac \
- 	fsntfstools \
- 	pyfsntfs \
- 	pyfsntfs-python2 \
-@@ -81,21 +64,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)/libclocale && $(MAKE) $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libcnotify && $(MAKE) $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libcsplit && $(MAKE) $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libuna && $(MAKE) $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libcfile && $(MAKE) $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libcpath && $(MAKE) $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libbfio && $(MAKE) $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libfcache && $(MAKE) $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libfdata && $(MAKE) $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libfdatetime && $(MAKE) $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libfguid && $(MAKE) $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libfwnt && $(MAKE) $(AM_MAKEFLAGS))
- 	(cd $(srcdir)/libfsntfs && $(MAKE) $(AM_MAKEFLAGS))
- 	(cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
- 
-Index: libfsntfs/configure.ac
-===================================================================
---- libfsntfs.orig/configure.ac
-+++ libfsntfs/configure.ac
-@@ -182,27 +182,10 @@ 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([libclocale/Makefile])
--AC_CONFIG_FILES([libcnotify/Makefile])
--AC_CONFIG_FILES([libcsplit/Makefile])
--AC_CONFIG_FILES([libuna/Makefile])
--AC_CONFIG_FILES([libcfile/Makefile])
--AC_CONFIG_FILES([libcpath/Makefile])
--AC_CONFIG_FILES([libbfio/Makefile])
--AC_CONFIG_FILES([libfcache/Makefile])
--AC_CONFIG_FILES([libfdata/Makefile])
--AC_CONFIG_FILES([libfdatetime/Makefile])
--AC_CONFIG_FILES([libfguid/Makefile])
--AC_CONFIG_FILES([libfwnt/Makefile])
- AC_CONFIG_FILES([libfsntfs/Makefile])
- AC_CONFIG_FILES([pyfsntfs/Makefile])
- AC_CONFIG_FILES([pyfsntfs-python2/Makefile])
- AC_CONFIG_FILES([pyfsntfs-python3/Makefile])
--AC_CONFIG_FILES([libfusn/Makefile])
--AC_CONFIG_FILES([libhmac/Makefile])
- AC_CONFIG_FILES([fsntfstools/Makefile])
- AC_CONFIG_FILES([po/Makefile.in])
- AC_CONFIG_FILES([po/Makevars])