[codeblocks] - drop support for RHEL < 6 - include appdata only for Fedora

Dan Horák sharkcz at fedoraproject.org
Wed Dec 3 21:26:20 UTC 2014


commit add88ca2572179ad75518a8a3cb26db9874de182
Author: Dan Horák <dan at danny.cz>
Date:   Wed Dec 3 22:26:23 2014 +0100

    - drop support for RHEL < 6
    - include appdata only for Fedora

 codeblocks.spec |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/codeblocks.spec b/codeblocks.spec
index a190e88..cf293cb 100644
--- a/codeblocks.spec
+++ b/codeblocks.spec
@@ -7,7 +7,7 @@
 
 Name:		codeblocks
 Version:	13.12
-Release:	11%{?svnrelease}%{?dist}
+Release:	12%{?svnrelease}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPLv3+
@@ -27,13 +27,9 @@ BuildRequires:	wxGTK-devel
 BuildRequires:	zlib-devel
 BuildRequires:	bzip2-devel
 BuildRequires:	tinyxml-devel
-%if 0%{?fedora} || 0%{?rhel} >= 5
 BuildRequires:	libICE-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 6
 BuildRequires:	boost-devel
 BuildRequires:	hunspell-devel
-%endif
 %if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires:	squirrel-devel
 %endif
@@ -44,7 +40,9 @@ BuildRequires:	gamin-devel
 BuildRequires:	zip
 BuildRequires:	dos2unix
 BuildRequires:	desktop-file-utils
+%if 0%{?fedora}
 BuildRequires:	libappstream-glib
+%endif
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	shared-mime-info
 Requires:	xterm
@@ -61,9 +59,11 @@ Patch14:	codeblocks-13.12-astyle-2.05.patch
 %define		pkglibdir	%{_libdir}/%{name}
 %define		plugindir	%{pkglibdir}/plugins
 
-%if 0%{?fedora} || 0%{?rhel} >= 6
+%if 0%{?rhel} && 0%{?rhel} <= 6
 %filter_provides_in %{plugindir}
 %filter_setup
+%else
+%global __provides_exclude_from ^%{plugindir}/.*\\.so$
 %endif
 
 
@@ -134,9 +134,7 @@ Additional Code::Blocks plug-ins.
 %patch10 -p1
 %patch11 -p1
 %patch13 -p1
-%if %{?fedora} >= 22
 %patch14 -p1
-%endif
 
 %if %{snapshot}
 # generate revision.m4
@@ -166,15 +164,11 @@ find src/plugins/contrib/IncrementalSearch -type f -exec chmod a-x {} ';'
 # NassiShneiderman - boost is too old or missing on EL < 6
 # spellchecker - hunspell is missing
 %configure \
-%if 0%{?fedora} || 0%{?rhel} >= 6
     --with-contrib-plugins=all
-%else
-    --with-contrib-plugins=all,-NassiShneiderman,-spellchecker
-%endif
 
 # remove unbundled stuff
 rm -rf src/include/tinyxml src/base/tinyxml
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 7
 rm -rf src/include/scripting/{include,squirrel,sqstdlib}
 rm -rf src/sdk/scripting/{squirrel,sqstdlib}
 %endif
@@ -188,7 +182,9 @@ make %{?_smp_mflags}
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT INSTALL="/usr/bin/install -p" install
+%if 0%{?fedora}
 DESTDIR=%{buildroot} appstream-util install %{SOURCE1} %{SOURCE2}
+%endif
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/wxContribItems/*.la
@@ -248,7 +244,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{plugindir}/libscriptedwizard.so
 %{plugindir}/libtodo.so
 
+%if 0%{?fedora}
 %{_datadir}/appdata/%{name}.appdata.xml
+%endif
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/48x48/mimetypes/*.png
 %{_datadir}/mime/packages/%{name}.xml
@@ -350,11 +348,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{pkgdatadir}/images/codesnippets
 %{pkgdatadir}/images/wxsmith
 %{pkgdatadir}/lib_finder
-%if 0%{?fedora} || 0%{?rhel} >= 6
 %{pkgdatadir}/NassiShneiderman.zip
 %{pkgdatadir}/SpellChecker.zip
 %{pkgdatadir}/SpellChecker
-%endif
 %{pkgdatadir}/SmartIndent*.zip
 
 %{plugindir}/libAutoVersioning.so
@@ -392,15 +388,19 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{plugindir}/libwxsmith.so
 %{plugindir}/libwxSmithAui.so
 %{plugindir}/libwxsmithcontribitems.so
-%if 0%{?fedora} || 0%{?rhel} >= 6
 %{plugindir}/libNassiShneiderman.so
 %{plugindir}/libSpellChecker.so
-%endif
 %{plugindir}/libSmartIndent*.so
+%if 0%{?fedora}
 %{_datadir}/appdata/%{name}-contrib.metainfo.xml
+%endif
 
 
 %changelog
+* Wed Dec 03 2014 Dan Horák <dan[at]danny.cz> - 13.12-12
+- drop support for RHEL < 6
+- include appdata only for Fedora
+
 * Fri Nov 21 2014 Dan Horák <dan[at]danny.cz> - 13.12-11
 - set Fedora specific paths for spellchecker and thesaurus in the SpellChecker plugin
 - update for astyle 2.05 (#1166377)


More information about the scm-commits mailing list