[packages/libuna] - updated to 20190102 (alpha) - removed obsolete system-libs patch

qboosh qboosh at pld-linux.org
Wed Jul 17 17:29:37 CEST 2019 

commit 3422fe1a4dbb2c322add24eae1b2bfc6f9ce6146
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Jul 17 17:31:25 2019 +0200

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

 libuna-system-libs.patch | 79 ------------------------------------------------
 libuna.spec              | 59 ++++++++++++++++++++----------------
 2 files changed, 33 insertions(+), 105 deletions(-)
---
diff --git a/libuna.spec b/libuna.spec
index 9759a29..be79f71 100644
--- a/libuna.spec
+++ b/libuna.spec
@@ -2,34 +2,40 @@
 # Conditional build:
 %bcond_without	tools	# unatools (disable for bootstrap)
 
+# m4/libcdatetime.m4
+%define		libcdatetime_ver	20141018
+# m4/libcerror.m4
+%define		libcerror_ver		20120425
+# m4/libcfile.m4
+%define		libcfile_ver		20160409
+# m4/libclocale.m4
+%define		libclocale_ver		20120425
+# m4/libcnotify.m4
+%define		libcnotify_ver		20120425
 Summary:	Library to support Unicode and ASCII (byte stream) conversions
 Summary(pl.UTF-8):	Biblioteka obsługująca przekształcenia Unicode i ASCII (strumieni bajtów)
 Name:		libuna
-Version:	20150101
-Release:	2
+Version:	20190102
+Release:	1
 License:	LGPL v3+
 Group:		Libraries
-Source0:	https://github.com/libyal/libuna/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	36e8c89a1a8e516b65359ed6340fa455
-Patch0:		%{name}-system-libs.patch
+#Source0Download: https://github.com/libyal/libuna/releases
+Source0:	https://github.com/libyal/libuna/releases/download/%{version}/%{name}-alpha-%{version}.tar.gz
+# Source0-md5:	0baeb0c0b19e2fb85bdfb7b7bf0150ba
 URL:		https://github.com/libyal/libuna/
 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
 %if %{with tools}
-BuildRequires:	libcdatetime-devel >= 20141018
-BuildRequires:	libclocale-devel >= 20120425
-BuildRequires:	libcnotify-devel >= 20120425
-BuildRequires:	libcfile-devel >= 20140503
-BuildRequires:	libcsystem-devel >= 20141018
+BuildRequires:	libcdatetime-devel >= %{libcdatetime_ver}
+BuildRequires:	libclocale-devel >= %{libclocale_ver}
+BuildRequires:	libcnotify-devel >= %{libcnotify_ver}
+BuildRequires:	libcfile-devel >= %{libcfile_ver}
 %endif
-Requires:	libcerror >= 20120425
-Requires:	libcstring >= 20120425
+Requires:	libcerror >= %{libcerror_ver}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -45,8 +51,7 @@ Summary:	Header files for libuna library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libuna
 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 libuna library.
@@ -71,11 +76,10 @@ Summary:	Unicode and ASCII (byte stream) conversion utilities
 Summary(pl.UTF-8):	Narzędzia do konwersji Unicode i ASCII (strumieni bajtów)
 Group:		Applications/Text
 Requires:	%{name} = %{version}-%{release}
-Requires:	libcdatetime >= 20141018
-Requires:	libclocale >= 20120425
-Requires:	libcnotify >= 20120425
-Requires:	libcfile >= 20140503
-Requires:	libcsystem >= 20141018
+Requires:	libcdatetime >= %{libcdatetime_ver}
+Requires:	libclocale >= %{libclocale_ver}
+Requires:	libcnotify >= %{libcnotify_ver}
+Requires:	libcfile >= %{libcfile_ver}
 
 %description tools
 Unicode and ASCII (byte stream) conversion utilities.
@@ -85,18 +89,16 @@ Narzędzia do konwersji Unicode i ASCII (strumieni bajtów).
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__gettextize}
-%{__sed} -i -e 's/ po\/Makefile.in//' configure.ac
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure \
-	%{!?with_tools:--without-tools}
+%configure
+
 %{__make}
 
 %install
@@ -108,6 +110,11 @@ rm -rf $RPM_BUILD_ROOT
 # obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libuna.la
 
+%if %{without tools}
+%{__rm} -f $RPM_BUILD_ROOT%{_bindir}/una* \
+	$RPM_BUILD_ROOT%{_mandir}/man1/una*
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
diff --git a/libuna-system-libs.patch b/libuna-system-libs.patch
deleted file mode 100644
index 923b4e6..0000000
--- a/libuna-system-libs.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- libuna-20150101/configure.ac.orig	2015-01-19 20:46:13.619680184 +0100
-+++ libuna-20150101/configure.ac	2015-01-20 20:48:27.142715380 +0100
-@@ -43,6 +43,9 @@ AC_C_CONST
- AC_C_INLINE
- AC_C_VOLATILE
- 
-+AC_ARG_WITH([tools], [AS_HELP_STRING([--without-tools], [Build without tools])], [with_tools=$withval], [with_tools=yes])
-+AM_CONDITIONAL([WITH_TOOLS], [test $with_tools = yes])
-+
- dnl Check if WINAPI support should be enabled
- AX_COMMON_CHECK_ENABLE_WINAPI
- 
-@@ -154,14 +157,7 @@ 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([libuna/Makefile])
--AC_CONFIG_FILES([libcdatetime/Makefile])
--AC_CONFIG_FILES([libclocale/Makefile])
--AC_CONFIG_FILES([libcnotify/Makefile])
--AC_CONFIG_FILES([libcfile/Makefile])
--AC_CONFIG_FILES([libcsystem/Makefile])
- AC_CONFIG_FILES([unatools/Makefile])
- AC_CONFIG_FILES([po/Makefile.in])
- AC_CONFIG_FILES([po/Makevars])
---- libuna-20150101/Makefile.am.orig	2015-01-01 15:58:06.000000000 +0100
-+++ libuna-20150101/Makefile.am	2015-01-20 20:57:26.452692747 +0100
-@@ -3,21 +3,17 @@ ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = \
- 	include \
- 	common \
--	libcstring \
--	libcerror \
- 	libuna \
--	libcdatetime \
--	libclocale \
--	libcnotify \
--	libcfile \
--	libcsystem \
--	unatools \
- 	po \
- 	documents \
- 	manuals \
- 	tests \
- 	msvscpp
- 
-+if WITH_TOOLS
-+SUBDIRS += unatools
-+endif
-+
- DPKG_FILES = \
- 	dpkg/changelog \
- 	dpkg/changelog.in \
-@@ -63,8 +59,6 @@ lib: library
- 
- library:
- 	cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS)
--	cd $(srcdir)/libcstring && $(MAKE) $(AM_MAKEFLAGS)
--	cd $(srcdir)/libcerror && $(MAKE) $(AM_MAKEFLAGS)
- 	cd $(srcdir)/libuna && $(MAKE) $(AM_MAKEFLAGS)
- 	cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)
- 
-@@ -81,14 +75,7 @@ distclean: clean
- 	done && test -z "$$fail"
- 
- splint:
--	(cd $(srcdir)/libcstring && $(MAKE) splint $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libcerror && $(MAKE) splint $(AM_MAKEFLAGS))
- 	(cd $(srcdir)/libuna && $(MAKE) splint $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libcdatetime && $(MAKE) splint $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libclocale && $(MAKE) splint $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libcnotify && $(MAKE) splint $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libcfile && $(MAKE) splint $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libcsystem && $(MAKE) splint $(AM_MAKEFLAGS))
- 	(cd $(srcdir)/unatools && $(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/libuna.git/commitdiff/3422fe1a4dbb2c322add24eae1b2bfc6f9ce6146

More information about the pld-cvs-commit mailing list