From 401157de729cea9b1d06d87f6cddb32cef9c760b18b242bad66e8d9d27183c2a Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 25 Dec 2017 19:51:10 +0000
Subject: [PATCH] givaro-4.0.4

OBS-URL: https://build.opensuse.org/package/show/science/givaro?expand=0&rev=18
---
 ...onfig-file-must-not-have-non-I-flags.patch | 39 -------------------
 givaro.changes                                |  7 ++++
 givaro.spec                                   |  5 +--
 v4.0.2.tar.gz                                 |  3 --
 v4.0.4.tar.gz                                 |  3 ++
 5 files changed, 12 insertions(+), 45 deletions(-)
 delete mode 100644 0001-pkgconfig-file-must-not-have-non-I-flags.patch
 delete mode 100644 v4.0.2.tar.gz
 create mode 100644 v4.0.4.tar.gz

diff --git a/0001-pkgconfig-file-must-not-have-non-I-flags.patch b/0001-pkgconfig-file-must-not-have-non-I-flags.patch
deleted file mode 100644
index 316716e..0000000
--- a/0001-pkgconfig-file-must-not-have-non-I-flags.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 4775e15fe538e49237d267c677be1fe68929ab9d Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Sun, 10 Sep 2017 00:03:02 +0200
-Subject: [PATCH] pkgconfig file must not have non -I flags
-
-The Cflags directive in .pc files is really meant for the
-preprocessor, not for the compiler. It must only contain -D and -I
-flags. Otherwise, it forces flags on downstream programs that may not
-want them.
-
-In case of the build.opensuse.org build farm, it has even led to
-crashes as the machine that was randomly selected to build givaro had
-SSE4, emitting -msse4.1 into Cflags, while the machine randomly
-selected to build fflas-ffpack had only SSE2. That cannot work.
-
-"Cflags: -I/usr/include  -fmessage-length=0 -grecord-gcc-switches -O2
--Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables
--fasynchronous-unwind-tables  -mmmx -mpopcnt -msse -msse2 -msse3
--msse4.1 -msse4.2 -msse4a -mavx -mfma -mfma4 -mbmi -mfpmath=sse
--fabi-version=6"
----
- givaro.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/givaro.pc.in b/givaro.pc.in
-index 274d87e..6e837ff 100644
---- a/givaro.pc.in
-+++ b/givaro.pc.in
-@@ -10,5 +10,5 @@ URL: http://givaro.forge.imag.fr
- Version: @VERSION@
- Requires:
- Libs: -L@libdir@ -lgivaro @LIBS@
--Cflags: -I@includedir@ @CXXFLAGS@
-+Cflags: -I@includedir@
- \-------------------------------------------------------
-\ No newline at end of file
--- 
-2.14.1
-
diff --git a/givaro.changes b/givaro.changes
index aa759d6..ead9c4d 100644
--- a/givaro.changes
+++ b/givaro.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Dec 25 19:48:10 UTC 2017 - jengelh@inai.de
+
+- Update to new upstream release 4.0.4
+  * build: fix SIMD detection script
+- Drop 0001-pkgconfig-file-must-not-have-non-I-flags.patch
+
 -------------------------------------------------------------------
 Sat Sep  9 21:59:22 UTC 2017 - jengelh@inai.de
 
diff --git a/givaro.spec b/givaro.spec
index 41f7dfd..95559ec 100644
--- a/givaro.spec
+++ b/givaro.spec
@@ -18,7 +18,7 @@
 
 Name:           givaro
 %define lname   libgivaro9
-Version:        4.0.2
+Version:        4.0.4
 Release:        0
 Summary:        C++ library for arithmetic and algebraic computations
 License:        CECILL-B
@@ -28,7 +28,6 @@ Url:            http://givaro.forge.imag.fr/
 #Git-Clone:	https://github.com/linbox-team/givaro
 Source:         https://github.com/linbox-team/givaro/archive/v%version.tar.gz
 Patch1:         givaro-doc-no-build-time.patch
-Patch2:         0001-pkgconfig-file-must-not-have-non-I-flags.patch
 # Old doxygen does not properly handle symlink recursion
 BuildRequires:  doxygen >= 1.5.7.1
 BuildRequires:  fdupes
@@ -106,7 +105,7 @@ the Givaro API.
 
 %prep
 %setup -q
-%patch -P 1 -P 2 -p1
+%patch -P 1 -p1
 
 %build
 autoreconf -fi
diff --git a/v4.0.2.tar.gz b/v4.0.2.tar.gz
deleted file mode 100644
index 0940d63..0000000
--- a/v4.0.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:52da0c41fb716abd70c8127944994388db03b4c7c4a5fbab75ad2d99d1c5d4f3
-size 653941
diff --git a/v4.0.4.tar.gz b/v4.0.4.tar.gz
new file mode 100644
index 0000000..213c720
--- /dev/null
+++ b/v4.0.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:37dc24e59b34b783094dbb1f6117c9d4bcdf4a8019bd3e2714f2d8b69d8c8f49
+size 656583