[packages/libcsplit] - updated to 20190102 (beta) - removed obsolete system-libs patch

qboosh qboosh at pld-linux.org
Wed Jul 17 18:28:24 CEST 2019


commit 62d6b1f15250ec91115a1ab410cb758b72e5f579
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Jul 17 18:30:12 2019 +0200

    - updated to 20190102 (beta)
    - removed obsolete system-libs patch

 libcsplit-system-libs.patch | 40 ----------------------------------------
 libcsplit.spec              | 24 ++++++++++--------------
 2 files changed, 10 insertions(+), 54 deletions(-)
---
diff --git a/libcsplit.spec b/libcsplit.spec
index ff159b7..b1d95b7 100644
--- a/libcsplit.spec
+++ b/libcsplit.spec
@@ -1,24 +1,23 @@
+# m4/libcerror.m4
+%define		libcerror_ver	20120425
 Summary:	Library to support cross-platform C split string functions
 Summary(pl.UTF-8):	Biblioteka wspierająca wieloplatformowe funkcje dzielenia łańcuchów w C
 Name:		libcsplit
-Version:	20150101
-Release:	2
+Version:	20190102
+Release:	1
 License:	LGPL v3+
 Group:		Libraries
-Source0:	https://github.com/libyal/libcsplit/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	978a145663dd4eff9f9d74a02be3d649
-Patch0:		%{name}-system-libs.patch
+#Source0Download: https://github.com/libyal/libcsplit/releases
+Source0:	https://github.com/libyal/libcsplit/releases/download/%{version}/%{name}-beta-%{version}.tar.gz
+# Source0-md5:	099c4df3d879f4e72afdc93259d52ac7
 URL:		https://github.com/libyal/libcsplit/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1.6
 BuildRequires:	gettext-tools >= 0.18.1
-BuildRequires:	libcerror-devel >= 20120425
-BuildRequires:	libcstring-devel >= 20120425
+BuildRequires:	libcerror-devel >= %{libcerror_ver}
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
-BuildRequires:	sed >= 4.0
-Requires:	libcerror >= 20120425
-Requires:	libcstring >= 20120425
+Requires:	libcerror >= %{libcerror_ver}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -34,8 +33,7 @@ Summary:	Header files for libcsplit library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libcsplit
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	libcerror-devel >= 20120425
-Requires:	libcstring-devel >= 20120425
+Requires:	libcerror-devel >= %{libcerror_ver}
 
 %description devel
 Header files for libcsplit library.
@@ -57,11 +55,9 @@ Statyczna biblioteka libcsplit.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__gettextize}
-%{__sed} -i -e 's/ po\/Makefile.in//' configure.ac
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
diff --git a/libcsplit-system-libs.patch b/libcsplit-system-libs.patch
deleted file mode 100644
index 7ee773f..0000000
--- a/libcsplit-system-libs.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- libcsplit-20150101/configure.ac.orig	2015-01-19 20:26:03.176397642 +0100
-+++ libcsplit-20150101/configure.ac	2015-01-19 20:34:58.506375182 +0100
-@@ -125,8 +125,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([libcsplit/Makefile])
- AC_CONFIG_FILES([po/Makefile.in])
- AC_CONFIG_FILES([po/Makevars])
---- libcsplit-20150101/Makefile.am.orig	2015-01-19 20:26:02.919730990 +0100
-+++ libcsplit-20150101/Makefile.am	2015-01-19 20:35:10.719708002 +0100
-@@ -3,8 +3,6 @@ ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = \
- 	include \
- 	common \
--	libcstring \
--	libcerror \
- 	libcsplit \
- 	po \
- 	manuals \
-@@ -55,8 +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)/libcsplit && $(MAKE) $(AM_MAKEFLAGS)
- 	cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)
- 
-@@ -73,8 +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)/libcsplit && $(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/libcsplit.git/commitdiff/62d6b1f15250ec91115a1ab410cb758b72e5f579



More information about the pld-cvs-commit mailing list