- Delete system-libs.patch
OBS-URL: https://build.opensuse.org/package/show/security:forensics/libuna?expand=0&rev=34
This commit is contained in:
parent
57201112b7
commit
f4216fc3bd
@ -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>
|
Mon Aug 29 09:30:38 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
@ -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
|
Source2: https://github.com/libyal/libuna/releases/download/%version/libuna-alpha-%version.tar.gz.asc
|
||||||
Source3: libuna.keyring
|
Source3: libuna.keyring
|
||||||
Source99: libuna-rpmlintrc
|
Source99: libuna-rpmlintrc
|
||||||
Patch1: system-libs.patch
|
|
||||||
BuildRequires: c_compiler
|
BuildRequires: c_compiler
|
||||||
BuildRequires: gettext-tools >= 0.18.1
|
BuildRequires: gettext-tools >= 0.18.1
|
||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
@ -47,6 +46,7 @@ BuildRequires: pkgconfig(libcfile) >= 20220106
|
|||||||
%endif
|
%endif
|
||||||
BuildRequires: pkgconfig(libclocale) >= 20220107
|
BuildRequires: pkgconfig(libclocale) >= 20220107
|
||||||
BuildRequires: pkgconfig(libcnotify) >= 20220108
|
BuildRequires: pkgconfig(libcnotify) >= 20220108
|
||||||
|
# Various notes: https://en.opensuse.org/libyal
|
||||||
|
|
||||||
%description
|
%description
|
||||||
libuna is a library to support Unicode and ASCII (byte string)
|
libuna is a library to support Unicode and ASCII (byte string)
|
||||||
@ -92,7 +92,6 @@ applications that want to make use of libuna.
|
|||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf -fi
|
autoreconf -fi
|
||||||
# see libcdata for version-sc
|
|
||||||
echo "V_%version { global: *; };" >v.sym
|
echo "V_%version { global: *; };" >v.sym
|
||||||
%configure \
|
%configure \
|
||||||
%if "@BUILD_FLAVOR@" == "mini"
|
%if "@BUILD_FLAVOR@" == "mini"
|
||||||
@ -100,6 +99,7 @@ echo "V_%version { global: *; };" >v.sym
|
|||||||
%endif
|
%endif
|
||||||
--disable-static --enable-wide-character-type \
|
--disable-static --enable-wide-character-type \
|
||||||
LDFLAGS="-Wl,--version-script=$PWD/v.sym"
|
LDFLAGS="-Wl,--version-script=$PWD/v.sym"
|
||||||
|
grep ' local' config.log && exit 1
|
||||||
%make_build
|
%make_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
@ -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 \
|
|
Loading…
x
Reference in New Issue
Block a user