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