Accepting request 1000973 from utilities

- Patch buildmode-pie.patch was added per go's request during build.

- Excluding patch from ppc64: "-buildmode=pie not supported on linux/ppc64"

- 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/1000973
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/miller?expand=0&rev=16
This commit is contained in:
Dominique Leuenberger 2022-09-03 21:18:56 +00:00 committed by Git OBS Bridge
commit caf37a6d6d
9 changed files with 103 additions and 16 deletions

22
_service Normal file
View File

@ -0,0 +1,22 @@
<services>
<service name="obs_scm" mode="disabled">
<param name="url">https://github.com/johnkerl/miller</param>
<param name="revision">main</param>
<param name="scm">git</param>
<param name="versionformat">@PARENT_TAG@+git%cd.%h</param>
<param name="versionrewrite-pattern">v(.*)</param>
<!--
<param name="versionrewrite-pattern"></param>
<param name="versionrewrite-replacement"></param>
-->
<param name="changesgenerate">enable</param>
</service>
<service name="set_version" mode="disabled"/>
<service name="tar" mode="disabled"/>
<service name="recompress" mode="disabled">
<param name="compression">gz</param>
<param name="file">*.tar</param>
</service>
<service name="go_modules" mode="disabled">
</service>
</services>

4
_servicedata Normal file
View File

@ -0,0 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/johnkerl/miller</param>
<param name="changesrevision">cdbe8b82efdc7d34491171089d261c3df2359aea</param></service></servicedata>

11
buildmode-pie.patch Normal file
View File

@ -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".

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:094642c6485080ddfd13025aa0e010e37e99b00b214ce729c43a5e43b215ec0a
size 6279214

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c35447d31fb2c5195d9b776ac04a09a18e2543fdf8e943ffd6562f5a923a6819
size 10985565

View File

@ -1,3 +1,34 @@
-------------------------------------------------------------------
Fri Sep 2 21:29:11 UTC 2022 - Scott Bradnick <scott.bradnick@suse.com>
- Patch buildmode-pie.patch was added per go's request during build.
-------------------------------------------------------------------
Fri Aug 26 18:47:10 UTC 2022 - Scott Bradnick <scott.bradnick@suse.com>
- Excluding patch from ppc64: "-buildmode=pie not supported on linux/ppc64"
-------------------------------------------------------------------
Fri Aug 26 16:03:07 UTC 2022 - Scott Bradnick <scott.bradnick@suse.com>
- 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 <aloisio@gmx.com>

4
miller.obsinfo Normal file
View File

@ -0,0 +1,4 @@
name: miller
version: 6.4.0+git20220823.cdbe8b82e
mtime: 1661281007
commit: cdbe8b82efdc7d34491171089d261c3df2359aea

View File

@ -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,26 @@ 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
%setup -q -a 1
%if "%{_arch}" != "ppc64"
%patch0
%endif
# 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}

3
vendor.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c8102c6bc22202c80b6e8ec6a0b42bca0d89483b2ff765486162574a609f1f8b
size 1294598