From 03351697af2ec41504ce0dec7979e1c751c485da Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Apr 07 2016 11:41:53 +0000
Subject: fix cflags on configure


---

diff --git a/4Pane.spec b/4Pane.spec
index 1283c5a..75619f3 100644
--- a/4Pane.spec
+++ b/4Pane.spec
@@ -5,11 +5,10 @@
 # really expects this
 # (expanded afterwards, use %%define)
 %define	_docdir_fmt	%{NAME}
-%undefine	_hardened_build
 
 Name:			4Pane
-Version:		3.0  
-Release:		9%{?dist}
+Version:		4.0
+Release:		0.100%{?dist}
 Summary:		Multi-pane, detailed-list file manager
 
 License:		GPLv3
@@ -28,7 +27,8 @@ Patch5:		4Pane-HEAD-0005-Make-the-toolbar-the-correct-size-for-its-tools-in-g.pa
 BuildRequires:	bzip2-devel
 BuildRequires:	xz-devel
 BuildRequires:	wxGTK3-devel
-BuildRequires:	desktop-file-utils
+BuildRequires:  %{_bindir}/desktop-file-install
+BuildRequires:  %{_bindir}/appstream-util
 BuildRequires:	git
 
 %description
@@ -44,6 +44,7 @@ tools.
 %prep
 %setup -q -n 4pane-%{version}
 
+%if 0
 cat > .gitignore <<EOF
 configure
 config.guess
@@ -57,15 +58,11 @@ git config user.email "4Pane-owner@fedoraproject.org"
 git config user.name "4Pane owners"
 git add .
 git commit -m "base" -q
+%endif
 
-cat %PATCH1 | git am
-cat %PATCH2 | git am
-cat %PATCH3 | git am
-cat %PATCH4 | git am
-cat %PATCH5 | git am
-
-sed -i -e '\@Icon=@s|^.*$|Icon=%{name}|' rc/%{name}.desktop
-git commit -m "Fix icon entry in desktop file" -a
+sed -i.cflags configure \
+	-e '\@[ \t]\{5,\}C.*FLAGS[ \t]*=[ \t]*$@d'
+git commit -m "fix cflags on configure" -a
 
 %build
 export WX_CONFIG_NAME=wx-config-3.0
@@ -90,11 +87,13 @@ install -cpm 644 rc/%{name}.desktop %{buildroot}%{_datadir}/applications/
 install -cpm 644 bitmaps/%{name}Icon32.xpm %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm
 install -cpm 644 bitmaps/%{name}Icon48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
-desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
-
 mkdir -p %{buildroot}%{_mandir}/man1
 install -cpm 644 4Pane.1 %{buildroot}%{_mandir}/man1/
 
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
+appstream-util validate-relax --nonet \
+        %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
+
 %find_lang %{name}
 
 # Once remove document and let %%doc re-install them
@@ -122,15 +121,17 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/%{name}
 
 %{_mandir}/man1/%{name}.1*
-%if 0%{?fedora} >= 21
 %{_datadir}/appdata/%{name}.appdata.xml
-%endif
 
 %{_datadir}/%{name}/
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}*
 
 %changelog
+* Thu Apr 07 2016 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4.0-1
+- 4.0
+- Enable hardened build again
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild