From cf426618de9e3a79e2a53afaff4b613c6e55e39c Mon Sep 17 00:00:00 2001 From: Vratislav Podzimek Date: Tue, 26 Apr 2016 09:26:06 +0200 Subject: [PATCH] New version - Create both libbytesize-$version and $version tags (vpodzime) - Update the .pot file with the new version (vpodzime) - Improve how we create changelog (vpodzime) - Try harder when getting OverflowError in division (#1326897) (vpodzime) - Neutralize the radix char before passing string to MPFR (#1326108) (vpodzime) - Run tests with en_US and fr_FR locales (vpodzime) - Run the tests with both python2 and python3 again (vpodzime) - Do not run the same tests 3 times as part of the 'ci' target (vpodzime) - Don't fail if just the best-effort cleanup fails (vpodzime) - Throw away the new .pot file when just running tests (vpodzime) - Make sure we return one of -1, 0, 1 from cmp functions (#1326113) (vpodzime) - Use cmp_bytes(size, bytes) when comparing to 0 (vpodzime) - Ignore all .po~ files (vpodzime) - Add translator comments (dshea) - Integrate translation-canary into the build. (dshea) - Run the translation-canary tests from make check. (dshea) - Squashed 'translation-canary/' content from commit d6c0708 (dshea) - Make 'make check' work. (dshea) - Remove files from po/ we don't need to track (vpodzime) - Ignore the compiled translation files (vpodzime) - Distribute and package the translations (vpodzime) - Add the necessary pieces for getting translations (vpodzime) --- .gitignore | 1 + libbytesize.spec | 37 +++++++++++++++++++++++------- not_delete_twice.patch | 27 ---------------------- not_require_gmp_mpfr_compile.patch | 20 ---------------- sources | 2 +- 5 files changed, 31 insertions(+), 56 deletions(-) delete mode 100644 not_delete_twice.patch delete mode 100644 not_require_gmp_mpfr_compile.patch diff --git a/.gitignore b/.gitignore index faae4d5..f2813aa 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /libbytesize-0.2.tar.gz /libbytesize-0.3.tar.gz /libbytesize-0.4.tar.gz +/libbytesize-0.5.tar.gz diff --git a/libbytesize.spec b/libbytesize.spec index db13491..9ecee24 100644 --- a/libbytesize.spec +++ b/libbytesize.spec @@ -1,14 +1,11 @@ Name: libbytesize -Version: 0.4 -Release: 3%{?dist} +Version: 0.5 +Release: 1%{?dist} Summary: A library for working with sizes in bytes License: LGPLv2+ URL: https://github.com/rhinstaller/libbytesize Source0: https://github.com/rhinstaller/libbytesize/archive/%{name}-%{version}.tar.gz -Patch0: not_delete_twice.patch -Patch1: not_require_gmp_mpfr_compile.patch - %define realname bytesize BuildRequires: gmp-devel @@ -54,8 +51,6 @@ the library from Python 3 easier and more convenient. %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -%patch1 -p1 %build %configure @@ -64,12 +59,14 @@ the library from Python 3 easier and more convenient. %install %{make_install} find %{buildroot} -type f -name "*.la" | xargs %{__rm} +%find_lang %{name} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%files + +%files -f %{name}.lang %doc README.rst %{!?_licensedir:%global license %%doc} %license LICENSE @@ -90,6 +87,30 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm} %{python3_sitearch}/bytesize/__pycache__/* %changelog +* Tue Apr 26 2016 Vratislav Podzimek - 0.5-1 +- Create both libbytesize-$version and $version tags (vpodzime) +- Update the .pot file with the new version (vpodzime) +- Improve how we create changelog (vpodzime) +- Try harder when getting OverflowError in division (#1326897) (vpodzime) +- Neutralize the radix char before passing string to MPFR (#1326108) (vpodzime) +- Run tests with en_US and fr_FR locales (vpodzime) +- Run the tests with both python2 and python3 again (vpodzime) +- Do not run the same tests 3 times as part of the 'ci' target (vpodzime) +- Don't fail if just the best-effort cleanup fails (vpodzime) +- Throw away the new .pot file when just running tests (vpodzime) +- Make sure we return one of -1, 0, 1 from cmp functions (#1326113) (vpodzime) +- Use cmp_bytes(size, bytes) when comparing to 0 (vpodzime) +- Ignore all .po~ files (vpodzime) +- Add translator comments (dshea) +- Integrate translation-canary into the build. (dshea) +- Run the translation-canary tests from make check. (dshea) +- Squashed 'translation-canary/' content from commit d6c0708 (dshea) +- Make 'make check' work. (dshea) +- Remove files from po/ we don't need to track (vpodzime) +- Ignore the compiled translation files (vpodzime) +- Distribute and package the translations (vpodzime) +- Add the necessary pieces for getting translations (vpodzime) + * Thu Apr 14 2016 Vratislav Podzimek - 0.4-3 - Only require -lgmp and -lmpfr for static linking (vpodzime) diff --git a/not_delete_twice.patch b/not_delete_twice.patch deleted file mode 100644 index 1f198a6..0000000 --- a/not_delete_twice.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 482e4c3936a9ba84b3bfed797520ff3e8a525f9c Mon Sep 17 00:00:00 2001 -From: Vratislav Podzimek -Date: Fri, 11 Mar 2016 16:01:20 +0100 -Subject: [PATCH] Do not try to delete the C struct twice - -The default destructor takes care about calling the C struct's __del__ -implicitly. - -Signed-off-by: Vratislav Podzimek ---- - src/python/bytesize.py | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/python/bytesize.py b/src/python/bytesize.py -index 3a32b65..21b2a1e 100644 ---- a/src/python/bytesize.py -+++ b/src/python/bytesize.py -@@ -557,6 +557,3 @@ class Size(object): - - def __hash__(self): - return self.get_bytes() -- -- def __del__(self): -- del(self._c_size) --- -2.5.0 - diff --git a/not_require_gmp_mpfr_compile.patch b/not_require_gmp_mpfr_compile.patch deleted file mode 100644 index 4f04efe..0000000 --- a/not_require_gmp_mpfr_compile.patch +++ /dev/null @@ -1,20 +0,0 @@ -commit abb70fe37f63889e6354e2b745d07c7a37186e25 -Author: Vratislav Podzimek -Date: Wed Apr 13 21:19:34 2016 +0200 - - Only require -lgmp and -lmpfr for static linking - - These are not needed if somebody dynamically links to our library. - -diff --git a/src/bytesize.pc.in b/src/bytesize.pc.in -index 3d35790..80681a9 100644 ---- a/src/bytesize.pc.in -+++ b/src/bytesize.pc.in -@@ -9,4 +9,5 @@ URL: https://github.com/rhinstaller/libbytesize - Version: 0.1.0 - Requires: glib-2.0 - Cflags: -I${includedir}/bytesize --Libs: -lbytesize -lgmp -lmpfr -+Libs: -lbytesize -+Libs.private: -lgmp -lmpfr -\ No newline at end of file diff --git a/sources b/sources index 664040a..b769ee2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bc40503a5fec22adbf8894f56c3121b9 libbytesize-0.4.tar.gz +dd2cc89516da35662d2001b657cf252c libbytesize-0.5.tar.gz