- Delete system-libs.patch
OBS-URL: https://build.opensuse.org/package/show/security:forensics/libolecf?expand=0&rev=30
This commit is contained in:
parent
7aabf20925
commit
44bc9c0a13
@ -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)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 24 08:49:15 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
|
@ -28,10 +28,7 @@ Source: https://github.com/libyal/libolecf/releases/download/%version/li
|
||||
Source2: https://github.com/libyal/libolecf/releases/download/%version/libolecf-alpha-%version.tar.gz.asc
|
||||
Source3: %name.keyring
|
||||
Source11: OLE_Compound_File_format.pdf
|
||||
Patch1: system-libs.patch
|
||||
BuildRequires: c_compiler
|
||||
BuildRequires: gettext-tools >= 0.21
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: python-rpm-macros %{python_module devel}
|
||||
BuildRequires: pkgconfig(libbfio) >= 20220120
|
||||
@ -50,6 +47,7 @@ BuildRequires: pkgconfig(libfvalue) >= 20220120
|
||||
BuildRequires: pkgconfig(libfwps) >= 20220122
|
||||
BuildRequires: pkgconfig(libuna) >= 20220611
|
||||
%python_subpackages
|
||||
# Various notes: https://en.opensuse.org/libyal
|
||||
|
||||
%description
|
||||
Library and tools to access the OLE 2 Compound File (OLECF) format.
|
||||
@ -94,15 +92,12 @@ applications that want to make use of %name.
|
||||
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
|
||||
|
@ -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: libolecf/Makefile.am
|
||||
===================================================================
|
||||
--- libolecf.orig/Makefile.am
|
||||
+++ libolecf/Makefile.am
|
||||
@@ -3,21 +3,6 @@ ACLOCAL_AMFLAGS = -I m4
|
||||
SUBDIRS = \
|
||||
include \
|
||||
common \
|
||||
- libcerror \
|
||||
- libcthreads \
|
||||
- libcdata \
|
||||
- libclocale \
|
||||
- libcnotify \
|
||||
- libcsplit \
|
||||
- libuna \
|
||||
- libcfile \
|
||||
- libcpath \
|
||||
- libbfio \
|
||||
- libfdatetime \
|
||||
- libfguid \
|
||||
- libfole \
|
||||
- libfvalue \
|
||||
- libfwps \
|
||||
libolecf \
|
||||
olecftools \
|
||||
pyolecf \
|
||||
@@ -79,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)/libfdatetime && $(MAKE) $(AM_MAKEFLAGS))
|
||||
- (cd $(srcdir)/libfguid && $(MAKE) $(AM_MAKEFLAGS))
|
||||
- (cd $(srcdir)/libfole && $(MAKE) $(AM_MAKEFLAGS))
|
||||
- (cd $(srcdir)/libfvalue && $(MAKE) $(AM_MAKEFLAGS))
|
||||
- (cd $(srcdir)/libfwps && $(MAKE) $(AM_MAKEFLAGS))
|
||||
(cd $(srcdir)/libolecf && $(MAKE) $(AM_MAKEFLAGS))
|
||||
(cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
|
||||
|
||||
Index: libolecf/configure.ac
|
||||
===================================================================
|
||||
--- libolecf.orig/configure.ac
|
||||
+++ libolecf/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([libcfile/Makefile])
|
||||
-AC_CONFIG_FILES([libcpath/Makefile])
|
||||
-AC_CONFIG_FILES([libbfio/Makefile])
|
||||
-AC_CONFIG_FILES([libfdatetime/Makefile])
|
||||
-AC_CONFIG_FILES([libfguid/Makefile])
|
||||
-AC_CONFIG_FILES([libfole/Makefile])
|
||||
-AC_CONFIG_FILES([libfvalue/Makefile])
|
||||
-AC_CONFIG_FILES([libfwps/Makefile])
|
||||
AC_CONFIG_FILES([libolecf/Makefile])
|
||||
AC_CONFIG_FILES([pyolecf/Makefile])
|
||||
AC_CONFIG_FILES([pyolecf-python2/Makefile])
|
Loading…
x
Reference in New Issue
Block a user