pool/libregf
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1038489 from security:forensics

Browse Source 
delete system-libs.patch

OBS-URL: https://build.opensuse.org/request/show/1038489
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libregf?expand=0&rev=29
This commit is contained in:
Dominique Leuenberger 2022-11-28 10:06:43 +00:00 committed by Git OBS Bridge
commit 881b286979
3 changed files with 8 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libregf.changes
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 Oct 27 12:16:23 UTC 2022 - Jan Engelhardt <jengelh@inai.de>

9
libregf.spec
View File

@ -28,11 +28,8 @@ Source: https://github.com/libyal/libregf/releases/download/%version/lib
Source2: https://github.com/libyal/libregf/releases/download/%version/libregf-alpha-%version.tar.gz.asc
Source3: %name.keyring
Source11: Windows_NT_Registry_File_REGF_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
@ -53,6 +50,7 @@ BuildRequires: pkgconfig(libfwnt) >= 20220922
BuildRequires: pkgconfig(libfwsi) >= 20220927
BuildRequires: pkgconfig(libuna) >= 20220611
%python_subpackages
# Various notes: https://en.opensuse.org/libyal
%description
libregf is a library to access Windows Registry files of the REGF
@ -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

81
system-libs.patch
View File

@ -1,81 +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 | 27 ---------------------------
configure.ac | 14 --------------
2 files changed, 41 deletions(-)
Index: libregf/Makefile.am
===================================================================
--- libregf.orig/Makefile.am
+++ libregf/Makefile.am
@@ -3,20 +3,6 @@ ACLOCAL_AMFLAGS = -I m4
SUBDIRS = \
include \
common \
- libcerror \
- libcthreads \
- libcdata \
- libclocale \
- libcnotify \
- libcsplit \
- libuna \
- libcfile \
- libcpath \
- libbfio \
- libfcache \
- libfdata \
- libfdatetime \
- libfwnt \
libregf \
regftools \
pyregf \
@@ -78,19 +64,6 @@ lib: library
library:
(cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS))
- (cd $(srcdir)/libcerror && $(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)/libfwnt && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/libregf && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
Index: libregf/configure.ac
===================================================================
--- libregf.orig/configure.ac
+++ libregf/configure.ac
@@ -173,20 +173,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([libfdatetime/Makefile])
-AC_CONFIG_FILES([libfwnt/Makefile])
AC_CONFIG_FILES([libregf/Makefile])
AC_CONFIG_FILES([pyregf/Makefile])
AC_CONFIG_FILES([pyregf-python2/Makefile])