[packages/zziplib] - updated to 0.13.68 - removed outdated ac patch - added test patch (fixes readme test) - drop .la f
qboosh
qboosh at pld-linux.org
Thu Dec 31 08:46:02 CET 2020
commit 68b7b84b50e2cad42a46af517d1127ba721e1814
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Dec 31 08:45:54 2020 +0100
- updated to 0.13.68
- removed outdated ac patch
- added test patch (fixes readme test)
- drop .la files, separated -apidocs
zziplib-ac.patch | 11 -----------
zziplib-test.patch | 13 +++++++++++++
zziplib.spec | 43 ++++++++++++++++++++++++++++---------------
3 files changed, 41 insertions(+), 26 deletions(-)
---
diff --git a/zziplib.spec b/zziplib.spec
index d5c75e0..a44bfd2 100644
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,18 +1,18 @@
#
# Conditional build:
-%bcond_without doc # build without documentation
+%bcond_without apidocs # API documentation
#
Summary: ZZipLib - libZ-based ZIP-access Library
Summary(pl.UTF-8): ZZipLib - biblioteka dostępu do archiwów ZIP
Name: zziplib
-Version: 0.13.62
-Release: 2
+Version: 0.13.68
+Release: 1
Epoch: 1
License: LGPL v2 or MPL 1.1
Group: Libraries
Source0: http://downloads.sourceforge.net/zziplib/%{name}-%{version}.tar.bz2
-# Source0-md5: 5fe874946390f939ee8f4abe9624b96c
-Patch0: %{name}-ac.patch
+# Source0-md5: 8b0cc7c506b172a4938c3338b122c2f0
+Patch0: %{name}-test.patch
Patch1: %{name}-manpages.patch
URL: http://zziplib.sourceforge.net/
BuildRequires: autoconf >= 2.61
@@ -72,6 +72,18 @@ ZZipLib static library.
%description static -l pl.UTF-8
Statyczna biblioteka ZZipLib.
+%package apidocs
+Summary: API documentation for ZZipLib library
+Summary(pl.UTF-8): Dokumentacja API biblioteki ZZipLib
+Group: Documentation
+%{?noarchpackage}
+
+%description apidocs
+API documentation for ZZipLib library.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki ZZipLib.
+
%prep
%setup -q
%patch0 -p1
@@ -88,7 +100,7 @@ Statyczna biblioteka ZZipLib.
%{__make}
%{__make} -j1 check
-%if %{with doc}
+%if %{with apidocs}
%{__make} doc
%endif
@@ -98,13 +110,15 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-%if %{with doc}
+%if %{with apidocs}
%{__make} install-man3 -C docs \
DESTDIR=$RPM_BUILD_ROOT
%endif
# we don't need these compat symlinks
%{__rm} $RPM_BUILD_ROOT%{_libdir}/libzzip*-0.so.{10,11,12}
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libzzip*.la
%clean
rm -rf $RPM_BUILD_ROOT
@@ -131,20 +145,13 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(644,root,root,755)
-%if %{with doc}
-%doc docs/*.{html,css}
-%endif
%attr(755,root,root) %{_libdir}/libzzip.so
%attr(755,root,root) %{_libdir}/libzzipfseeko.so
%attr(755,root,root) %{_libdir}/libzzipmmapped.so
%attr(755,root,root) %{_libdir}/libzzipwrap.so
-%{_libdir}/libzzip.la
-%{_libdir}/libzzipfseeko.la
-%{_libdir}/libzzipmmapped.la
-%{_libdir}/libzzipwrap.la
%{_includedir}/zzip
%{_includedir}/zzip*.h
-%if %{with doc}
+%if %{with apidocs}
%{_mandir}/man3/__zzip_*.3*
%{_mandir}/man3/zzip_*.3*
%endif
@@ -161,3 +168,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libzzipfseeko.a
%{_libdir}/libzzipmmapped.a
%{_libdir}/libzzipwrap.a
+
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%doc docs/*.{html,css}
+%endif
diff --git a/zziplib-ac.patch b/zziplib-ac.patch
deleted file mode 100644
index 39ef005..0000000
--- a/zziplib-ac.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- zziplib-0.13.47/m4/ax_enable_builddir_uname.m4.orig 2006-08-07 22:58:48.000000000 +0200
-+++ zziplib-0.13.47/m4/ax_enable_builddir_uname.m4 2006-08-24 15:06:18.215971000 +0200
-@@ -96,7 +96,7 @@
- AS_VAR_PUSHDEF([SED],[ax_enable_builddir_sed])dnl
- pushdef([END],[Makefile.mk])dnl
- SRC="$ax_enable_builddir_srcdir"
-- if test ".$SUB" = "." ; then
-+ if test ".$SUB" = ".." ; then
- if test -f "$TOP/Makefile" ; then
- AC_MSG_NOTICE([skipping TOP/Makefile - left untouched])
- else
diff --git a/zziplib-test.patch b/zziplib-test.patch
new file mode 100644
index 0000000..6a6ccd8
--- /dev/null
+++ b/zziplib-test.patch
@@ -0,0 +1,13 @@
+--- zziplib-0.13.68/test/Makefile.am.orig 2018-02-05 21:00:56.000000000 +0100
++++ zziplib-0.13.68/test/Makefile.am 2020-12-31 08:15:12.935029301 +0100
+@@ -47,8 +47,8 @@
+ check-readme : $(zzcat) test.zip
+ @ test -f test.zip || $(MAKE) tmp/../test.zip
+ test -s test.zip
+- @ echo :$@: checking $(zzcat) test/README
+- @ $(zzcat) test/README >test.out
++ @ echo :$@: checking $(zzcat) $(README)
++ @ $(zzcat) $(README) >test.out
+ @ if diff test.out $(README) >$(NULL) \
+ ; then rm test.out ; echo check OK ; true \
+ ; else rm test.out ; echo check FAIL ; false ; fi
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/zziplib.git/commitdiff/68b7b84b50e2cad42a46af517d1127ba721e1814
More information about the pld-cvs-commit
mailing list