commit 6beda3c379d327464b0950d4c4adcfb28c574a41
Author: Jakub Bogusz <[email protected]>
Date: Wed Jun 7 20:16:44 2017 +0200
- updated to 2.0.0 (as snap because sources are not tagged in git), p7zip
16.02
- added ac patch
lib7zip-ac.patch | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
lib7zip.spec | 28 +++++++++++++++++-----------
2 files changed, 72 insertions(+), 11 deletions(-)
---
diff --git a/lib7zip.spec b/lib7zip.spec
index 10f1f4b..c119050 100644
--- a/lib7zip.spec
+++ b/lib7zip.spec
@@ -1,18 +1,21 @@
-%define p7zip_version 9.20.1
+%define p7zip_version 16.02
Summary: A library using 7z.dll/7z.so (from 7-Zip) to handle different
archive types
Summary(pl.UTF-8): Biblioteka wykorzystująca 7z.dll/7z.so (z 7-zipa) do
obsługi różnych rodzajów archiwów
Name: lib7zip
-Version: 1.6.5
-Release: 2
+Version: 2.0.0
+%define snap 20151119
+%define gitref 5bc54cab38656fd57df7736087ef6914ddb68c72
+Release: 1.%{gitref}.1
License: MPL v1.1
Group: Libraries
-#Source0Download: http://code.google.com/p/lib7zip/downloads/list
-Source0: http://lib7zip.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5: a127ec183797dcf685938372dc5bf72a
+#Source0Download: https://github.com/stonewell/lib7zip/releases
+Source0:
https://github.com/stonewell/lib7zip/archive/%{gitref}/%{name}-%{snap}.tar.gz
+# Source0-md5: 58675fae32445e701ebf8716b973dc3f
Source1:
http://downloads.sourceforge.net/p7zip/p7zip_%{p7zip_version}_src_all.tar.bz2
-# Source1-md5: bd6caaea567dc0d995c990c5cc883c89
+# Source1-md5: a0128d661cfe7cc8c121e73519c54fbf
Patch0: %{name}-link.patch
-URL: http://code.google.com/p/lib7zip/
+Patch1: %{name}-ac.patch
+URL: https://github.com/stonewell/lib7zip
BuildRequires: autoconf >= 2.50
BuildRequires: automake
BuildRequires: libstdc++-devel
@@ -54,19 +57,22 @@ Static lib7zip library.
Statyczna biblioteka lib7zip.
%prep
-%setup -q -a1
+%setup -q -n %{name}-%{gitref} -a1
%patch0 -p1
+%patch1 -p1
# remove it when "linking libtool libraries using a non-POSIX archiver ..."
warning is gone
# (after lib7zip or libtool change)
-%{__sed} -i -e '/AM_INIT_AUTOMAKE/s/-Werror//' configure.ac
+#%{__sed} -i -e '/AM_INIT_AUTOMAKE/s/-Werror//' configure.ac
%build
%{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
%{__autoconf}
%{__automake}
export P7ZIP_SOURCE_DIR="$(pwd)/p7zip_%{p7zip_version}"
+# automake leaves some junk in includes dir
+#rm -rf includes/{C,CPP}
%configure
%{__make}
diff --git a/lib7zip-ac.patch b/lib7zip-ac.patch
new file mode 100644
index 0000000..7e94308
--- /dev/null
+++ b/lib7zip-ac.patch
@@ -0,0 +1,55 @@
+Create include/CPP symlink before running automake's "depfiles" commands,
which would create includes/CPP directory.
+--- lib7zip-5bc54cab38656fd57df7736087ef6914ddb68c72/configure.ac.orig
2015-11-18 05:00:38.000000000 +0100
++++ lib7zip-5bc54cab38656fd57df7736087ef6914ddb68c72/configure.ac
2017-06-07 18:48:31.297434499 +0200
+@@ -1,5 +1,25 @@
+ AC_INIT([lib7zip], [2.0.0], [[email protected]])
+ AC_CONFIG_SRCDIR(Lib7Zip/lib7zip.h)
++
++dnl check for p7zip source
++AC_ARG_VAR([P7ZIP_SOURCE_DIR], [p7zip source directory, must be set before
compile source])
++
++if test "x$P7ZIP_SOURCE_DIR" = "x"; then
++AC_MSG_FAILURE(P7ZIP_SOURCE_DIR is not set)
++fi
++
++if test ! -d "$P7ZIP_SOURCE_DIR/C"; then
++AC_MSG_FAILURE($P7ZIP_SOURCE_DIR/C is invalid)
++fi
++
++if test ! -d "$P7ZIP_SOURCE_DIR/CPP"; then
++AC_MSG_FAILURE(P7ZIP_SOURCE_DIR is invalid)
++fi
++
++dnl create link for p7zip source
++AC_CONFIG_COMMANDS([p7zip_src_cpp_link], [ln -sf $P7ZIP_SOURCE_DIR/CPP
includes/CPP])
++AC_CONFIG_COMMANDS([p7zip_src_c_link], [ln -sf $P7ZIP_SOURCE_DIR/C
includes/C])
++
+ AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
+ AC_CONFIG_MACRO_DIR([m4])
+
+@@ -38,25 +58,6 @@
+
+ AM_CONDITIONAL(WIN32, test x$is_win32 = xyes)
+
+-dnl check for p7zip source
+-AC_ARG_VAR([P7ZIP_SOURCE_DIR], [p7zip source directory, must be set before
compile source])
+-
+-if test "x$P7ZIP_SOURCE_DIR" = "x"; then
+-AC_MSG_FAILURE(P7ZIP_SOURCE_DIR is not set)
+-fi
+-
+-if test ! -d "$P7ZIP_SOURCE_DIR/C"; then
+-AC_MSG_FAILURE($P7ZIP_SOURCE_DIR/C is invalid)
+-fi
+-
+-if test ! -d "$P7ZIP_SOURCE_DIR/CPP"; then
+-AC_MSG_FAILURE(P7ZIP_SOURCE_DIR is invalid)
+-fi
+-
+-dnl create link for p7zip source
+-AC_CONFIG_COMMANDS([p7zip_src_cpp_link], [ln -sf $P7ZIP_SOURCE_DIR/CPP
includes/CPP])
+-AC_CONFIG_COMMANDS([p7zip_src_c_link], [ln -sf $P7ZIP_SOURCE_DIR/C
includes/C])
+-
+ AC_CONFIG_FILES([
+ Makefile
+ includes/Makefile
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lib7zip.git/commitdiff/6beda3c379d327464b0950d4c4adcfb28c574a41
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
