From 16accf12ff903dd7812bec46974e93e7b89d0b4eb856f9db695c0a86a4eef7f8 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 26 Jan 2019 17:58:36 +0000 Subject: [PATCH] Accepting request 668830 from home:mcepl:branches:Education - Upgrade to libmaa-1.4.2: * Fix build failure on SunOS-5.11 (alloca) * License has been changed from LGPL to MIT, permitted by Rik Faith, original author of this library. * Build system changed from autotools to mk-configure. * Library version/soname was bumped from 3 to 4. I cannot guarantee that mk-configure and libtool build shared library the same way. * Tests were added for stk_*, mem_* and prm_* functions. * stk_isempty function was added. * stk_* and other was reimplemented without obstack functions (glibc extension). OBS-URL: https://build.opensuse.org/request/show/668830 OBS-URL: https://build.opensuse.org/package/show/Education/libmaa?expand=0&rev=3 --- 02-Spelling-typos.patch | 6 +++--- 03-Fix-gcc-8-ftbfs.patch | 4 ++-- libmaa-1.3.2.tar.bz2 | 3 --- libmaa-1.4.2.tar.gz | 3 +++ libmaa.changes | 18 +++++++++++++++++- libmaa.spec | 32 +++++++++++++++++++++++--------- 6 files changed, 48 insertions(+), 18 deletions(-) delete mode 100644 libmaa-1.3.2.tar.bz2 create mode 100644 libmaa-1.4.2.tar.gz diff --git a/02-Spelling-typos.patch b/02-Spelling-typos.patch index 49c3d33..1230a61 100644 --- a/02-Spelling-typos.patch +++ b/02-Spelling-typos.patch @@ -7,9 +7,9 @@ Fix spelling typos found by lintian maa/sl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---- a/sl.c -+++ b/sl.c -@@ -176,9 +176,9 @@ sl_List sl_create( int (*compare)( const +--- a/maa/sl.c ++++ b/maa/sl.c +@@ -181,9 +181,9 @@ sl_List sl_create( int (*compare)( const } if (!compare) diff --git a/03-Fix-gcc-8-ftbfs.patch b/03-Fix-gcc-8-ftbfs.patch index bba0060..f808e7e 100644 --- a/03-Fix-gcc-8-ftbfs.patch +++ b/03-Fix-gcc-8-ftbfs.patch @@ -11,8 +11,8 @@ Bugs-Debian: https://bugs.debian.org/897789 maa/log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- a/log.c -+++ b/log.c +--- a/maa/log.c ++++ b/maa/log.c @@ -297,7 +297,7 @@ static void _log_base_va( { va_list ap_copy; diff --git a/libmaa-1.3.2.tar.bz2 b/libmaa-1.3.2.tar.bz2 deleted file mode 100644 index 34d16fb..0000000 --- a/libmaa-1.3.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:360edac7559917ce2c1e5664ba5d587df38e9d406ea89349c621baabee7d6a4f -size 253327 diff --git a/libmaa-1.4.2.tar.gz b/libmaa-1.4.2.tar.gz new file mode 100644 index 0000000..fd668a3 --- /dev/null +++ b/libmaa-1.4.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:63de331c97a40efe8b64534fee4b7b7df161645b92636572ad248b0f13abc0db +size 173607 diff --git a/libmaa.changes b/libmaa.changes index ee975ab..0704c6e 100644 --- a/libmaa.changes +++ b/libmaa.changes @@ -1,5 +1,21 @@ ------------------------------------------------------------------- -Tue Oct 9 12:27:04 UTC 2018 - Matěj Cepl +Sat Jan 26 18:51:28 CET 2019 - mcepl@suse.com + +- Upgrade to libmaa-1.4.2: + * Fix build failure on SunOS-5.11 (alloca) + * License has been changed from LGPL to MIT, permitted by Rik + Faith, original author of this library. + * Build system changed from autotools to mk-configure. + * Library version/soname was bumped from 3 to 4. I cannot + guarantee that mk-configure and libtool build shared library + the same way. + * Tests were added for stk_*, mem_* and prm_* functions. + * stk_isempty function was added. + * stk_* and other was reimplemented without obstack functions + (glibc extension). + +------------------------------------------------------------------- +Tue Oct 9 12:27:04 UTC 2018 - mcepl@suse.com - Add 02-Spelling-typos.patch and 03-Fix-gcc-8-ftbfs.patch from Debian package. diff --git a/libmaa.spec b/libmaa.spec index 92f40df..9851c4a 100644 --- a/libmaa.spec +++ b/libmaa.spec @@ -3,18 +3,20 @@ # package are under the same license as the package itself. # -%define soname 3 +%define soname 4 Name: libmaa -Version: 1.3.2 +Version: 1.4.2 Release: 1 License: GPL-2.0+ Summary: Library providing many low-level data structures Url: http://www.dict.org Group: System/Libraries -Source0: %{name}-%{version}.tar.bz2 +Source0: https://downloads.sourceforge.net/dict/%{name}-%{version}.tar.gz Patch0: 02-Spelling-typos.patch Patch1: 03-Fix-gcc-8-ftbfs.patch +BuildRequires: bmake +BuildRequires: mk-configure BuildRequires: bison BuildRequires: flex BuildRequires: libtool @@ -58,31 +60,43 @@ Requires: libmaa%{soname} = %{version} This RPM contains the development files for libmaa +%package doc +Summary: Documentation files for libmaa +Group: Documentation/Other + +%description doc +This RPM contains the documentation files for libmaa + + %prep %setup -q %autopatch -p 1 %build -%configure --enable-dictorg -%__sed -i 's/-L.\/libmaa-1.3.1\/.libs/.\/.libs/' Makefile -make %{?_smp_mflags} +mkcmake PREFIX=%{_prefix} LIBDIR=%{_libdir} %install -%make_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 %post -n %{name}%{soname} -p /sbin/ldconfig %postun -n %{name}%{soname} -p /sbin/ldconfig %files -n %{name}%{soname} -%defattr(-,root,root) +%license doc/LICENSE +%doc README doc/NEWS %{_libdir}/*.so.* %files -n %{name}-devel -%defattr(-,root,root) %{_includedir}/maa* %{_libdir}/*.so +%files doc +%license doc/LICENSE +%doc doc/*.ps* + %changelog