From b120f2d76f1e3af69da0e01117cc9db7d9141c43e82ae7117f4687e1b76d6b4f Mon Sep 17 00:00:00 2001
From: Andreas Stieger <andreas.stieger@gmx.de>
Date: Sat, 11 Jul 2020 17:43:36 +0000
Subject: [PATCH] Accepting request 820434 from
 home:AndreasStieger:branches:utilities

ugrep 2.4.0

OBS-URL: https://build.opensuse.org/request/show/820434
OBS-URL: https://build.opensuse.org/package/show/utilities/ugrep?expand=0&rev=8
---
 reproducible.patch | 48 ----------------------------------------------
 ugrep-2.3.2.tar.gz |  3 ---
 ugrep-2.4.0.tar.gz |  3 +++
 ugrep.changes      | 10 ++++++++++
 ugrep.spec         |  4 +---
 5 files changed, 14 insertions(+), 54 deletions(-)
 delete mode 100644 reproducible.patch
 delete mode 100644 ugrep-2.3.2.tar.gz
 create mode 100644 ugrep-2.4.0.tar.gz

diff --git a/reproducible.patch b/reproducible.patch
deleted file mode 100644
index d742ebb..0000000
--- a/reproducible.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://github.com/Genivia/ugrep/pull/50 
-
-From e5413eeb4a98339587e9b32fe098e305b2bb9092 Mon Sep 17 00:00:00 2001
-From: "Bernhard M. Wiedemann" <bwiedemann@suse.de>
-Date: Sat, 4 Jul 2020 06:18:32 +0200
-Subject: [PATCH] Disable march=native for SSE2
-
-Without this patch, the code would only build binaries with SSE2,
-if the build machine CPU supported SSE2.
-
-And through the -march=native flag, it would then use more CPU features
-available on the build CPU that might not be available
-on the target machine CPU. That can cause an illegal instruction
-exception on the target machine.
-
-This patch changes behaviour so that only configure options determine the
-result of the build, regarding SSE2.
-
-See https://reproducible-builds.org/ for why this is good.
-
-This PR was done while working on reproducible builds for openSUSE.
----
- configure    | 4 ++--
- configure.ac | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-Index: ugrep-2.3.2/configure
-===================================================================
---- ugrep-2.3.2.orig/configure
-+++ ugrep-2.3.2/configure
-@@ -7708,7 +7709,7 @@ $as_echo "no" >&6; }
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports SSE2 intrinsics" >&5
- $as_echo_n "checking whether ${CXX} supports SSE2 intrinsics... " >&6; }
-   save_CXXFLAGS=$CXXFLAGS
--  CXXFLAGS="-march=native"
-+  CXXFLAGS="-msse2"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <emmintrin.h>
-@@ -7730,7 +7731,7 @@ rm -f core conftest.err conftest.$ac_obj
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $msse2_ok" >&5
- $as_echo "$msse2_ok" >&6; }
-   if test "x$msse2_ok" = "xyes"; then
--    SIMD_FLAGS="-march=native -msse2 -DHAVE_SSE2"
-+    SIMD_FLAGS="-msse2 -DHAVE_SSE2"
-   fi
- else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
diff --git a/ugrep-2.3.2.tar.gz b/ugrep-2.3.2.tar.gz
deleted file mode 100644
index 9bf86e2..0000000
--- a/ugrep-2.3.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a89ea05819b43cf892eaf6b7159adf6794f37b237643c2b4cd4348f9af914266
-size 4036501
diff --git a/ugrep-2.4.0.tar.gz b/ugrep-2.4.0.tar.gz
new file mode 100644
index 0000000..b784a76
--- /dev/null
+++ b/ugrep-2.4.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:be7dc40c6130d3bbb669a79f9e5c6812be421d298cb591d6f9a5f6d1469dc401
+size 4063066
diff --git a/ugrep.changes b/ugrep.changes
index 4fbe408..3292565 100644
--- a/ugrep.changes
+++ b/ugrep.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sat Jul 11 17:39:21 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- ugrep 2.4.0:
+  * New ug command which is the same as ugrep --config with the new
+    --config option to use configuration files
+  * new option --save-config to create configuration files
+  * added --help [WHAT] for quick help on WHA
+  * drop reproducible.patch, upstream
+ 
 -------------------------------------------------------------------
 Sun Jul  5 04:34:08 UTC 2020 - Bernhard Wiedemann <bwiedemann@suse.com>
 
diff --git a/ugrep.spec b/ugrep.spec
index 9e9a6d5..403c0a9 100644
--- a/ugrep.spec
+++ b/ugrep.spec
@@ -17,14 +17,13 @@
 
 
 Name:           ugrep
-Version:        2.3.2
+Version:        2.4.0
 Release:        0
 Summary:        Universal grep: a feature-rich grep implementation with focus on speed
 License:        BSD-3-Clause
 Group:          Productivity/File utilities
 URL:            https://github.com/Genivia/ugrep
 Source:         https://github.com/Genivia/ugrep/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Patch0:         reproducible.patch
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(bzip2)
@@ -39,7 +38,6 @@ fuzzy search.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure \