pghmcfc pushed to bluefish (bluefish-2.2.7-2.fc23). "Fix back-compatibility with old Fedoras and EPEL"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue Mar 31 14:11:02 UTC 2015


>From 7c4f3393886777af944829e3dfc31cb40ce947b5 Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul at city-fan.org>
Date: Tue, 31 Mar 2015 14:48:27 +0100
Subject: Fix back-compatibility with old Fedoras and EPEL


diff --git a/bluefish.spec b/bluefish.spec
index ada2bad..6aa0fca 100644
--- a/bluefish.spec
+++ b/bluefish.spec
@@ -1,10 +1,10 @@
 %global pkgver 2.2.7
 #global prerel rc1
-%global rpmrel 1
+%global rpmrel 2
 
 Name:		bluefish
 Version:	%{pkgver}
-Release:	%{?prerel:0.}%{rpmrel}%{?prerel:.%{prerel}}%{?dist}.1
+Release:	%{?prerel:0.}%{rpmrel}%{?prerel:.%{prerel}}%{?dist}
 Summary:	Web development application for experienced users
 License:	GPLv3+
 URL:		http://bluefish.openoffice.nl/
@@ -23,7 +23,9 @@ BuildRequires:	gucharmap-devel >= 2.90
 BuildRequires:	intltool
 BuildRequires:	libxml2-devel
 BuildRequires:	python2-devel
-BuildRequires:  libappstream-glib
+%if 0%{?fedora} > 22 || 0%{?rhel} > 7
+BuildRequires:	libappstream-glib >= 0.3.6
+%endif
 # Needed to check man pages
 BuildRequires:	/usr/bin/man
 # For the Advanced Open function
@@ -83,13 +85,11 @@ mkdir -p %{buildroot}%{_datadir}/applications
 make install DESTDIR=%{buildroot} INSTALL="install -p"
 
 # Update the screenshot shown in the software center
-#
-# NOTE: It would be *awesome* if this file was pushed upstream.
-#
-# See http://people.freedesktop.org/~hughsient/appdata/#screenshots for more details.
-#
-appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/appdata/bluefish.appdata.xml \
-  https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/bluefish/a.png 
+# http://bugzilla.gnome.org/747101
+%if 0%{?fedora} > 22 || 0%{?rhel} > 7
+appstream-util replace-screenshots %{buildroot}%{_datadir}/appdata/bluefish.appdata.xml \
+	https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/bluefish/a.png
+%endif
 
 # Make zencoding plugin scripts executable to placate rpmlint
 find %{buildroot}%{_datadir}/bluefish/plugins/zencoding -name '*.py' |
@@ -180,8 +180,11 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Tue Mar 31 2015 Paul Howarth <paul at city-fan.org> - 2.2.7-2
+- Fix back-compatibility with old Fedoras and EPEL
+
 * Mon Mar 30 2015 Richard Hughes <rhughes at redhat.com> - 2.2.7-1.1
-- Use better AppData screenshots
+- Use better AppData screenshots (http://bugzilla.gnome.org/747101)
 
 * Mon Feb  2 2015 Paul Howarth <paul at city-fan.org> - 2.2.7-1
 - Update to 2.2.7 (mostly a bug fix release)
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/bluefish.git/commit/?h=bluefish-2.2.7-2.fc23&id=7c4f3393886777af944829e3dfc31cb40ce947b5


More information about the scm-commits mailing list