commit d1b7d846a615ea9b48159c41778757c3c4e8f31c
Author: Jakub Bogusz <[email protected]>
Date: Wed Jul 17 17:20:54 2019 +0200
- updated to 20190314 (alpha)
- removed obsolete system-libs patch
libcfile-system-libs.patch | 52 ----------------------------------------------
libcfile.spec | 48 ++++++++++++++++++++++--------------------
2 files changed, 25 insertions(+), 75 deletions(-)
---
diff --git a/libcfile.spec b/libcfile.spec
index 6e2c001..8beb69f 100644
--- a/libcfile.spec
+++ b/libcfile.spec
@@ -1,30 +1,35 @@
+# m4/libcerror.m4
+%define libcerror_ver 20120425
+# m4/libclocale.m4
+%define libclocale_ver 20120425
+# m4/libcnotify.m4
+%define libcnotify_ver 20120425
+# m4/libuna.m4
+%define libuna_ver 20181006
Summary: Library to support cross-platform C file functions
Summary(pl.UTF-8): Biblioteka wspierająca wieloplatformowe funkcje obsługi
plików w C
Name: libcfile
-Version: 20150101
-Release: 2
+Version: 20190314
+Release: 1
License: LGPL v3+
Group: Libraries
-Source0:
https://github.com/libyal/libcfile/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: d0be08f6cdbb85262e9943596d3b256d
-Patch0: %{name}-system-libs.patch
+#Source0Download: https://github.com/libyal/libcfile/releases
+Source0:
https://github.com/libyal/libcfile/releases/download/%{version}/%{name}-alpha-%{version}.tar.gz
+# Source0-md5: 12751f850be67cf3b9aac14dc885f210
URL: https://github.com/libyal/libcfile/
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1.6
BuildRequires: gettext-tools >= 0.18.1
-BuildRequires: libcerror-devel >= 20120425
-BuildRequires: libclocale-devel >= 20120425
-BuildRequires: libcnotify-devel >= 20120425
-BuildRequires: libcstring-devel >= 20120425
-BuildRequires: libuna-devel >= 20120425
+BuildRequires: libcerror-devel >= %{libcerror_ver}
+BuildRequires: libclocale-devel >= %{libclocale_ver}
+BuildRequires: libcnotify-devel >= %{libcnotify_ver}
+BuildRequires: libuna-devel >= %{libuna_ver}
BuildRequires: libtool
BuildRequires: pkgconfig
-BuildRequires: sed >= 4.0
-Requires: libcerror >= 20120425
-Requires: libclocale >= 20120425
-Requires: libcnotify >= 20120425
-Requires: libcstring >= 20120425
-Requires: libuna >= 20120425
+Requires: libcerror >= %{libcerror_ver}
+Requires: libclocale >= %{libclocale_ver}
+Requires: libcnotify >= %{libcnotify_ver}
+Requires: libuna >= %{libuna_ver}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -39,11 +44,10 @@ Summary: Header files for libcfile library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libcfile
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: libcerror-devel >= 20120425
-Requires: libclocale-devel >= 20120425
-Requires: libcnotify-devel >= 20120425
-Requires: libcstring-devel >= 20120425
-Requires: libuna-devel >= 20120425
+Requires: libcerror-devel >= %{libcerror_ver}
+Requires: libclocale-devel >= %{libclocale_ver}
+Requires: libcnotify-devel >= %{libcnotify_ver}
+Requires: libuna-devel >= %{libuna_ver}
%description devel
Header files for libcfile library.
@@ -65,11 +69,9 @@ Statyczna biblioteka libcfile.
%prep
%setup -q
-%patch0 -p1
%build
%{__gettextize}
-%{__sed} -i -e 's/ po\/Makefile.in//' configure.ac
%{__libtoolize}
%{__aclocal} -I m4
%{__autoconf}
diff --git a/libcfile-system-libs.patch b/libcfile-system-libs.patch
deleted file mode 100644
index e046931..0000000
--- a/libcfile-system-libs.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- libcfile-20150101/configure.ac.orig 2015-01-20 17:41:27.939852872
+0100
-+++ libcfile-20150101/configure.ac 2015-01-20 21:32:35.605937567 +0100
-@@ -143,11 +143,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([libclocale/Makefile])
--AC_CONFIG_FILES([libcnotify/Makefile])
--AC_CONFIG_FILES([libuna/Makefile])
- AC_CONFIG_FILES([libcfile/Makefile])
- AC_CONFIG_FILES([po/Makefile.in])
- AC_CONFIG_FILES([po/Makevars])
---- libcfile-20150101/Makefile.am.orig 2015-01-20 17:41:27.393186228 +0100
-+++ libcfile-20150101/Makefile.am 2015-01-20 21:32:54.082603459 +0100
-@@ -3,11 +3,6 @@ ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = \
- include \
- common \
-- libcstring \
-- libcerror \
-- libclocale \
-- libcnotify \
-- libuna \
- libcfile \
- po \
- manuals \
-@@ -58,11 +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)/libclocale && $(MAKE) $(AM_MAKEFLAGS)
-- cd $(srcdir)/libcnotify && $(MAKE) $(AM_MAKEFLAGS)
-- cd $(srcdir)/libuna && $(MAKE) $(AM_MAKEFLAGS)
- cd $(srcdir)/libcfile && $(MAKE) $(AM_MAKEFLAGS)
- cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)
-
-@@ -79,11 +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)/libclocale && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcnotify && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libuna && $(MAKE) splint $(AM_MAKEFLAGS))
- (cd $(srcdir)/libcfile && $(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/libcfile.git/commitdiff/d1b7d846a615ea9b48159c41778757c3c4e8f31c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
