Accepting request 1038451 from security:forensics

delete system-libs.patch

OBS-URL: https://build.opensuse.org/request/show/1038451
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcsplit?expand=0&rev=14
This commit is contained in:
Dominique Leuenberger 2022-11-28 10:06:06 +00:00 committed by Git OBS Bridge
commit e5f9299b3f
3 changed files with 9 additions and 60 deletions

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 8 11:37:44 UTC 2022 - Jan Engelhardt <jengelh@inai.de>

View File

@ -27,12 +27,10 @@ URL: https://github.com/libyal/libcsplit
Source: https://github.com/libyal/libcsplit/releases/download/%version/libcsplit-beta-%version.tar.gz
Source2: https://github.com/libyal/libcsplit/releases/download/%version/libcsplit-beta-%version.tar.gz.asc
Source9: %name.keyring
Patch1: system-libs.patch
BuildRequires: c_compiler
BuildRequires: gettext-tools >= 0.18.1
BuildRequires: libtool
BuildRequires: pkg-config
BuildRequires: pkgconfig(libcerror) >= 20201121
BuildRequires: pkgconfig(libcerror) >= 20220101
# Various notes: https://en.opensuse.org/libyal
%description
A library for C split string functions.
@ -48,17 +46,6 @@ Library for C split string functions.
Part of the libyal family of libraries.
Also see:
libcdata; generic data functions
libcdatetime; date and time functions
libcerror; error functions
libclocale; locale functions
libcnotify; notification functions
libcfile; file functions
libcpath; path functions
libcthreads; threads functions
%package devel
Summary: Development files for libcsplit, a C split string library
Group: Development/Libraries/C and C++
@ -74,10 +61,9 @@ applications that want to make use of libcsplit.
%autosetup -p1
%build
autoreconf -fi
# see libcdata for version-sc
echo "V_%version { global: *; };" >v.sym
%configure --disable-static --enable-wide-character-type LDFLAGS="-Wl,--version-script=$PWD/v.sym"
grep ' local' config.log && exit 1
%make_build
%install

View File

@ -1,43 +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 | 2 --
configure.ac | 1 -
2 files changed, 3 deletions(-)
Index: libcsplit-20210411/Makefile.am
===================================================================
--- libcsplit-20210411.orig/Makefile.am
+++ libcsplit-20210411/Makefile.am
@@ -3,7 +3,6 @@ ACLOCAL_AMFLAGS = -I m4
SUBDIRS = \
include \
common \
- libcerror \
libcsplit \
po \
manuals \
@@ -53,7 +52,6 @@ lib: library
library:
cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS)
- cd $(srcdir)/libcerror && $(MAKE) $(AM_MAKEFLAGS)
cd $(srcdir)/libcsplit && $(MAKE) $(AM_MAKEFLAGS)
cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)
Index: libcsplit-20210411/configure.ac
===================================================================
--- libcsplit-20210411.orig/configure.ac
+++ libcsplit-20210411/configure.ac
@@ -94,7 +94,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([libcsplit/Makefile])
AC_CONFIG_FILES([po/Makefile.in])
AC_CONFIG_FILES([po/Makevars])