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

- Delete system-libs.patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/security:forensics/libuna?expand=0&rev=34
This commit is contained in:
Jan Engelhardt 2022-11-27 09:58:56 +00:00 committed by Git OBS Bridge
parent 57201112b7
commit f4216fc3bd
3 changed files with 8 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libuna.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)
-------------------------------------------------------------------
Mon Aug 29 09:30:38 UTC 2022 - Jan Engelhardt <jengelh@inai.de>

4
libuna.spec
View File

@ -35,7 +35,6 @@ Source: https://github.com/libyal/libuna/releases/download/%version/libu
Source2: https://github.com/libyal/libuna/releases/download/%version/libuna-alpha-%version.tar.gz.asc
Source3: libuna.keyring
Source99: libuna-rpmlintrc
Patch1: system-libs.patch
BuildRequires: c_compiler
BuildRequires: gettext-tools >= 0.18.1
BuildRequires: libtool
@ -47,6 +46,7 @@ BuildRequires: pkgconfig(libcfile) >= 20220106
%endif
BuildRequires: pkgconfig(libclocale) >= 20220107
BuildRequires: pkgconfig(libcnotify) >= 20220108
# Various notes: https://en.opensuse.org/libyal
%description
libuna is a library to support Unicode and ASCII (byte string)
@ -92,7 +92,6 @@ applications that want to make use of libuna.
%build
autoreconf -fi
# see libcdata for version-sc
echo "V_%version { global: *; };" >v.sym
%configure \
%if "@BUILD_FLAVOR@" == "mini"
@ -100,6 +99,7 @@ echo "V_%version { global: *; };" >v.sym
%endif
--disable-static --enable-wide-character-type \
LDFLAGS="-Wl,--version-script=$PWD/v.sym"
grep ' local' config.log && exit 1
%make_build
%install

66
system-libs.patch
View File

@ -1,66 +0,0 @@
---
Makefile.am | 12 +++++-------
configure.ac | 7 ++-----
manuals/Makefile.am | 4 +++-
3 files changed, 10 insertions(+), 13 deletions(-)
Index: libuna-20210418/Makefile.am
===================================================================
--- libuna-20210418.orig/Makefile.am
+++ libuna-20210418/Makefile.am
@@ -3,13 +3,11 @@ ACLOCAL_AMFLAGS = -I m4
SUBDIRS = \
include \
common \
- libcerror \
- libuna \
- libcdatetime \
- libclocale \
- libcnotify \
- libcfile \
- unatools \
+ libuna
+if MAKE_TOOLS
+SUBDIRS += unatools
+endif
+SUBDIRS += \
po \
documents \
manuals \
Index: libuna-20210418/configure.ac
===================================================================
--- libuna-20210418.orig/configure.ac
+++ libuna-20210418/configure.ac
@@ -115,16 +115,13 @@ AC_SUBST(
[SPEC_DATE],
[`date +"%a %b %e %Y" 2> /dev/null`])
+AC_ARG_ENABLE([tools], [AS_HELP_STRING([--disable-tools], [Do not build tools])], [make_tools=0], [make_tools=1])
+AM_CONDITIONAL([MAKE_TOOLS], [test "$make_tools" = 1])
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([libuna/Makefile])
-AC_CONFIG_FILES([libcdatetime/Makefile])
-AC_CONFIG_FILES([libclocale/Makefile])
-AC_CONFIG_FILES([libcnotify/Makefile])
-AC_CONFIG_FILES([libcfile/Makefile])
AC_CONFIG_FILES([unatools/Makefile])
AC_CONFIG_FILES([po/Makefile.in])
AC_CONFIG_FILES([po/Makevars])
Index: libuna-20210418/manuals/Makefile.am
===================================================================
--- libuna-20210418.orig/manuals/Makefile.am
+++ libuna-20210418/manuals/Makefile.am
@@ -1,6 +1,8 @@
man_MANS = \
- unaexport.1 \
libuna.3
+if MAKE_TOOLS
+man_MANS += unaexport.1
+endif
EXTRA_DIST = \
unaexport.1 \