From 308b4e73afade89c2e3782bddb1600a3d1281898 Mon Sep 17 00:00:00 2001
From: Jens Lody <fedora@jenslody.de>
Date: Jan 15 2018 21:46:55 +0000
Subject: Added build-dependency for astyle >= 3.1

Remove unneeded conditionals from spec-file

---

diff --git a/codeblocks.spec b/codeblocks.spec
index efdeb6c..9de9320 100644
--- a/codeblocks.spec
+++ b/codeblocks.spec
@@ -29,10 +29,8 @@ BuildRequires:	libICE-devel
 BuildRequires:	boost-devel
 BuildRequires:	hunspell-devel
 BuildRequires:	squirrel-devel
-%if 0%{?fedora}
-BuildRequires:	astyle-devel
+BuildRequires:	astyle-devel >= 3.1
 BuildRequires:	libappstream-glib
-%endif
 BuildRequires:	gamin-devel
 BuildRequires:	zip
 BuildRequires:	dos2unix
@@ -136,9 +134,7 @@ find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*.
 rm -rf src/include/tinyxml src/base/tinyxml
 rm -rf src/include/scripting/{include,squirrel,sqstdlib}
 rm -rf src/sdk/scripting/{squirrel,sqstdlib}
-%if 0%{?fedora}
 rm -rf src/plugins/astyle/astyle
-%endif
 rm -rf src/plugins/contrib/SpellChecker/hunspell
 rm -rf src/plugins/contrib/devpak_plugin/bzip2
 rm -rf src/plugins/contrib/help_plugin/{bzip2,zlib}
@@ -152,7 +148,6 @@ make %{?_smp_mflags}
 %install
 %make_install
 
-%if 0%{?fedora}
 appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.{appdata,metainfo}.xml
 %endif
 desktop-file-validate	%{buildroot}/%{_datadir}/applications/codeblocks.desktop
@@ -202,9 +197,7 @@ echo "%{_libdir}/%{name}/wxContribItems" > %{buildroot}/%{_sysconfdir}/ld.so.con
 %{plugindir}/libscriptedwizard.so
 %{plugindir}/libtodo.so
 
-%if %{snapshot} || 0%{?fedora}
 %{_datadir}/appdata/%{name}.appdata.xml
-%endif
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/48x48/mimetypes/*.png
 %{_datadir}/mime/packages/%{name}.xml
@@ -352,9 +345,7 @@ echo "%{_libdir}/%{name}/wxContribItems" > %{buildroot}/%{_sysconfdir}/ld.so.con
 %{plugindir}/libNassiShneiderman.so
 %{plugindir}/libSpellChecker.so
 %{plugindir}/libSmartIndent*.so
-%if %{snapshot} || 0%{?fedora}
 %{_datadir}/appdata/%{name}-contrib.metainfo.xml
-%endif
 
 
 %changelog