From 6ca86f01decc79fe310d90fac4b02d66a0a332699391498af47abcad607a9ece Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 5 May 2017 06:56:27 +0000 Subject: [PATCH 1/4] - updated to 0.9.7: * license change * build system changes OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libunistring?expand=0&rev=31 --- libunistring-0.9.6.tar.xz | 3 --- libunistring-0.9.6.tar.xz.sig | 17 ----------------- libunistring-0.9.7.tar.xz | 3 +++ libunistring-0.9.7.tar.xz.sig | 16 ++++++++++++++++ libunistring.changes | 7 +++++++ libunistring.spec | 4 ++-- 6 files changed, 28 insertions(+), 22 deletions(-) delete mode 100644 libunistring-0.9.6.tar.xz delete mode 100644 libunistring-0.9.6.tar.xz.sig create mode 100644 libunistring-0.9.7.tar.xz create mode 100644 libunistring-0.9.7.tar.xz.sig diff --git a/libunistring-0.9.6.tar.xz b/libunistring-0.9.6.tar.xz deleted file mode 100644 index 560c977..0000000 --- a/libunistring-0.9.6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2df42eae46743e3f91201bf5c100041540a7704e8b9abfd57c972b2d544de41b -size 1960488 diff --git a/libunistring-0.9.6.tar.xz.sig b/libunistring-0.9.6.tar.xz.sig deleted file mode 100644 index 63c031d..0000000 --- a/libunistring-0.9.6.tar.xz.sig +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJVnO+MAAoJENYFhI7X5phxUJAP/RCDIi0RG5vYiTcr1cIR+ShQ -BQtJX6uzMNmmlmKOhwcQbB/j8YNONWDLVOj8DvXfjDy3S79XiPiX7k6fhIAf1wT2 -y8g3t6/yRo1em4qJZ0wD2JwuL7z6oj/9/+7GZM+C9RaMASi84u21rGF2Gunj31Oy -V95s8miKdzKinwXUZDjAyKTy5pnq7/mqvyo9xiw3a37E+x7RyuZThWI+Z1rl5zMx -HdnIfRyhBXtv/ezujB2/eEyWiLFE68DtIVfApw2koq78wPZNm/a0JZPh0AotJOi8 -lE0vlM1sPFuiKorxKriDXMcr7ajX512CzdKzRpr4V5UOLAOgSWH1pfBaQ7OLs7yo -ZaJA5UCJGaG48AVXCXC6o/+hptXT9CAFWulZowqAI0Og2vw/hjYl/w6Y7ZJoIG7W -SS+tZvmOqeuuOGBCNJBuzC0waQ+C2cMWKVz+l/Lpc5FFWPcw5iG2wPs0Ne6Z2Ozo -ljoy3BF6ychGNdc83pK2sIvvMvdROBy8IwgDwgqFPC5drWKO43vL/du2khG++P6Z -E1PJmaItx2tdZH2hrEf2/s/uVkZw+6d/qOiB2O1ndjfeS9ih+AZpGxcWF+qaEZFQ -PJ+u1OqjbPaZz5lrbquZjaCMJsrKo2nP8tXzZRwJYPuA8tThp8zzLsSmMLjzOfaE -PPeX5g3y6EpCKT8j+LUG -=z2Tr ------END PGP SIGNATURE----- diff --git a/libunistring-0.9.7.tar.xz b/libunistring-0.9.7.tar.xz new file mode 100644 index 0000000..cdf8dc5 --- /dev/null +++ b/libunistring-0.9.7.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e3764512aaf2ce598af5a38818c0ea23dedf1ff5460070d1b6cee5c3336e797 +size 1967300 diff --git a/libunistring-0.9.7.tar.xz.sig b/libunistring-0.9.7.tar.xz.sig new file mode 100644 index 0000000..c8ce9b4 --- /dev/null +++ b/libunistring-0.9.7.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIcBAABAgAGBQJYQabwAAoJENYFhI7X5phx2zQP/RcsMYt+9DsA7E+wzqjNrbFi +V8ldfddzJO7JtKvQAMdElNsw2cRYFHPVHOfvkLVgTUY15yeXljzK4VHlXm2ycP5Q +/MeXAHhg+tyc9DJ6WYzgCKesroL2xi9Znnh9JJTPo2VQoBkr/Bm4AJ0+u3ZYUJnP +3fPmvS6S7omObN22CsJS13yTVDljYJAfDvTlhwgnV2Hr/f20gi+yAxC1EuU+mQ4V +SkR12gsiqmiCgol+zzY83RBH5ySbIjMcIFXIbCN1Gs5K7FWwvv/GAWH8ZRIY2ewa +Rd6DoDWt/UDaZDQitdOrz8e+0Ok9f6/M2FXpOhxvd8bIXXILOQKMBzbDmzmP0C3o +O9XX6RjP40heAzPkLSYGb1lS/l73fY8MEGekFutsTAKVeHsSzyx8YH27lUZfMejV +56xakAUpzvlpAGiBi6dZmhax5Gs29bzepa5xizJKmsW8oe+ZTcTVljV8lu9F90GF +t/Qm4g+h7kNiBs4nZgFq7N66oqywvGKiLvlcKaowDNFWy7Mvaxc5GFTS51K7/oZf +Cu6jHINmWEfUXkK7+fMyTDv0l57cuU0plM6KkUfV2u+xm9J22HWeJyOLELiTxjwA +IAe9Kc31aD+KGDVWeYhVb/iD/wE8jP/IrcQRl8+T4DgOmpsxRXA0wjKaIsQCWJTI +1I+t8SF5MYU4D5kpnrR6 +=5RRe +-----END PGP SIGNATURE----- diff --git a/libunistring.changes b/libunistring.changes index f3275aa..dcd84eb 100644 --- a/libunistring.changes +++ b/libunistring.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri May 5 06:51:45 UTC 2017 - pgajdos@suse.com + +- updated to 0.9.7: + * license change + * build system changes + ------------------------------------------------------------------- Tue Jan 3 07:39:31 UTC 2017 - mlin@suse.com diff --git a/libunistring.spec b/libunistring.spec index abed50c..235bef2 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -18,10 +18,10 @@ %define lname libunistring2 Name: libunistring -Version: 0.9.6 +Version: 0.9.7 Release: 0 Summary: GNU Unicode string library -License: LGPL-3.0+ and GPL-3.0+ +License: LGPL-3.0+ or GPL-2.0 Group: Development/Libraries/C and C++ Url: http://www.gnu.org/software/libunistring/ Source0: http://ftp.gnu.org/gnu/libunistring/libunistring-%{version}.tar.xz From c32940d667a30e3d97f635b5abdf8e7fea7276cb561535454bc43026e5cdaee6 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 5 May 2017 07:24:22 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libunistring?expand=0&rev=32 --- libunistring-test-malloca.patch | 14 ++++++++++++++ libunistring.spec | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 libunistring-test-malloca.patch diff --git a/libunistring-test-malloca.patch b/libunistring-test-malloca.patch new file mode 100644 index 0000000..d047a82 --- /dev/null +++ b/libunistring-test-malloca.patch @@ -0,0 +1,14 @@ +Index: libunistring-0.9.7/tests/test-malloca.c +=================================================================== +--- libunistring-0.9.7.orig/tests/test-malloca.c 2016-12-02 17:42:02.000000000 +0100 ++++ libunistring-0.9.7/tests/test-malloca.c 2017-05-05 09:21:26.457936689 +0200 +@@ -27,7 +27,8 @@ do_allocation (int n) + { + void *ptr = malloca (n); + freea (ptr); +- safe_alloca (n); ++ ptr = safe_alloca (n); ++ freea (ptr); + } + + void (*func) (int) = do_allocation; diff --git a/libunistring.spec b/libunistring.spec index 235bef2..51d5d3b 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -28,6 +28,7 @@ Source0: http://ftp.gnu.org/gnu/libunistring/libunistring-%{version}.tar. Source1: http://ftp.gnu.org/gnu/libunistring/libunistring-%{version}.tar.xz.sig Source2: http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=libunistring&download=1#/%{name}.keyring Source3: baselibs.conf +Patch0: %{name}-test-malloca.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{?suse_version } == 1110 BuildRequires: xz @@ -66,6 +67,7 @@ case folding and regular expressions). %prep %setup -q +%patch0 -p1 %build %configure --disable-static --disable-rpath --docdir=%{_docdir}/%{name} From 21fd1c1625e3992bcebb08aee9d3b07dc88a2daedc7d1c7a5f82bc6fefa6e1e6 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 5 May 2017 07:58:43 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libunistring?expand=0&rev=33 --- libunistring-test-malloca.patch | 14 -------------- libunistring.spec | 7 +++++-- 2 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 libunistring-test-malloca.patch diff --git a/libunistring-test-malloca.patch b/libunistring-test-malloca.patch deleted file mode 100644 index d047a82..0000000 --- a/libunistring-test-malloca.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: libunistring-0.9.7/tests/test-malloca.c -=================================================================== ---- libunistring-0.9.7.orig/tests/test-malloca.c 2016-12-02 17:42:02.000000000 +0100 -+++ libunistring-0.9.7/tests/test-malloca.c 2017-05-05 09:21:26.457936689 +0200 -@@ -27,7 +27,8 @@ do_allocation (int n) - { - void *ptr = malloca (n); - freea (ptr); -- safe_alloca (n); -+ ptr = safe_alloca (n); -+ freea (ptr); - } - - void (*func) (int) = do_allocation; diff --git a/libunistring.spec b/libunistring.spec index 51d5d3b..77e7660 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -28,7 +28,6 @@ Source0: http://ftp.gnu.org/gnu/libunistring/libunistring-%{version}.tar. Source1: http://ftp.gnu.org/gnu/libunistring/libunistring-%{version}.tar.xz.sig Source2: http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=libunistring&download=1#/%{name}.keyring Source3: baselibs.conf -Patch0: %{name}-test-malloca.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{?suse_version } == 1110 BuildRequires: xz @@ -67,7 +66,6 @@ case folding and regular expressions). %prep %setup -q -%patch0 -p1 %build %configure --disable-static --disable-rpath --docdir=%{_docdir}/%{name} @@ -81,6 +79,11 @@ rm -f %{buildroot}/%{_libdir}/libunistring.la %check %if ! 0%{?qemu_user_space_build} +# test-malloca seem not to be suitable for ix86 obs worker +# (locally passes, obs worker stucks -- ) +%ifarch %ix86 +sed -i 's:50000:5000:g' tests/test-malloca.c +%endif make check %{?_smp_mflags} %endif From 518dc961cf9102a5e97478e8b4da0ef9dc46c837bf69bfda2eb9fb6dce5b50c0 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 5 May 2017 11:09:36 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libunistring?expand=0&rev=34 --- libunistring.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libunistring.spec b/libunistring.spec index 77e7660..275d64b 100644 --- a/libunistring.spec +++ b/libunistring.spec @@ -82,7 +82,7 @@ rm -f %{buildroot}/%{_libdir}/libunistring.la # test-malloca seem not to be suitable for ix86 obs worker # (locally passes, obs worker stucks -- ) %ifarch %ix86 -sed -i 's:50000:5000:g' tests/test-malloca.c +sed -i 's:50000:50:g' tests/test-malloca.c %endif make check %{?_smp_mflags} %endif