From 5176375c25b05b1c623c4fdae59fb6a974e162bd70e780383cbf5652d6818424 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 24 Apr 2019 09:16:47 +0000 Subject: [PATCH] Accepting request 697365 from home:cheusov:branches:openSUSE:Factory - Update to libmaa-1.4.4: * Fix compilation failure using gcc-8 - Simplify build process using capabilities of mk-configure - Remove patches already applied in upstream - Fix License in rpm spec - Remove unnecessary dependencies from rpm spec OBS-URL: https://build.opensuse.org/request/show/697365 OBS-URL: https://build.opensuse.org/package/show/Education/libmaa?expand=0&rev=8 --- 02-Spelling-typos.patch | 23 ----------------------- 03-Fix-gcc-8-ftbfs.patch | 24 ------------------------ libmaa-1.4.3.tar.gz | 3 --- libmaa-1.4.4.tar.gz | 3 +++ libmaa.changes | 10 ++++++++++ libmaa.spec | 27 +++++++++++---------------- 6 files changed, 24 insertions(+), 66 deletions(-) delete mode 100644 02-Spelling-typos.patch delete mode 100644 03-Fix-gcc-8-ftbfs.patch delete mode 100644 libmaa-1.4.3.tar.gz create mode 100644 libmaa-1.4.4.tar.gz diff --git a/02-Spelling-typos.patch b/02-Spelling-typos.patch deleted file mode 100644 index 1230a61..0000000 --- a/02-Spelling-typos.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Robert Luberda -Date: Wed, 4 May 2011 22:38:50 +0200 -Subject: Spelling typos - -Fix spelling typos found by lintian ---- - maa/sl.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/maa/sl.c -+++ b/maa/sl.c -@@ -181,9 +181,9 @@ sl_List sl_create( int (*compare)( const - } - - if (!compare) -- err_internal( __func__, "compare fuction is NULL\n" ); -+ err_internal( __func__, "compare function is NULL\n" ); - if (!key) -- err_internal( __func__, "key fuction is NULL\n" ); -+ err_internal( __func__, "key function is NULL\n" ); - - l = mem_get_object( _sl_Memory ); - #if MAA_MAGIC diff --git a/03-Fix-gcc-8-ftbfs.patch b/03-Fix-gcc-8-ftbfs.patch deleted file mode 100644 index f808e7e..0000000 --- a/03-Fix-gcc-8-ftbfs.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Robert Luberda -Date: Sun, 3 Jun 2018 16:28:38 +0200 -Subject: Fix FTBFS with gcc-8 - -Increase buffer size to fix build failures like the one below: - ../log.c:328:40: error: '%s' directive output may be truncated writing up to 4095 bytes into a region of size between 3838 and 4093 [-Werror=format-truncation=] - snprintf (buf, sizeof (buf), "%s(%s) %s\n", - -Bugs-Debian: https://bugs.debian.org/897789 ---- - maa/log.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/maa/log.c -+++ b/maa/log.c -@@ -297,7 +297,7 @@ static void _log_base_va( - { - va_list ap_copy; - time_t t; -- static char buf [4096] = ""; -+ static char buf [8192] = ""; - static char buf_main [4096] = ""; - static char buf_preamble [256] = ""; - diff --git a/libmaa-1.4.3.tar.gz b/libmaa-1.4.3.tar.gz deleted file mode 100644 index 1cad8dc..0000000 --- a/libmaa-1.4.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:47fb588c454956d3e4712603f0a81455bfe8d9ccb1e38814483110069b22f696 -size 173000 diff --git a/libmaa-1.4.4.tar.gz b/libmaa-1.4.4.tar.gz new file mode 100644 index 0000000..600a046 --- /dev/null +++ b/libmaa-1.4.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fbd739e8467c4b7213594b172cfe3059443127313f8365224aa9c269498869e2 +size 172643 diff --git a/libmaa.changes b/libmaa.changes index f2a0c1e..e3d7fdf 100644 --- a/libmaa.changes +++ b/libmaa.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Apr 23 22:06:51 MSK 2019 - vle@gmx.net + +- Update to libmaa-1.4.4: + * Fix compilation failure using gcc-8 +- Simplify build process using capabilities of mk-configure +- Remove patches already applied in upstream +- Fix License in rpm spec +- Remove unnecessary dependencies from rpm spec + ------------------------------------------------------------------- Thu Mar 7 23:47:47 CET 2019 - Matej Cepl diff --git a/libmaa.spec b/libmaa.spec index cf7ddcf..5e98f3e 100644 --- a/libmaa.spec +++ b/libmaa.spec @@ -19,21 +19,14 @@ %define soname 4 Name: libmaa -Version: 1.4.3 +Version: 1.4.4 Release: 0 Summary: Library providing many low-level data structures -License: GPL-2.0-or-later +License: MIT Group: Development/Libraries/C and C++ Url: http://www.dict.org Source0: https://downloads.sourceforge.net/dict/%{name}-%{version}.tar.gz -Patch0: 02-Spelling-typos.patch -Patch1: 03-Fix-gcc-8-ftbfs.patch -BuildRequires: bison -BuildRequires: bmake -BuildRequires: flex -BuildRequires: libtool BuildRequires: mk-configure -BuildRequires: pam-devel BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -71,17 +64,19 @@ This RPM contains the documentation files for libmaa. %prep %setup -q -%autopatch -p 1 + +%define env \ + unset MAKEFLAGS \ + export MKSTATICLIB=no \ + export NOSUBDIR=doc %build -mkcmake PREFIX=%{_prefix} LIBDIR=%{_libdir} +%{env} +%{mkcmake} %install -mkcmake install DESTDIR=%{?buildroot} \ - PREFIX=%{_prefix} LIBDIR=%{_libdir} -rm -f %{buildroot}%{_libdir}/*.la -rm -f %{buildroot}%{_libdir}/*.a -rm -rf %{buildroot}%{_datadir}/doc/libmaa +%{env} +%{mkcmake} install DESTDIR=%{?buildroot} %post -n %{name}%{soname} -p /sbin/ldconfig