commit 4b5f50285f3c26705d10cab93e401c1994bc91f6
Author: Jakub Bogusz <[email protected]>
Date: Tue Jul 16 22:16:12 2019 +0200
- updated to 20180721 (alpha)
- removed obsolete system-libs patch
libclocale-system-libs.patch | 40 ----------------------------------------
libclocale.spec | 24 ++++++++++--------------
2 files changed, 10 insertions(+), 54 deletions(-)
---
diff --git a/libclocale.spec b/libclocale.spec
index d517cd9..2d5f4dd 100644
--- a/libclocale.spec
+++ b/libclocale.spec
@@ -1,24 +1,23 @@
+# m4/libcerror.m4
+%define libcerror_ver 20120425
Summary: Library to support cross-platform C locale functions
Summary(pl.UTF-8): Biblioteka wspierająca wieloplatformowe funkcje obsługi
lokalizacji w C
Name: libclocale
-Version: 20150101
-Release: 2
+Version: 20180721
+Release: 1
License: LGPL v3+
Group: Libraries
-Source0:
https://github.com/libyal/libclocale/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: da7b987fc9729d71fc6ce351106a7e7e
-Patch0: %{name}-system-libs.patch
+#Source0Download: https://github.com/libyal/libclocale/releases
+Source0:
https://github.com/libyal/libclocale/releases/download/%{version}/%{name}-alpha-%{version}.tar.gz
+# Source0-md5: f39fa97adcaa5094dc75b7eea5a793d7
URL: https://github.com/libyal/libclocale/
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
@@ -33,8 +32,7 @@ Summary: Header files for libclocale library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libclocale
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 libclocale library.
@@ -56,11 +54,9 @@ Statyczna biblioteka libclocale.
%prep
%setup -q
-%patch0 -p1
%build
%{__gettextize}
-%{__sed} -i -e 's/ po\/Makefile.in//' configure.ac
%{__libtoolize}
%{__aclocal} -I m4
%{__autoconf}
diff --git a/libclocale-system-libs.patch b/libclocale-system-libs.patch
deleted file mode 100644
index d72c9c5..0000000
--- a/libclocale-system-libs.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- libclocale-20150101/configure.ac.orig 2015-01-18 21:39:54.853170863
+0100
-+++ libclocale-20150101/configure.ac 2015-01-19 16:43:10.063625529 +0100
-@@ -128,8 +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([libclocale/Makefile])
- AC_CONFIG_FILES([po/Makefile.in])
- AC_CONFIG_FILES([po/Makevars])
---- libclocale-20150101/Makefile.am.orig 2015-01-18 21:39:54.583170875
+0100
-+++ libclocale-20150101/Makefile.am 2015-01-19 16:43:49.880290524 +0100
-@@ -3,8 +3,6 @@ ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = \
- include \
- common \
-- libcstring \
-- libcerror \
- libclocale \
- 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)/libclocale && $(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)/libclocale && $(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/libclocale.git/commitdiff/4b5f50285f3c26705d10cab93e401c1994bc91f6
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
