From e721aa9f8681d5e8c42bd41294778f46983c99fa Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Jan 17 2021 18:18:06 +0000
Subject: General spec cleanups


---

diff --git a/codeblocks.spec b/codeblocks.spec
index c1704eb..89038e2 100644
--- a/codeblocks.spec
+++ b/codeblocks.spec
@@ -7,7 +7,7 @@
 
 Name:		codeblocks
 Version:	20.03
-Release:	4%{?svnrelease}%{?dist}
+Release:	5%{?svnrelease}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 License:	GPLv3+
 URL:		http://www.codeblocks.org/
@@ -26,24 +26,24 @@ Patch1:		codeblocks-20.03-multi-arch.patch
 Patch2:		codeblocks-20.03-pragma.patch
 Patch3:         codeblocks-gcc11.patch
 
+BuildRequires:	astyle-devel >= 3.1
+BuildRequires:	boost-devel
+BuildRequires:	bzip2-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	dos2unix
+BuildRequires:	gamin-devel
 BuildRequires:	gcc
 BuildRequires:	gcc-c++
-BuildRequires:	libtool
-BuildRequires:	wxGTK3-devel
-BuildRequires:	zlib-devel
-BuildRequires:	bzip2-devel
-BuildRequires:	tinyxml-devel
-BuildRequires:	libICE-devel
-BuildRequires:	boost-devel
 BuildRequires:	hunspell-devel
-BuildRequires:	squirrel-devel
-BuildRequires:	astyle-devel >= 3.1
 BuildRequires:	libappstream-glib
-BuildRequires:	gamin-devel
+BuildRequires:	libICE-devel
+BuildRequires:	libtool
+BuildRequires:	make
+BuildRequires:	squirrel-devel
+BuildRequires:	tinyxml-devel
+BuildRequires:	wxGTK3-devel
 BuildRequires:	zip
-BuildRequires:	dos2unix
-BuildRequires:	desktop-file-utils
-BuildRequires: make
+BuildRequires:	zlib-devel
 
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	shared-mime-info
@@ -100,9 +100,7 @@ Requires:	cccc
 %endif
 Requires:	cppcheck
 Requires:	cscope
-%ifnarch s390
 Requires:	valgrind
-%endif
 
 %description contrib
 Additional Code::Blocks plug-ins.
@@ -154,7 +152,7 @@ rm -rf src/plugins/contrib/help_plugin/{bzip2,zlib}
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
-make %{?_smp_mflags}
+%make_build
 
 %install
 %make_install
@@ -162,9 +160,7 @@ make %{?_smp_mflags}
 appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.{appdata,metainfo}.xml
 desktop-file-validate	%{buildroot}/%{_datadir}/applications/codeblocks.desktop
 
-rm -f %{buildroot}/%{_libdir}/*.la
-rm -f %{buildroot}/%{_libdir}/%{name}/wxContribItems/*.la
-rm -f %{buildroot}/%{plugindir}/*.la
+find %{buildroot} -type f -name "*.la" -delete
 
 # set a fixed timestamp (source archive creation) to generated resource archives
 /bin/touch -r %{SOURCE0} %{buildroot}/%{pkgdatadir}/*.zip
@@ -180,9 +176,9 @@ echo "%{_libdir}/%{name}/wxContribItems" > %{buildroot}/%{_sysconfdir}/ld.so.con
 
 %files
 %license COPYING
-%doc README AUTHORS BUGS COMPILERS NEWS ChangeLog
-
-%{_bindir}/*
+%doc README AUTHORS BUGS COMPILERS NEWS
+%{_bindir}/codeblocks
+%{_bindir}/cb_*
 %{_mandir}/man1/codeblocks.*.gz
 %{_mandir}/man1/cb_console_runner.*.gz
 %{_mandir}/man1/cb_share_config.*.gz
@@ -352,6 +348,9 @@ echo "%{_libdir}/%{name}/wxContribItems" > %{buildroot}/%{_sysconfdir}/ld.so.con
 
 
 %changelog
+* Sun Jan 17 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 20.03-5
+- General spec cleanups
+
 * Tue Jul 28 2020 Jeff Law <law@redhat.com> - 20.03-4
 - Make comparison object invocable as const