commit a1a64741c164376f372f34480fc70a44da4f125b
Author: Jakub Bogusz <[email protected]>
Date: Tue Jul 16 21:10:42 2019 +0200
- updated to 20190112 (alpha)
- removed obsolete system-libs patch
libcdata-system-libs.patch | 44 --------------------------------------------
libcdata.spec | 38 +++++++++++++++++---------------------
2 files changed, 17 insertions(+), 65 deletions(-)
---
diff --git a/libcdata.spec b/libcdata.spec
index 8016407..25b84be 100644
--- a/libcdata.spec
+++ b/libcdata.spec
@@ -1,29 +1,27 @@
+# see m4/libcerror.m4
+%define libcerror_ver 20120425
+# see m4/libcthreads.m4
+%define libcthreads_ver 20160404
Summary: Library for cross-platform C generic data functions
Summary(pl.UTF-8): Biblioteka wieloplatformowych funkcji ogólnej obsługi
danych w C
Name: libcdata
-# version from AC_INIT
-Version: 20150102
-%define gitrev 1ae7a100d49d52a17b24c57efc941c9370be0ea8
-Release: 2
+Version: 20190112
+Release: 1
License: LGPL v3+
Group: Libraries
-#Source0:
https://github.com/libyal/libcdata/archive/%{version}/%{name}-%{version}.tar.gz
-Source0:
https://github.com/libyal/libcdata/archive/%{gitrev}/%{name}-%{version}.tar.gz
-# Source0-md5: c85b2ddc9c585114a1c40f99df8b4f8c
-Patch0: %{name}-system-libs.patch
+#Source0Download: https://github.com/libyal/libcdata/releases
+Source0:
https://github.com/libyal/libcdata/releases/download/%{version}/%{name}-alpha-%{version}.tar.gz
+# Source0-md5: 3aac4b2a0f927c0504ecfccfd4bb264c
URL: https://github.com/libyal/libcdata/
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1.6
BuildRequires: gettext-tools >= 0.18.1
-BuildRequires: libcerror-devel >= 20120425
-BuildRequires: libcstring-devel >= 20120425
-BuildRequires: libcthreads-devel >= 20130509
+BuildRequires: libcerror-devel >= %{libcerror_ver}
+BuildRequires: libcthreads-devel >= %{libcthreads_ver}
BuildRequires: libtool
BuildRequires: pkgconfig
-BuildRequires: sed >= 4.0
-Requires: libcerror >= 20120425
-Requires: libcstring >= 20120425
-Requires: libcthreads >= 20130509
+Requires: libcerror >= %{libcerror_ver}
+Requires: libcthreads >= %{libcthreads_ver}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -38,9 +36,8 @@ Summary: Header files for libcdata library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libcdata
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: libcerror-devel >= 20120425
-Requires: libcstring-devel >= 20120425
-Requires: libcthreads-devel >= 20130509
+Requires: libcerror-devel >= %{libcerror_ver}
+Requires: libcthreads-devel >= %{libcthreads_ver}
%description devel
Header files for libcdata library.
@@ -61,18 +58,17 @@ Static libcdata library.
Statyczna biblioteka libcdata.
%prep
-%setup -q -n %{name}-%{gitrev}
-%patch0 -p1
+%setup -q
%build
%{__gettextize}
-%{__sed} -i -e 's/ po\/Makefile.in//' configure.ac
%{__libtoolize}
%{__aclocal} -I m4
%{__autoconf}
%{__autoheader}
%{__automake}
%configure
+
%{__make}
%install
diff --git a/libcdata-system-libs.patch b/libcdata-system-libs.patch
deleted file mode 100644
index 60aceea..0000000
--- a/libcdata-system-libs.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- libcdata-20150101/configure.ac.orig 2015-01-18 21:05:28.869924230
+0100
-+++ libcdata-20150101/configure.ac 2015-01-18 21:10:32.076578174 +0100
-@@ -128,9 +128,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([po/Makefile.in])
- AC_CONFIG_FILES([po/Makevars])
---- libcdata-20150101/Makefile.am.orig 2015-01-18 21:05:28.406590917 +0100
-+++ libcdata-20150101/Makefile.am 2015-01-18 21:10:50.679910725 +0100
-@@ -3,9 +3,6 @@ ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = \
- include \
- common \
-- libcstring \
-- libcerror \
-- libcthreads \
- libcdata \
- po \
- manuals \
-@@ -56,9 +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)/po && $(MAKE) $(AM_MAKEFLAGS)
-
-@@ -75,9 +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)/po && $(MAKE) splint $(AM_MAKEFLAGS))
- (cd $(srcdir)/tests && $(MAKE) splint $(AM_MAKEFLAGS))
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libcdata.git/commitdiff/a1a64741c164376f372f34480fc70a44da4f125b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
