commit b212054d497d2cae5083ab495b3452cc81a1fe46
Author: Jakub Bogusz <[email protected]>
Date: Thu Jul 18 18:03:54 2019 +0200
- updated to 20180731 (alpha)
- removed obsolete system-libs patch
libhmac-system-libs.patch | 64 -----------------------------------------------
libhmac.spec | 56 ++++++++++++++++++++---------------------
2 files changed, 28 insertions(+), 92 deletions(-)
---
diff --git a/libhmac.spec b/libhmac.spec
index 3a83d05..b3ef7b7 100644
--- a/libhmac.spec
+++ b/libhmac.spec
@@ -1,39 +1,42 @@
+# see m4/${libname}.m4 />= for required version of particular library
+%define libcerror_ver 20120425
+%define libcfile_ver 20160409
+%define libclocale_ver 20120425
+%define libcnotify_ver 20120425
+%define libcpath_ver 20180716
+%define libcsplit_ver 20120701
+%define libuna_ver 20120425
Summary: Library to support various Hash-based Message Authentication
Codes (HMAC)
Summary(pl.UTF-8): Biblioteka obsługująca różne kody uwierzytelniające
oparte na skrótach (HMAC)
Name: libhmac
-Version: 20150104
-Release: 3
+Version: 20180731
+Release: 1
License: LGPL v3+
Group: Libraries
-Source0:
https://github.com/libyal/libhmac/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 884a976f30e374cbdd5ab528d90adca0
-Patch0: %{name}-system-libs.patch
+#Source0Download: https://github.com/libyal/libhmac/releases
+Source0:
https://github.com/libyal/libhmac/releases/download/%{version}/%{name}-alpha-%{version}.tar.gz
+# Source0-md5: bd7704e38dd44e38aee170dbd8ecc8b4
URL: https://github.com/libyal/libhmac/
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1.6
BuildRequires: gettext-tools >= 0.18.1
-BuildRequires: libcerror-devel >= 20120425
-BuildRequires: libcfile-devel >= 20140503
-BuildRequires: libclocale-devel >= 20120425
-BuildRequires: libcnotify-devel >= 20120425
-BuildRequires: libcpath-devel >= 20120701
-BuildRequires: libcsplit-devel >= 20120701
-BuildRequires: libcstring-devel >= 20120425
-BuildRequires: libcsystem-devel >= 20141018
-BuildRequires: libuna-devel >= 20120425
+BuildRequires: libcerror-devel >= %{libcerror_ver}
+BuildRequires: libcfile-devel >= %{libcfile_ver}
+BuildRequires: libclocale-devel >= %{libclocale_ver}
+BuildRequires: libcnotify-devel >= %{libcnotify_ver}
+BuildRequires: libcpath-devel >= %{libcpath_ver}
+BuildRequires: libcsplit-devel >= %{libcsplit_ver}
+BuildRequires: libuna-devel >= %{libuna_ver}
BuildRequires: libtool
BuildRequires: openssl-devel >= 1.0
BuildRequires: pkgconfig
-BuildRequires: sed >= 4.0
-Requires: libcerror >= 20120425
-Requires: libcfile >= 20140503
-Requires: libclocale >= 20120425
-Requires: libcnotify >= 20120425
-Requires: libcpath >= 20120701
-Requires: libcsplit >= 20120701
-Requires: libcstring >= 20120425
-Requires: libcsystem >= 20141018
-Requires: libuna >= 20120425
+Requires: libcerror >= %{libcerror_ver}
+Requires: libcfile >= %{libcfile_ver}
+Requires: libclocale >= %{libclocale_ver}
+Requires: libcnotify >= %{libcnotify_ver}
+Requires: libcpath >= %{libcpath_ver}
+Requires: libcsplit >= %{libcsplit_ver}
+Requires: libuna >= %{libuna_ver}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -49,8 +52,7 @@ Summary: Header files for libhmac library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libhmac
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: libcerror-devel >= 20120425
-Requires: libcstring-devel >= 20120425
+Requires: libcerror-devel >= %{libcerror_ver}
Requires: openssl-devel >= 1.0
%description devel
@@ -73,11 +75,9 @@ Statyczna biblioteka libhmac.
%prep
%setup -q
-%patch0 -p1
%build
%{__gettextize}
-%{__sed} -i -e 's/ po\/Makefile.in//' configure.ac
%{__libtoolize}
%{__aclocal} -I m4
%{__autoconf}
diff --git a/libhmac-system-libs.patch b/libhmac-system-libs.patch
deleted file mode 100644
index e3aa3f5..0000000
--- a/libhmac-system-libs.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- libhmac-20150104/configure.ac.orig 2015-01-22 21:22:50.472043728 +0100
-+++ libhmac-20150104/configure.ac 2015-01-22 21:49:51.885309018 +0100
-@@ -160,16 +160,7 @@ dnl Have configure make the Makefiles
- AC_CONFIG_FILES([Makefile])
- AC_CONFIG_FILES([include/Makefile])
- AC_CONFIG_FILES([common/Makefile])
--AC_CONFIG_FILES([libcstring/Makefile])
--AC_CONFIG_FILES([libcerror/Makefile])
- AC_CONFIG_FILES([libhmac/Makefile])
--AC_CONFIG_FILES([libclocale/Makefile])
--AC_CONFIG_FILES([libcnotify/Makefile])
--AC_CONFIG_FILES([libcsplit/Makefile])
--AC_CONFIG_FILES([libuna/Makefile])
--AC_CONFIG_FILES([libcfile/Makefile])
--AC_CONFIG_FILES([libcpath/Makefile])
--AC_CONFIG_FILES([libcsystem/Makefile])
- AC_CONFIG_FILES([hmactools/Makefile])
- AC_CONFIG_FILES([po/Makefile.in])
- AC_CONFIG_FILES([po/Makevars])
---- libhmac-20150104/Makefile.am.orig 2015-01-22 21:22:49.925377085 +0100
-+++ libhmac-20150104/Makefile.am 2015-01-22 21:50:10.885308221 +0100
-@@ -3,16 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = \
- include \
- common \
-- libcstring \
-- libcerror \
- libhmac \
-- libclocale \
-- libcnotify \
-- libcsplit \
-- libuna \
-- libcfile \
-- libcpath \
-- libcsystem \
- hmactools \
- po \
- manuals \
-@@ -64,8 +55,6 @@ lib: library
-
- library:
- (cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcstring && $(MAKE) $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcerror && $(MAKE) $(AM_MAKEFLAGS))
- (cd $(srcdir)/libhmac && $(MAKE) $(AM_MAKEFLAGS))
- (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
-
-@@ -82,16 +71,7 @@ distclean: clean
- done && test -z "$$fail"
-
- splint:
-- (cd $(srcdir)/libcstring && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcerror && $(MAKE) splint $(AM_MAKEFLAGS))
- (cd $(srcdir)/libhmac && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libclocale && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcnotify && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcsplit && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libuna && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcfile && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcpath && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcsystem && $(MAKE) splint $(AM_MAKEFLAGS))
- (cd $(srcdir)/hmactools && $(MAKE) splint $(AM_MAKEFLAGS))
- (cd $(srcdir)/po && $(MAKE) splint $(AM_MAKEFLAGS))
- (cd $(srcdir)/tests && $(MAKE) splint $(AM_MAKEFLAGS))
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libhmac.git/commitdiff/b212054d497d2cae5083ab495b3452cc81a1fe46
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
