From 447c1cdd9c8e0a182441ccacc1a098b84977c94c Mon Sep 17 00:00:00 2001 From: Scott Bradnick Date: Fri, 26 Aug 2022 18:00:29 +0000 Subject: [PATCH] Accepting request 999453 from home:sbradnick - Adding Group definition - Removing unnecessary 'golang' requirement which isn't present in 15.3 - Update to version v6.4.0+git20220823.cdbe8b82e: * Account for varying mlr locations (#1086) * Restore --quote-all for CSV output (#1084) * Restore the --jvquoteall flag (#1083) * forgot to make a branch/PR for --quote-all * make dev: for doc-build artifacts * unit-test case * Restore --quote-all flag for CSV output * post-6.4.0 * 6.4.0 release (#1081) * codespell OBS-URL: https://build.opensuse.org/request/show/999453 OBS-URL: https://build.opensuse.org/package/show/utilities/miller?expand=0&rev=35 --- _service | 22 +++++++++++++ _servicedata | 4 +++ buildmode-pie.patch | 11 +++++++ miller-5.10.3.tar.gz | 3 -- miller-6.4.0+git20220823.cdbe8b82e.tar.gz | 3 ++ miller.changes | 21 +++++++++++++ miller.obsinfo | 4 +++ miller.spec | 38 ++++++++++++++--------- vendor.tar.gz | 3 ++ 9 files changed, 92 insertions(+), 17 deletions(-) create mode 100644 _service create mode 100644 _servicedata create mode 100644 buildmode-pie.patch delete mode 100644 miller-5.10.3.tar.gz create mode 100644 miller-6.4.0+git20220823.cdbe8b82e.tar.gz create mode 100644 miller.obsinfo create mode 100644 vendor.tar.gz diff --git a/_service b/_service new file mode 100644 index 0000000..c5685c8 --- /dev/null +++ b/_service @@ -0,0 +1,22 @@ + + + https://github.com/johnkerl/miller + main + git + @PARENT_TAG@+git%cd.%h + v(.*) + + enable + + + + + gz + *.tar + + + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..1abed55 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://github.com/johnkerl/miller + cdbe8b82efdc7d34491171089d261c3df2359aea \ No newline at end of file diff --git a/buildmode-pie.patch b/buildmode-pie.patch new file mode 100644 index 0000000..78a05ad --- /dev/null +++ b/buildmode-pie.patch @@ -0,0 +1,11 @@ +--- Makefile.orig 2022-08-23 18:21:08.562516337 -0400 ++++ Makefile 2022-08-23 18:21:17.490516712 -0400 +@@ -7,7 +7,7 @@ + # This must remain the first target in this file, which is what 'make' with no + # arguments will run. + build: +- go build github.com/johnkerl/miller/cmd/mlr ++ go build -buildmode=pie github.com/johnkerl/miller/cmd/mlr + @echo "Build complete. The Miller executable is ./mlr (or .\mlr.exe on Windows)." + @echo "You can use 'make check' to run tests". + diff --git a/miller-5.10.3.tar.gz b/miller-5.10.3.tar.gz deleted file mode 100644 index 902031e..0000000 --- a/miller-5.10.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:094642c6485080ddfd13025aa0e010e37e99b00b214ce729c43a5e43b215ec0a -size 6279214 diff --git a/miller-6.4.0+git20220823.cdbe8b82e.tar.gz b/miller-6.4.0+git20220823.cdbe8b82e.tar.gz new file mode 100644 index 0000000..f2b2739 --- /dev/null +++ b/miller-6.4.0+git20220823.cdbe8b82e.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c35447d31fb2c5195d9b776ac04a09a18e2543fdf8e943ffd6562f5a923a6819 +size 10985565 diff --git a/miller.changes b/miller.changes index 3e3f4a6..8346717 100644 --- a/miller.changes +++ b/miller.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Fri Aug 26 16:03:07 UTC 2022 - Scott Bradnick + +- Adding Group definition +- Removing unnecessary 'golang' requirement which isn't present in 15.3 + +------------------------------------------------------------------- +Tue Aug 23 20:43:11 UTC 2022 - scott.bradnick@suse.com + +- Update to version v6.4.0+git20220823.cdbe8b82e: + * Account for varying mlr locations (#1086) + * Restore --quote-all for CSV output (#1084) + * Restore the --jvquoteall flag (#1083) + * forgot to make a branch/PR for --quote-all + * make dev: for doc-build artifacts + * unit-test case + * Restore --quote-all flag for CSV output + * post-6.4.0 + * 6.4.0 release (#1081) + * codespell + ------------------------------------------------------------------- Wed Nov 17 06:58:21 UTC 2021 - Luigi Baldoni diff --git a/miller.obsinfo b/miller.obsinfo new file mode 100644 index 0000000..80e6d3e --- /dev/null +++ b/miller.obsinfo @@ -0,0 +1,4 @@ +name: miller +version: 6.4.0+git20220823.cdbe8b82e +mtime: 1661281007 +commit: cdbe8b82efdc7d34491171089d261c3df2359aea diff --git a/miller.spec b/miller.spec index 3a07831..ff7bb3c 100644 --- a/miller.spec +++ b/miller.spec @@ -1,7 +1,7 @@ # # spec file for package miller # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,16 +17,24 @@ Name: miller -Version: 5.10.3 +Version: 6.4.0+git20220823.cdbe8b82e Release: 0 Summary: Name-indexed data processing tool # c/lib/netbsd_strptime.c is BSD-4-Clause License: BSD-2-Clause AND BSD-4-Clause +Group: Productivity/Text/Utilities URL: http://johnkerl.org/miller/doc Source0: https://github.com/johnkerl/miller/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -BuildRequires: automake -BuildRequires: flex >= 2.5.35 -BuildRequires: libtool +Source1: vendor.tar.gz +Patch0: buildmode-pie.patch +#BuildRequires: golang +BuildRequires: golang-packaging +BuildRequires: gcc +BuildRequires: systemd-rpm-macros +# Switched to a golang build sometime after 5.10.3 +#BuildRequires: automake +#BuildRequires: flex >= 2.5.35 +#BuildRequires: libtool %description Miller (mlr) allows name-indexed data such as CSV and JSON files to be @@ -36,22 +44,24 @@ streams data where possible so its memory requirements stay small. It works well with pipes and can feed "tail -f". %prep -%setup -q -%ifarch %ix86 -sed -e 's/-pg//' -i c/Makefile.am -%endif +%setup -q -a 1 +%patch0 +# Not sure if this is still required +#%%ifarch %%ix86 +#sed -e 's/-pg//' -i c/Makefile.am +#%%endif %build -autoreconf -fiv -%configure -make %{?_smp_mflags} +%make_build %install -%make_install +%make_install PREFIX=%{_prefix} +# Add provided example.csv +cp -v %{_builddir}/%{name}-%{version}/docs/src/example.csv %{_builddir}/%{name}-%{version} %files %license LICENSE.txt -%doc README.md c/draft-release-notes.md +%doc README.md example.csv %{_bindir}/mlr %{_mandir}/man1/mlr.1%{ext_man} diff --git a/vendor.tar.gz b/vendor.tar.gz new file mode 100644 index 0000000..8b217dd --- /dev/null +++ b/vendor.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8102c6bc22202c80b6e8ec6a0b42bca0d89483b2ff765486162574a609f1f8b +size 1294598