- Delete system-libs.patch
OBS-URL: https://build.opensuse.org/package/show/security:forensics/libphdi?expand=0&rev=14
This commit is contained in:
parent
9a40c31a31
commit
6964c418e7
@ -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)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 25 08:56:16 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
|
14
libphdi.spec
14
libphdi.spec
@ -27,14 +27,10 @@ URL: https://github.com/libyal/libphdi
|
||||
Source: https://github.com/libyal/libphdi/releases/download/%version/libphdi-experimental-%version.tar.gz
|
||||
Source2: https://github.com/libyal/libphdi/releases/download/%version/libphdi-experimental-%version.tar.gz.asc
|
||||
Source9: %name.keyring
|
||||
Patch1: system-libs.patch
|
||||
BuildRequires: bison
|
||||
BuildRequires: %{python_module devel}
|
||||
BuildRequires: c_compiler
|
||||
BuildRequires: flex
|
||||
BuildRequires: gettext-tools >= 0.21
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: python-rpm-macros %{python_module devel}
|
||||
BuildRequires: python-rpm-macros
|
||||
BuildRequires: pkgconfig(fuse) >= 2.6
|
||||
BuildRequires: pkgconfig(libbfio) >= 20221025
|
||||
BuildRequires: pkgconfig(libcdata) >= 20220115
|
||||
@ -52,6 +48,7 @@ BuildRequires: pkgconfig(libfguid) >= 20220113
|
||||
BuildRequires: pkgconfig(libfvalue) >= 20220120
|
||||
BuildRequires: pkgconfig(libuna) >= 20220611
|
||||
%python_subpackages
|
||||
# Various notes: https://en.opensuse.org/libyal
|
||||
|
||||
%description
|
||||
libphdi is a library to access the Parallels Hard Disk image format.
|
||||
@ -90,15 +87,12 @@ read Parallels Hard Disk images.
|
||||
%autosetup -p1
|
||||
|
||||
%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
|
||||
|
@ -1,85 +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 | 30 ------------------------------
|
||||
configure.ac | 15 ---------------
|
||||
2 files changed, 45 deletions(-)
|
||||
|
||||
Index: libphdi/Makefile.am
|
||||
===================================================================
|
||||
--- libphdi.orig/Makefile.am
|
||||
+++ libphdi/Makefile.am
|
||||
@@ -3,21 +3,6 @@ ACLOCAL_AMFLAGS = -I m4
|
||||
SUBDIRS = \
|
||||
include \
|
||||
common \
|
||||
- libcerror \
|
||||
- libcthreads \
|
||||
- libcdata \
|
||||
- libclocale \
|
||||
- libcnotify \
|
||||
- libcsplit \
|
||||
- libuna \
|
||||
- libcdirectory \
|
||||
- libcfile \
|
||||
- libcpath \
|
||||
- libbfio \
|
||||
- libfcache \
|
||||
- libfdata \
|
||||
- libfguid \
|
||||
- libfvalue \
|
||||
libphdi \
|
||||
phditools \
|
||||
pyphdi \
|
||||
@@ -80,21 +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)/libcdirectory && $(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)/libfguid && $(MAKE) $(AM_MAKEFLAGS))
|
||||
- (cd $(srcdir)/libfvalue && $(MAKE) $(AM_MAKEFLAGS))
|
||||
(cd $(srcdir)/libphdi && $(MAKE) $(AM_MAKEFLAGS))
|
||||
(cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
|
||||
|
||||
Index: libphdi/configure.ac
|
||||
===================================================================
|
||||
--- libphdi.orig/configure.ac
|
||||
+++ libphdi/configure.ac
|
||||
@@ -176,21 +176,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([libcdirectory/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([libfguid/Makefile])
|
||||
-AC_CONFIG_FILES([libfvalue/Makefile])
|
||||
AC_CONFIG_FILES([libphdi/Makefile])
|
||||
AC_CONFIG_FILES([pyphdi/Makefile])
|
||||
AC_CONFIG_FILES([pyphdi-python2/Makefile])
|
Loading…
x
Reference in New Issue
Block a user