From 8a5b2ae1520393c7e8a5aa75d503fb638c5cfe6a Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Apr 14 2018 12:09:28 +0000
Subject: Update to v0.5.2 release.


Signed-off-by: Jeff Layton <jlayton@redhat.com>

---

diff --git a/.gitignore b/.gitignore
index 5798078..ec7407f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ sparse-0.4.2.tar.bz2
 /sparse-0.4.5.rc1.tar.xz
 /sparse-0.5.0.tar.xz
 /sparse-0.5.1.tar.xz
+/sparse-0.5.2.tar.xz
diff --git a/0001-build-clean-up-CFLAGS-handling-in-the-makefile.patch b/0001-build-clean-up-CFLAGS-handling-in-the-makefile.patch
deleted file mode 100644
index 4e8a4d3..0000000
--- a/0001-build-clean-up-CFLAGS-handling-in-the-makefile.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 69207180900ddfbb21412f83a84682028edbd815 Mon Sep 17 00:00:00 2001
-From: Jeff Layton <jlayton@redhat.com>
-Date: Wed, 18 Oct 2017 10:51:05 -0400
-Subject: [PATCH] build: clean up $CFLAGS handling in the makefile
-
-The fedora packaging tools want to provide a base set of $CFLAGS when
-building packages, but that fails when building sparse.
-
-There are a couple of build targets in the makefile that add options to
-$CFLAGS.  When we do a build though, we pass $ALL_CFLAGS to the
-compiler, and that ends up without those extra options, if CFLAGS= was
-passed to the make command.
-
-This patch changes the code to append the options to $ALL_CFLAGS instead
-of $CFLAGS. At the same time, passing a CFLAGS argument to make ends up
-with the initial CFLAGS assignment being clobbered such that we lose the
-options that are assigned to it internally. Fold the internal usage of
-CFLAGS into BASIC_CFLAGS. They both just end up as part of ALL_CFLAGS
-anyway, so this should be functionally equivalent.
-
-Cc: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
-Signed-off-by: Jeff Layton <jlayton@redhat.com>
----
- Makefile | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-I sent this last week in a reply to a different thread. Re-posting it
-here since it got no replies.
-
-diff --git a/Makefile b/Makefile
-index d0341764158e..335dcfff54ce 100644
---- a/Makefile
-+++ b/Makefile
-@@ -12,8 +12,8 @@ OS = linux
- 
- 
- CC = gcc
--CFLAGS = -O2 -finline-functions -fno-strict-aliasing -g
--CFLAGS += -Wall -Wwrite-strings
-+BASIC_CFLAGS = -O2 -finline-functions -fno-strict-aliasing -g
-+BASIC_CFLAGS += -Wall -Wwrite-strings
- LDFLAGS += -g
- LD = gcc
- AR = ar
-@@ -21,7 +21,7 @@ PKG_CONFIG = pkg-config
- CHECKER = ./cgcc -no-compile
- CHECKER_FLAGS =
- 
--ALL_CFLAGS = $(CFLAGS) $(BASIC_CFLAGS)
-+ALL_CFLAGS = $(BASIC_CFLAGS) $(CFLAGS)
- #
- # For debugging, put this in local.mk:
- #
-@@ -44,7 +44,7 @@ LLVM_CONFIG:=llvm-config
- HAVE_LLVM:=$(shell $(LLVM_CONFIG) --version >/dev/null 2>&1 && echo 'yes')
- 
- GCC_BASE := $(shell $(CC) --print-file-name=)
--BASIC_CFLAGS = -DGCC_BASE=\"$(GCC_BASE)\"
-+BASIC_CFLAGS += -DGCC_BASE=\"$(GCC_BASE)\"
- 
- MULTIARCH_TRIPLET := $(shell $(CC) -print-multiarch 2>/dev/null)
- BASIC_CFLAGS += -DMULTIARCH_TRIPLET=\"$(MULTIARCH_TRIPLET)\"
-@@ -83,7 +83,7 @@ PROGRAMS += test-inspect
- INST_PROGRAMS += test-inspect
- test-inspect_EXTRA_DEPS := ast-model.o ast-view.o ast-inspect.o
- test-inspect_OBJS := test-inspect.o $(test-inspect_EXTRA_DEPS)
--$(test-inspect_OBJS) $(test-inspect_OBJS:.o=.sc): CFLAGS += $(GTK_CFLAGS)
-+$(test-inspect_OBJS) $(test-inspect_OBJS:.o=.sc): ALL_CFLAGS += $(GTK_CFLAGS)
- test-inspect_EXTRA_OBJS := $(GTK_LIBS)
- else
- $(warning Your system does not have gtk3/gtk2, disabling test-inspect)
-@@ -208,7 +208,7 @@ ifneq ($(DEP_FILES),)
- include $(DEP_FILES)
- endif
- 
--c2xml.o c2xml.sc: CFLAGS += $(LIBXML_CFLAGS)
-+c2xml.o c2xml.sc: ALL_CFLAGS += $(LIBXML_CFLAGS)
- 
- pre-process.sc: CHECKER_FLAGS += -Wno-vla
- 
--- 
-2.13.6
-
diff --git a/sources b/sources
index 05ac247..49ab0a0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sparse-0.5.1.tar.xz) = 85cd6ace80e0c23ba3c329e839bf0e08398fdcd89d718dfb1ae12c42a3bd97dd5140a983c6ffaf9f338f00d6ff35f7ed508293676f76d3656ce418e743acf052
+SHA512 (sparse-0.5.2.tar.xz) = 1c2e541db97d89b2dbe57c07f0af04831f4ef85dae316017c2a192c9da2fdf5f660d6a337a1a7b620080540fef97e9cd4582524d75b8b438861d030a90f135e4
diff --git a/sparse.spec b/sparse.spec
index 6e9c6c4..9eeb438 100644
--- a/sparse.spec
+++ b/sparse.spec
@@ -1,6 +1,6 @@
 Name: sparse
-Version: 0.5.1
-Release: 3%{?dist}
+Version: 0.5.2
+Release: 1%{?dist}
 Summary:    A semantic parser of source files
 Group:      Development/Tools
 License:    MIT
@@ -8,7 +8,6 @@ URL:        https://sparse.wiki.kernel.org
 BuildRequires: libxml2-devel gtk2-devel
 
 Source0:    http://www.kernel.org/pub/software/devel/sparse/dist/sparse-%{version}.tar.xz
-Patch1:     0001-build-clean-up-CFLAGS-handling-in-the-makefile.patch
 
 %description
 Sparse is a semantic parser of source files: it's neither a compiler
@@ -37,7 +36,6 @@ Development headers headers and static lib for sparse-enabled apps
 
 %prep
 %setup -q
-%patch1 -p1
 
 %define make_destdir \
 make DESTDIR="%{buildroot}" PREFIX="%{_prefix}" \\\
@@ -78,6 +76,9 @@ make clean
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Wed Oct 25 2017 Jeff Layton <jlayton@redhat.com> - 0.5.2-1
+-  Update to v0.5.2 release
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild