commit afd4f101df7192e5c015bd53b3b988e17e3f0d2c
Author: Jakub Bogusz <[email protected]>
Date: Wed Jul 17 21:21:37 2019 +0200
- updated to 20181124 (alpha)
- removed obsolete system-libs patch
libfdata-system-libs.patch | 56 ----------------------------------------------
libfdata.spec | 52 +++++++++++++++++++++---------------------
2 files changed, 26 insertions(+), 82 deletions(-)
---
diff --git a/libfdata.spec b/libfdata.spec
index 0060148..704c863 100644
--- a/libfdata.spec
+++ b/libfdata.spec
@@ -1,32 +1,35 @@
+# see m4/${libname}.m4 />= for required version of particular library
+%define libcdata_ver 20160108
+%define libcerror_ver 20120425
+%define libcnotify_ver 20120425
+%define libcthreads_ver 20160404
+%define libfcache_ver 20181010
Summary: Library to provide generic file data functions
Summary(pl.UTF-8): Biblioteka udostępniająca ogólne funkcje obsługi danych
w plikach
Name: libfdata
-Version: 20150104
-Release: 2
+Version: 20181124
+Release: 1
License: LGPL v3+
Group: Libraries
-Source0:
https://github.com/libyal/libfdata/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 3d308065c27c965c6ebd07073402d466
-Patch0: %{name}-system-libs.patch
+#Source0Download: https://github.com/libyal/libfdata/releases
+Source0:
https://github.com/libyal/libfdata/releases/download/%{version}/%{name}-alpha-%{version}.tar.gz
+# Source0-md5: 305446c43ae40479c2820849a71b7921
URL: https://github.com/libyal/libfdata/
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1.6
BuildRequires: gettext-tools >= 0.18.1
-BuildRequires: libcdata-devel >= 20130407
-BuildRequires: libcerror-devel >= 20120425
-BuildRequires: libcnotify-devel >= 20120425
-BuildRequires: libcstring-devel >= 20120425
-BuildRequires: libcthreads-devel >= 20130509
-BuildRequires: libfcache-devel >= 20140912
+BuildRequires: libcdata-devel >= %{libcdata_ver}
+BuildRequires: libcerror-devel >= %{libcerror_ver}
+BuildRequires: libcnotify-devel >= %{libcnotify_ver}
+BuildRequires: libcthreads-devel >= %{libcthreads_ver}
+BuildRequires: libfcache-devel >= %{libfcache_ver}
BuildRequires: libtool
BuildRequires: pkgconfig
-BuildRequires: sed >= 4.0
-Requires: libcdata >= 20130407
-Requires: libcerror >= 20120425
-Requires: libcnotify >= 20120425
-Requires: libcstring >= 20120425
-Requires: libcthreads >= 20130509
-Requires: libfcache >= 20140912
+Requires: libcdata >= %{libcdata_ver}
+Requires: libcerror >= %{libcerror_ver}
+Requires: libcnotify >= %{libcnotify_ver}
+Requires: libcthreads >= %{libcthreads_ver}
+Requires: libfcache >= %{libfcache_ver}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -41,12 +44,11 @@ Summary: Header files for libfdata library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libfdata
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: libcdata-devel >= 20130407
-Requires: libcerror-devel >= 20120425
-Requires: libcnotify-devel >= 20120425
-Requires: libcstring-devel >= 20120425
-Requires: libcthreads-devel >= 20130509
-Requires: libfcache-devel >= 20140912
+Requires: libcdata-devel >= %{libcdata_ver}
+Requires: libcerror-devel >= %{libcerror_ver}
+Requires: libcnotify-devel >= %{libcnotify_ver}
+Requires: libcthreads-devel >= %{libcthreads_ver}
+Requires: libfcache-devel >= %{libfcache_ver}
%description devel
Header files for libfdata library.
@@ -68,11 +70,9 @@ Statyczna biblioteka libfdata.
%prep
%setup -q
-%patch0 -p1
%build
%{__gettextize}
-%{__sed} -i -e 's/ po\/Makefile.in//' configure.ac
%{__libtoolize}
%{__aclocal} -I m4
%{__autoconf}
diff --git a/libfdata-system-libs.patch b/libfdata-system-libs.patch
deleted file mode 100644
index 873d408..0000000
--- a/libfdata-system-libs.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- libfdata-20150104/configure.ac.orig 2015-01-22 16:44:09.172745454
+0100
-+++ libfdata-20150104/configure.ac 2015-01-22 17:13:42.969337682 +0100
-@@ -139,12 +139,6 @@ 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([libcthreads/Makefile])
--AC_CONFIG_FILES([libcdata/Makefile])
--AC_CONFIG_FILES([libcnotify/Makefile])
--AC_CONFIG_FILES([libfcache/Makefile])
- AC_CONFIG_FILES([libfdata/Makefile])
- AC_CONFIG_FILES([po/Makefile.in])
- AC_CONFIG_FILES([po/Makevars])
---- libfdata-20150104/Makefile.am.orig 2015-01-22 16:44:08.652745476 +0100
-+++ libfdata-20150104/Makefile.am 2015-01-22 17:13:59.979336968 +0100
-@@ -3,12 +3,6 @@ ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = \
- include \
- common \
-- libcstring \
-- libcerror \
-- libcthreads \
-- libcdata \
-- libcnotify \
-- libfcache \
- libfdata \
- po \
- manuals \
-@@ -59,12 +53,6 @@ lib: library
-
- library:
- (cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcstring && $(MAKE) $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcerror && $(MAKE) $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcthreads && $(MAKE) $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcdata && $(MAKE) $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcnotify && $(MAKE) $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libfcache && $(MAKE) $(AM_MAKEFLAGS))
- (cd $(srcdir)/libfdata && $(MAKE) $(AM_MAKEFLAGS))
- (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
-
-@@ -81,12 +69,6 @@ distclean: clean
- done && test -z "$$fail"
-
- splint:
-- (cd $(srcdir)/libcstring && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcerror && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcthreads && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcdata && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcnotify && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libfcache && $(MAKE) splint $(AM_MAKEFLAGS))
- (cd $(srcdir)/libfdata && $(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/libfdata.git/commitdiff/afd4f101df7192e5c015bd53b3b988e17e3f0d2c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
