rpms/libbytesize
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import libbytesize-1.4-3.el8

Browse Source
This commit is contained in:
CentOS Sources 2020-01-21 15:42:30 -05:00 committed by Stepan Oksanichenko
parent c65c6eb015
commit 6c16f4e0d6
3 changed files with 571 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

203
SOURCES/libbytesize-potfile.patch Normal file
View File

@ -0,0 +1,203 @@
From ee80e25d87b00236bae9f4d37cd5232bcb995f17 Mon Sep 17 00:00:00 2001
From: Vojtech Trefny <vtrefny@redhat.com>
Date: Tue, 29 Oct 2019 10:09:13 +0100
Subject: [PATCH] Add POT file to git and do not rebuild it during every build
This fixes bug with multilib packages in Fedora/RHEL -- we don't
have a special package for translation files so we need to make
sure the files are exactly same for every architecture. With POT
file being generated during build the generated MO files are
different because they contain timestamp from the POT file.
POT file is now automatically updated during 'make bumpver'.
---
Makefile.am | 1 +
po/Makefile.am | 12 ++---
po/libbytesize.pot | 103 +++++++++++++++++++++++++++++++++++++++
tests/canary_tests.sh.in | 9 +---
4 files changed, 111 insertions(+), 14 deletions(-)
create mode 100644 po/libbytesize.pot
diff --git a/Makefile.am b/Makefile.am
index ce06f1f..185d754 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -97,6 +97,7 @@ bumpver:
mv dist/libbytesize.spec.in.new dist/libbytesize.spec.in ; rm -f speclog ; \
sed -ri "s/(AC_INIT\(\[$(PACKAGE_NAME)\], \[)[0-9]+\.[0-9]+(\],.*)/\1$$VERSION.$$NEWSUBVERSION\2/" configure.ac ; \
sed -ri "s/Version:(\\s+)[-0-9.]+/Version:\\1$$VERSION.$$NEWSUBVERSION/" dist/libbytesize.spec.in ;
+ $(MAKE) -C po/ $(PACKAGE_NAME).pot-update
archive: po-pull
$(MAKE) distcheck
diff --git a/po/Makefile.am b/po/Makefile.am
index 5c288ab..de4ad7d 100644
--- a/po/Makefile.am
+++ b/po/Makefile.am
@@ -161,12 +161,12 @@ MSGMERGE_V_OPTIONS_1 = $(MSGMERGE_OPTIONS) --verbose
# Actually do stuff:
# .po files get distributed but not installed
-dist_noinst_DATA = $(POFILES)
+dist_noinst_DATA = $(POFILES) $(POTFILE)
# Build the .mo files but don't actually do anything with them. The real
# install part is in the install-data-local target below. Build the .pot file
# as well, even if there are no .mo files to build, so it can be tested.
-nodist_noinst_DATA = $(MOFILES) $(POTFILE)
+nodist_noinst_DATA = $(MOFILES)
# How to build the .pot file. This needs to be regenerated if anything that
# goes into it has changed.
@@ -181,13 +181,13 @@ $(PACKAGE).pot-update:
@$(MAKE) $(POTFILE)
# How to build the merged .mpo files from the .po files
-$(MERGED_POFILES): $(POFILES) $(POTFILE)
+$(MERGED_POFILES): $(POFILES)
.po.mpo:
- $(GETTEXT_V_MERGE)$(MSGMERGE) $(MSGMERGE_V_OPTIONS) -o $@ $< $(POTFILE)
+ $(GETTEXT_V_MERGE)$(MSGMERGE) $(MSGMERGE_V_OPTIONS) -o $@ $< $(top_srcdir)/po/$(POTFILE)
# How to build the .mo files from the .mpo files
-$(MOFILES): $(MERGED_POFILES)
+$(MOFILES): $(MERGED_POFILES) $(POTFILE)
.mpo.mo:
$(GETTEXT_V_FORMAT)$(MSGFMT) $(MSGFMT_V_OPTIONS) -o $@ $<
@@ -210,4 +210,4 @@ uninstall-local:
rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo ; \
done
-CLEANFILES = $(MERGED_POFILES) $(MOFILES) $(POTFILE)
+CLEANFILES = $(MERGED_POFILES) $(MOFILES)
diff --git a/po/libbytesize.pot b/po/libbytesize.pot
new file mode 100644
index 0000000..5431896
--- /dev/null
+++ b/po/libbytesize.pot
@@ -0,0 +1,103 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Red Hat, Inc.
+# This file is distributed under the same license as the libbytesize package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: libbytesize 2.1\n"
+"Report-Msgid-Bugs-To: anaconda-devel-list@redhat.com\n"
+"POT-Creation-Date: 2019-10-29 12:28+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. TRANSLATORS: 'B' for bytes
+#: src/bs_size.c:52 src/bs_size.c:73
+msgid "B"
+msgstr ""
+
+#. TRANSLATORS: abbreviation for kibibyte, 2**10 bytes
+#: src/bs_size.c:54
+msgid "KiB"
+msgstr ""
+
+#. TRANSLATORS: abbreviation for mebibyte, 2**20 bytes
+#: src/bs_size.c:56
+msgid "MiB"
+msgstr ""
+
+#. TRANSLATORS: abbreviation for gibibyte, 2**30 bytes
+#: src/bs_size.c:58
+msgid "GiB"
+msgstr ""
+
+#. TRANSLATORS: abbreviation for tebibyte, 2**40 bytes
+#: src/bs_size.c:60
+msgid "TiB"
+msgstr ""
+
+#. TRANSLATORS: abbreviation for pebibyte, 2**50 bytes
+#: src/bs_size.c:62
+msgid "PiB"
+msgstr ""
+
+#. TRANSLATORS: abbreviation for exbibyte, 2**60 bytes
+#: src/bs_size.c:64
+msgid "EiB"
+msgstr ""
+
+#. TRANSLATORS: abbreviation for zebibyte, 2**70 bytes
+#: src/bs_size.c:66
+msgid "ZiB"
+msgstr ""
+
+#. TRANSLATORS: abbreviation for yobibyte, 2**80 bytes
+#: src/bs_size.c:68
+msgid "YiB"
+msgstr ""
+
+#. TRANSLATORS: abbreviation for kilobyte, 10**3 bytes
+#: src/bs_size.c:75
+msgid "KB"
+msgstr ""
+
+#. TRANSLATORS: abbreviation for megabyte, 10**6 bytes
+#: src/bs_size.c:77
+msgid "MB"
+msgstr ""
+
+#. TRANSLATORS: abbreviation for gigabyte, 10**9 bytes
+#: src/bs_size.c:79
+msgid "GB"
+msgstr ""
+
+#. TRANSLATORS: abbreviation for terabyte, 10**12 bytes
+#: src/bs_size.c:81
+msgid "TB"
+msgstr ""
+
+#. TRANSLATORS: abbreviation for petabyte, 10**15 bytes
+#: src/bs_size.c:83
+msgid "PB"
+msgstr ""
+
+#. TRANSLATORS: abbreviation for exabyte, 10**18 bytes
+#: src/bs_size.c:85
+msgid "EB"
+msgstr ""
+
+#. TRANSLATORS: abbreviation for zettabyte, 10**21 bytes
+#: src/bs_size.c:87
+msgid "ZB"
+msgstr ""
+
+#. TRANSLATORS: abbreviation for yottabyte, 10**24 bytes
+#: src/bs_size.c:89
+msgid "YB"
+msgstr ""
diff --git a/tests/canary_tests.sh.in b/tests/canary_tests.sh.in
index 13357e8..d5a5815 100644
--- a/tests/canary_tests.sh.in
+++ b/tests/canary_tests.sh.in
@@ -17,15 +17,8 @@ if [ -z "$top_srcdir" ]; then
top_srcdir="$(dirname "$0")/.."
fi
-if [ -z "$top_builddir" ] ; then
- top_builddir="$(dirname "$0")/.."
-fi
-
-# Make sure libbytesize.pot is up to date
-make -C ${top_builddir}/po libbytesize.pot-update >/dev/null 2>&1
-
PYTHONPATH="${PYTHONPATH}:${top_srcdir}/translation-canary"
export PYTHONPATH
# Run the translatable tests on the POT file
-python3 -m translation_canary.translatable "${top_builddir}/po/libbytesize.pot"
+python3 -m translation_canary.translatable "${top_srcdir}/po/libbytesize.pot"

352
SOURCES/libbytesize-tests.patch Normal file
View File

@ -0,0 +1,352 @@
From cae191ae459e046dc317b7bc57941e3f1cec910d Mon Sep 17 00:00:00 2001
From: Vojtech Trefny <vtrefny@redhat.com>
Date: Fri, 10 Aug 2018 08:35:51 +0200
Subject: [PATCH 1/4] Run all libbytesize tests from one script
This also makes sure we run tests with all supported python versions.
---
tests/Makefile.am | 2 +-
tests/libbytesize_unittest.sh.in | 2 ++
tests/libbytesize_unittest.sh | 2 ++
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1f59f64..1e51834 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,7 +2,7 @@ AM_TESTS_ENVIRONMENT = top_srcdir="$(top_srcdir)" top_builddir="$(top_builddir)"
dist_noinst_SCRIPTS = libbytesize_unittest.sh libbytesize_unittest.py lbs_py_override_unittest.py locale_utils.py testenv.sh canary_tests.sh
-TESTS = libbytesize_unittest.sh lbs_py_override_unittest.py canary_tests.sh
+TESTS = libbytesize_unittest.sh canary_tests.sh
# Add the translation-canary source files to the tarball
EXTRA_DIST = $(top_srcdir)/translation-canary/translation_canary/*.py \
diff --git a/tests/libbytesize_unittest.sh.in b/tests/libbytesize_unittest.sh.in
index 7896675..e5ca56d 100644
--- a/tests/libbytesize_unittest.sh.in
+++ b/tests/libbytesize_unittest.sh.in
@@ -9,10 +9,12 @@ fi
if [ @WITH_PYTHON2@ = 1 ]; then
python2 ${srcdir}/libbytesize_unittest.py || status=1
+ python2 ${srcdir}/lbs_py_override_unittest.py || status=1
fi
if [ @WITH_PYTHON3@ = 1 ]; then
python3 ${srcdir}/libbytesize_unittest.py || status=1
+ python3 ${srcdir}/lbs_py_override_unittest.py || status=1
fi
if [ @WITH_PYTHON2@ = 1 ]; then
diff --git a/tests/libbytesize_unittest.sh b/tests/libbytesize_unittest.sh
index 7896675..e5ca56d 100644
--- a/tests/libbytesize_unittest.sh
+++ b/tests/libbytesize_unittest.sh
@@ -9,10 +9,12 @@ fi
if [ 1 = 1 ]; then
python2 ${srcdir}/libbytesize_unittest.py || status=1
+ python2 ${srcdir}/lbs_py_override_unittest.py || status=1
fi
if [ 1 = 1 ]; then
python3 ${srcdir}/libbytesize_unittest.py || status=1
+ python3 ${srcdir}/lbs_py_override_unittest.py || status=1
fi
if [ 1 = 1 ]; then
--
2.20.1
From 2c376a25813bf6966ec9c6da5a558dd5f4edc423 Mon Sep 17 00:00:00 2001
From: Vojtech Trefny <vtrefny@redhat.com>
Date: Tue, 5 Mar 2019 14:20:14 +0100
Subject: [PATCH 2/4] Add all "public" python API symbols to __init__.py
So it can be imported as "from bytesize import xyz" instead of
"from bytesize.bytesize import xyz".
---
src/python/__init__.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/python/__init__.py b/src/python/__init__.py
index 6ab80dc..57403d5 100644
--- a/src/python/__init__.py
+++ b/src/python/__init__.py
@@ -1 +1,4 @@
from .bytesize import Size
+from .bytesize import B, KiB, MiB, GiB, TiB, PiB, EiB, ZiB, YiB, KB, MB, GB, TB, PB, EB, ZB, YB
+from .bytesize import ROUND_UP, ROUND_DOWN, ROUND_HALF_UP
+from .bytesize import SizeError, InvalidSpecError, OverflowError, ZeroDivisionError
--
2.20.1
From f07701b397907cefd7e43063b76277cc991f5339 Mon Sep 17 00:00:00 2001
From: Vojtech Trefny <vtrefny@redhat.com>
Date: Tue, 5 Mar 2019 14:55:20 +0100
Subject: [PATCH 3/4] Allow running tests using installed library
We need to be able to import the SizeStruct object from installed
python-bytesize.
---
tests/libbytesize_unittest.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/tests/libbytesize_unittest.py b/tests/libbytesize_unittest.py
index 5e63778..d7400be 100755
--- a/tests/libbytesize_unittest.py
+++ b/tests/libbytesize_unittest.py
@@ -8,7 +8,14 @@ import ctypes
from locale_utils import get_avail_locales, requires_locales
-from bytesize import SizeStruct, KiB, GiB, ROUND_UP, ROUND_DOWN, ROUND_HALF_UP, OverflowError
+from bytesize import KiB, GiB, ROUND_UP, ROUND_DOWN, ROUND_HALF_UP, OverflowError
+
+# SizeStruct is part of the 'private' API and needs to be imported differently
+# when running from locally build tree and when using installed library
+try:
+ from bytesize import SizeStruct
+except ImportError:
+ from bytesize.bytesize import SizeStruct
DEFAULT_LOCALE = "en_US.utf8"
@@ -759,4 +766,3 @@ if __name__=='__main__':
sys.argv = [sys.argv[0]]
unittest.main()
#endif
-
--
2.20.1
From 4d692ac4eb178121c4e91ab881645aef94d65ed4 Mon Sep 17 00:00:00 2001
From: Vojtech Trefny <vtrefny@redhat.com>
Date: Wed, 6 Mar 2019 09:27:41 +0100
Subject: [PATCH 4/4] Remove Python 2 support
Python 2 EOL is close and we are no longer shipping python2
package in newest distributions, so it makes sense to remove
Python 2 support entirely.
---
Makefile.am | 2 +-
configure.ac | 16 ----------------
dist/libbytesize.spec.in | 31 +------------------------------
src/python/Makefile.am | 9 +--------
tests/lbs_py_override_unittest.py | 4 +---
tests/libbytesize_unittest.py | 2 +-
tests/libbytesize_unittest.sh.in | 9 ---------
tests/libbytesize_unittest.sh | 9 ---------
8 files changed, 5 insertions(+), 77 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 93279f2..1ac10bd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,7 @@ dist-hook:
done
run-ipython: all
- LD_LIBRARY_PATH=${LIBDIRS} PYTHONPATH=$(PYTHONDIR) ipython
+ LD_LIBRARY_PATH=${LIBDIRS} PYTHONPATH=$(PYTHONDIR) ipython3
check-requires:
@echo "*** Checking if the dependencies required for testing and analysis are available ***"
diff --git a/configure.ac b/configure.ac
index 749d929..c2306dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,22 +50,6 @@ AC_CHECK_HEADERS([langinfo.h gmp.h mpfr.h stdint.h stdbool.h stdarg.h string.h s
[LIBBYTESIZE_SOFT_FAILURE([Header file $ac_header not found.])],
[])
-AC_ARG_WITH([python2],
- AS_HELP_STRING([--with-python2], [support python2 @<:@default=check@:>@]),
- [],
- [with_python2=check])
-
-AC_SUBST(WITH_PYTHON2, 0)
-if test "x$with_python2" != "xno"; then
- AC_PATH_PROG([python2], [python2], [no])
- AS_IF([test "x$python2" == "xno"],
- [if test "x$with_python2" = "xyes"; then
- LIBBYTESIZE_SOFT_FAILURE([Python2 support requested, but python2 is not available])
- fi],
- [AC_SUBST(WITH_PYTHON2, 1)])
-fi
-AM_CONDITIONAL(WITH_PYTHON2, test "x$with_python2" != "xno" -a "x$python2" != "xno")
-
AC_ARG_WITH([python3],
AS_HELP_STRING([--with-python3], [support python3 @<:@default=check@:>@]),
[],
diff --git a/dist/libbytesize.spec.in b/dist/libbytesize.spec.in
index 3f306f9..9658a7c 100644
--- a/dist/libbytesize.spec.in
+++ b/dist/libbytesize.spec.in
@@ -1,5 +1,4 @@
%define realname bytesize
-%define with_python2 @WITH_PYTHON2@
%define with_python3 @WITH_PYTHON3@
%define with_gtk_doc @WITH_GTK_DOC@
@@ -8,13 +7,7 @@
%define python3_opts --without-python3
%endif
-# python2 is not available on RHEL > 7 and not needed on Fedora > 28
-%if 0%{?rhel} > 7 || 0%{?fedora} > 28 || %{with_python2} == 0
-%define with_python2 0
-%define python2_opts --without-python2
-%endif
-
-%define configure_opts %{?python3_opts} %{?python2_opts}
+%define configure_opts %{?python3_opts}
Name: libbytesize
Version: 1.4
@@ -29,9 +22,6 @@ BuildRequires: gmp-devel
BuildRequires: mpfr-devel
BuildRequires: pcre-devel
BuildRequires: gettext-devel
-%if %{with_python2}
-BuildRequires: python2-devel
-%endif
%if %{with_python3}
BuildRequires: python3-devel
%endif
@@ -53,19 +43,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
This package contains header files and pkg-config files needed for development
with the libbytesize library.
-%if %{with_python2}
-%package -n python2-%{realname}
-Summary: Python 2 bindings for libbytesize
-%{?python_provide:%python_provide python2-%{realname}}
-%{?python_provide:%python_provide python2-libbytesize}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: python2-six
-
-%description -n python2-%{realname}
-This package contains Python 2 bindings for libbytesize making the use of
-the library from Python 2 easier and more convenient.
-%endif
-
%if %{with_python3}
%package -n python3-%{realname}
Summary: Python 3 bindings for libbytesize
@@ -108,12 +85,6 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm}
%{_datadir}/gtk-doc/html/libbytesize
%endif
-%if %{with_python2}
-%files -n python2-%{realname}
-%dir %{python2_sitearch}/bytesize
-%{python2_sitearch}/bytesize/*
-%endif
-
%if %{with_python3}
%files -n python3-%{realname}
%dir %{python3_sitearch}/bytesize
diff --git a/src/python/Makefile.am b/src/python/Makefile.am
index e0261a6..cb2b197 100644
--- a/src/python/Makefile.am
+++ b/src/python/Makefile.am
@@ -1,14 +1,7 @@
-if WITH_PYTHON2
-pylibdir = $(shell python -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(1,0,prefix='${exec_prefix}'))")
-
-pybytesizedir = $(pylibdir)/bytesize
-dist_pybytesize_DATA = bytesize.py __init__.py
-endif
-
if WITH_PYTHON3
py3libdir = $(shell python3 -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(1,0,prefix='${exec_prefix}'))")
py3bytesizedir = $(py3libdir)/bytesize
-nodist_py3bytesize_DATA = bytesize.py __init__.py
+dist_py3bytesize_DATA = bytesize.py __init__.py
endif
MAINTAINERCLEANFILES = Makefile.in
diff --git a/tests/lbs_py_override_unittest.py b/tests/lbs_py_override_unittest.py
index c5f3cb2..9a219f2 100755
--- a/tests/lbs_py_override_unittest.py
+++ b/tests/lbs_py_override_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
# -*- coding: utf-8 -*-
import unittest
@@ -306,5 +306,3 @@ class SizeTestCase(unittest.TestCase):
if __name__=='__main__':
unittest.main()
#endif
-
-
diff --git a/tests/libbytesize_unittest.py b/tests/libbytesize_unittest.py
index d7400be..1c57d2a 100755
--- a/tests/libbytesize_unittest.py
+++ b/tests/libbytesize_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python3
# -*- coding: utf-8 -*-
import locale
diff --git a/tests/libbytesize_unittest.sh.in b/tests/libbytesize_unittest.sh.in
index e5ca56d..816bc28 100644
--- a/tests/libbytesize_unittest.sh.in
+++ b/tests/libbytesize_unittest.sh.in
@@ -7,20 +7,11 @@ if [ -z "$srcdir" ]; then
srcdir="$(dirname "$0")"
fi
-if [ @WITH_PYTHON2@ = 1 ]; then
- python2 ${srcdir}/libbytesize_unittest.py || status=1
- python2 ${srcdir}/lbs_py_override_unittest.py || status=1
-fi
-
if [ @WITH_PYTHON3@ = 1 ]; then
python3 ${srcdir}/libbytesize_unittest.py || status=1
python3 ${srcdir}/lbs_py_override_unittest.py || status=1
fi
-if [ @WITH_PYTHON2@ = 1 ]; then
- python2 ${srcdir}/libbytesize_unittest.py fr_FR.UTF8 || status=1
-fi
-
if [ @WITH_PYTHON3@ = 1 ]; then
python3 ${srcdir}/libbytesize_unittest.py fr_FR.UTF8 || status=1
fi
diff --git a/tests/libbytesize_unittest.sh b/tests/libbytesize_unittest.sh
index e5ca56d..816bc28 100644
--- a/tests/libbytesize_unittest.sh
+++ b/tests/libbytesize_unittest.sh
@@ -7,20 +7,11 @@ if [ -z "$srcdir" ]; then
srcdir="$(dirname "$0")"
fi
-if [ 1 = 1 ]; then
- python2 ${srcdir}/libbytesize_unittest.py || status=1
- python2 ${srcdir}/lbs_py_override_unittest.py || status=1
-fi
-
if [ 1 = 1 ]; then
python3 ${srcdir}/libbytesize_unittest.py || status=1
python3 ${srcdir}/lbs_py_override_unittest.py || status=1
fi
-if [ 1 = 1 ]; then
- python2 ${srcdir}/libbytesize_unittest.py fr_FR.UTF8 || status=1
-fi
-
if [ 1 = 1 ]; then
python3 ${srcdir}/libbytesize_unittest.py fr_FR.UTF8 || status=1
fi
--
2.20.1

47
SPECS/libbytesize.spec
View File

@ -1,5 +1,4 @@
%define realname bytesize
%define with_python2 1
%define with_python3 1
%define with_gtk_doc 1
@ -8,30 +7,26 @@
%define python3_opts --without-python3
%endif
# python2 is not available on RHEL > 7 and not needed on Fedora > 28
%if 0%{?rhel} > 7 || 0%{?fedora} > 28 || %{with_python2} == 0
%define with_python2 0
%define python2_opts --without-python2
%endif
%define configure_opts %{?python3_opts} %{?python2_opts}
%define configure_opts %{?python3_opts}
Name: libbytesize
Version: 1.4
Release: 1%{?dist}
Release: 3%{?dist}
Summary: A library for working with sizes in bytes
License: LGPLv2+
URL: https://github.com/storaged-project/libbytesize
Source0: https://github.com/storaged-project/libbytesize/releases/download/%{version}-%{release}/%{name}-%{version}.tar.gz
Patch0: libbytesize-tests.patch
Patch1: libbytesize-potfile.patch
BuildRequires: gcc
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: gmp-devel
BuildRequires: mpfr-devel
BuildRequires: pcre-devel
BuildRequires: gettext-devel
%if %{with_python2}
BuildRequires: python2-devel
%endif
%if %{with_python3}
BuildRequires: python3-devel
%endif
@ -53,19 +48,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
This package contains header files and pkg-config files needed for development
with the libbytesize library.
%if %{with_python2}
%package -n python2-%{realname}
Summary: Python 2 bindings for libbytesize
%{?python_provide:%python_provide python2-%{realname}}
%{?python_provide:%python_provide python2-libbytesize}
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: python2-six
%description -n python2-%{realname}
This package contains Python 2 bindings for libbytesize making the use of
the library from Python 2 easier and more convenient.
%endif
%if %{with_python3}
%package -n python3-%{realname}
Summary: Python 3 bindings for libbytesize
@ -79,8 +61,11 @@ the library from Python 3 easier and more convenient.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1
%patch1 -p1
%build
autoreconf -ivf
%configure %{?configure_opts}
%{__make} %{?_smp_mflags}
@ -108,12 +93,6 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm}
%{_datadir}/gtk-doc/html/libbytesize
%endif
%if %{with_python2}
%files -n python2-%{realname}
%dir %{python2_sitearch}/bytesize
%{python2_sitearch}/bytesize/*
%endif
%if %{with_python3}
%files -n python3-%{realname}
%dir %{python3_sitearch}/bytesize
@ -122,6 +101,12 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm}
%endif
%changelog
* Wed Oct 30 2019 Vojtech Trefny <vtrefny@redhat.com> - 1.4-3
- Add POT file to git and do not rebuild it during every build
* Wed Mar 20 2019 Vojtech Trefny <vtrefny@redhat.com> - 1.4-2
- Run upstream tests suite in gating
* Thu Aug 02 2018 Vojtech Trefny <vtrefny@redhat.com> - 1.4-1
- Squashed 'translation-canary/' changes from 840c2d6..fccbb1b (vtrefny)
- Make sure the test script fails if one of the test runs fail (vtrefny)