- Delete system-libs.patch

OBS-URL: https://build.opensuse.org/package/show/security:forensics/libqcow?expand=0&rev=31
This commit is contained in:
Jan Engelhardt 2022-11-27 11:46:37 +00:00 committed by Git OBS Bridge
parent 126be0ba45
commit 9a1ed28e7d
3 changed files with 8 additions and 86 deletions

View File

@ -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)
-------------------------------------------------------------------
Thu Nov 24 11:45:18 UTC 2022 - Jan Engelhardt <jengelh@inai.de>

View File

@ -28,11 +28,8 @@ Source: https://github.com/libyal/libqcow/releases/download/%version/lib
Source2: https://github.com/libyal/libqcow/releases/download/%version/libqcow-alpha-%version.tar.gz.asc
Source3: %name.keyring
Source8: QEMU_Copy-On-Write_file_format.pdf
Patch1: system-libs.patch
BuildRequires: %{python_module devel}
BuildRequires: c_compiler
BuildRequires: gettext-tools >= 0.21
BuildRequires: libtool
BuildRequires: pkg-config
BuildRequires: python-rpm-macros
BuildRequires: pkgconfig(fuse) >= 2.6
@ -52,6 +49,7 @@ BuildRequires: pkgconfig(libuna) >= 20220611
BuildRequires: pkgconfig(openssl) >= 1.0
BuildRequires: pkgconfig(zlib) >= 1.2.5
%python_subpackages
# Various notes: https://en.opensuse.org/libyal
%description
Library and tooling to access the QEMU Copy-On-Write (QCOW) image format.
@ -95,15 +93,12 @@ applications that want to make use of libqcow.
cp %_sourcedir/*.pdf .
%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

View File

@ -1,79 +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 | 26 --------------------------
configure.ac | 13 -------------
2 files changed, 39 deletions(-)
Index: libqcow/Makefile.am
===================================================================
--- libqcow.orig/Makefile.am
+++ libqcow/Makefile.am
@@ -3,19 +3,6 @@ ACLOCAL_AMFLAGS = -I m4
SUBDIRS = \
include \
common \
- libcerror \
- libcthreads \
- libcdata \
- libclocale \
- libcnotify \
- libcsplit \
- libuna \
- libcfile \
- libcpath \
- libbfio \
- libfcache \
- libfdata \
- libcaes \
libqcow \
qcowtools \
pyqcow \
@@ -78,19 +65,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)/libcaes && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/libqcow && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
Index: libqcow/configure.ac
===================================================================
--- libqcow.orig/configure.ac
+++ libqcow/configure.ac
@@ -174,19 +174,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([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([libcaes/Makefile])
AC_CONFIG_FILES([libqcow/Makefile])
AC_CONFIG_FILES([pyqcow/Makefile])
AC_CONFIG_FILES([pyqcow-python2/Makefile])