diff --git a/_multibuild b/_multibuild
new file mode 100644
index 0000000..cbbebd5
--- /dev/null
+++ b/_multibuild
@@ -0,0 +1,3 @@
+
+ mini
+
diff --git a/_service b/_service
new file mode 100644
index 0000000..725668a
--- /dev/null
+++ b/_service
@@ -0,0 +1,14 @@
+
+
+ git
+ https://github.com/libyal/libuna
+ 2939fe8f28cd47b04a6b6c8fbf15b1d7b6954f34
+
+ 20210418
+
+
+ *.tar
+ xz
+
+
+
diff --git a/libuna-20210418.tar.xz b/libuna-20210418.tar.xz
new file mode 100644
index 0000000..924f03c
--- /dev/null
+++ b/libuna-20210418.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ff1481b0758c3ea58e21d6ca1f91963e84783a8c5af7039d0d82a2604d38ef53
+size 641432
diff --git a/libuna-alpha-20201204.tar.gz b/libuna-alpha-20201204.tar.gz
deleted file mode 100644
index 3978ce2..0000000
--- a/libuna-alpha-20201204.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e054be66f86521f5930e1f764df73114035d585b9e32896261e02bbc3a34bb03
-size 1898257
diff --git a/libuna.changes b/libuna.changes
index 2e2d5ae..8d93ac6 100644
--- a/libuna.changes
+++ b/libuna.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed May 12 17:47:11 UTC 2021 - Jan Engelhardt
+
+- Update to snapshot 20210418 (2939fe8f)
+ * No changelog was provided
+- Add system-libs.patch
+
-------------------------------------------------------------------
Sun Dec 13 03:29:21 UTC 2020 - Greg Freemyer
diff --git a/libuna.spec b/libuna.spec
index a65d3d0..8310517 100644
--- a/libuna.spec
+++ b/libuna.spec
@@ -1,7 +1,7 @@
#
-# spec file for package libuna
+# spec file
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,24 +16,34 @@
#
-Name: libuna
-%define lname libuna1
-%define timestamp 20201204
-Version: 0~%timestamp
+%if "@BUILD_FLAVOR@" != ""
+%define pprefix @BUILD_FLAVOR@-
+%define psuffix -@BUILD_FLAVOR@
+%else
+%define psuffix %nil
+%endif
+%define lname libuna1
+
+Name: libuna%psuffix
+Version: 20210418
Release: 0
Summary: Library to support Unicode and ASCII (byte string) conversions
License: LGPL-3.0-or-later
Group: Development/Libraries/C and C++
-URL: https://github.com/libyal/libuna/wiki
-Source: https://github.com/libyal/libuna/releases/download/%timestamp/%{name}-alpha-%timestamp.tar.gz
+URL: https://github.com/libyal/libuna/
+Source: libuna-%version.tar.xz
+Patch1: system-libs.patch
+BuildRequires: c_compiler
+BuildRequires: gettext-tools >= 0.18.1
+BuildRequires: libtool
BuildRequires: pkg-config
-BuildRequires: pkgconfig(libcdatetime)
-BuildRequires: pkgconfig(libcerror) >= 20150101
-BuildRequires: pkgconfig(libcfile) >= 20120526
-BuildRequires: pkgconfig(libclocale) >= 20120425
-BuildRequires: pkgconfig(libcnotify) >= 20121224
-# Using versions from OBS fails, tested 1/8/2015
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: pkgconfig(libcdatetime) >= 20200510
+BuildRequires: pkgconfig(libcerror) >= 20201121
+%if "@BUILD_FLAVOR@" != "mini"
+BuildRequires: pkgconfig(libcfile) >= 20201229
+%endif
+BuildRequires: pkgconfig(libclocale) >= 20200913
+BuildRequires: pkgconfig(libcnotify) >= 20200913
%description
libuna is a library to support Unicode and ASCII (byte string)
@@ -41,11 +51,14 @@ conversions. It currently supports: 7-bit ASCII, ISO 8859-{1..15},
Windows 874, 932, 936, 949, 950, 1250, 1251, 1252, 1253, 1254, 1255,
1256, 1257, 1258, KOI8-R, KOI8-U, UTF-7, UTF-8, UTF-16, UTF-32.
-%package -n %lname
+%package -n %lname%psuffix
Summary: Library to support Unicode and ASCII (byte string) conversions
Group: System/Libraries
+%if "@BUILD_FLAVOR@" == ""
+Obsoletes: %lname-mini
+%endif
-%description -n %lname
+%description -n %lname%psuffix
libuna is a library to support Unicode and ASCII (byte string)
conversions.
@@ -59,7 +72,10 @@ Several tools for converting Unicode and ASCII (byte stream) based text.
%package devel
Summary: Development files for libuna, a library to support Unicode/ASCII conversions
Group: Development/Libraries/C and C++
-Requires: %lname = %{version}
+Requires: %lname%psuffix = %version
+%if "@BUILD_FLAVOR@" == ""
+Obsoletes: libuna-mini-devel
+%endif
%description devel
libuna is a library to support Unicode and ASCII (byte string)
@@ -69,32 +85,35 @@ This subpackage contains libraries and header files for developing
applications that want to make use of libuna.
%prep
-%setup -qn libuna-%timestamp
+%autosetup -p1 -n libuna-%version
%build
-%configure --disable-static --enable-wide-character-type --enable-python
-make %{?_smp_mflags}
+if [ ! -e configure ]; then ./autogen.sh; fi
+%configure \
+%if "@BUILD_FLAVOR@" == "mini"
+ --disable-tools \
+%endif
+ --disable-static --enable-wide-character-type
+%make_build
%install
%make_install
rm -f "%{buildroot}/%{_libdir}"/*.la
-%post -n %lname -p /sbin/ldconfig
-%postun -n %lname -p /sbin/ldconfig
+%post -n %lname%psuffix -p /sbin/ldconfig
+%postun -n %lname%psuffix -p /sbin/ldconfig
-%files -n %lname
-%defattr(-,root,root)
+%files -n %lname%psuffix
%license COPYING
-%doc AUTHORS ChangeLog ABOUT-NLS
%{_libdir}/libuna.so.1*
+%if "@BUILD_FLAVOR@" != "mini"
%files tools
-%defattr(-,root,root)
%{_bindir}/una*
%{_mandir}/man1/unaexport.1*
+%endif
%files devel
-%defattr(-,root,root)
%{_includedir}/libuna*
%{_libdir}/libuna.so
%{_libdir}/pkgconfig/libuna.pc
diff --git a/system-libs.patch b/system-libs.patch
new file mode 100644
index 0000000..e4df2b0
--- /dev/null
+++ b/system-libs.patch
@@ -0,0 +1,66 @@
+---
+ 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 \