From 38d4b2b8f0e6e59965db8bb47c03481f2f6793d3 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Jan 18 2018 19:19:02 +0000 Subject: Really remove obsolete stuff Signed-off-by: Igor Gnatenko --- diff --git a/bluefish.spec b/bluefish.spec index 7b2d8bd..219805f 100644 --- a/bluefish.spec +++ b/bluefish.spec @@ -4,7 +4,7 @@ Name: bluefish Version: %{pkgver} -Release: %{?prerel:0.}%{rpmrel}%{?prerel:.%{prerel}}%{?dist} +Release: %{?prerel:0.}%{rpmrel}%{?prerel:.%{prerel}}%{?dist}.1 Summary: Web development application for experienced users License: GPLv3+ URL: http://bluefish.openoffice.nl/ @@ -17,7 +17,7 @@ BuildRequires: findutils BuildRequires: gcc BuildRequires: gettext BuildRequires: glib2-devel >= 2.24 -%if 0%{?fedora} < 16 && 0%{?rhel} < 7 +%if 0%{?rhel} && 0%{?rhel} < 7 BuildRequires: gtk2-devel >= 2.20 BuildRequires: gucharmap-devel >= 2.20 %else @@ -28,7 +28,7 @@ BuildRequires: intltool BuildRequires: libxml2-devel BuildRequires: make BuildRequires: python2-devel >= 2.7 -%if 0%{?fedora} > 22 || 0%{?rhel} > 7 +%if ! (0%{?rhel} && 0%{?rhel} <= 7) BuildRequires: libappstream-glib >= 0.3.6 %endif # Needed to check man pages @@ -120,7 +120,7 @@ install -m 644 -p -t %{buildroot}%{bluefish_docdir}/ \ rm -f %{buildroot}%{_libdir}/%{name}/*.la %post shared-data -%if 0%{?fedora} < 26 && 0%{?rhel} < 8 +%if 0%{?rhel} && 0%{?rhel} < 8 update-desktop-database &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor &> /dev/null || : touch --no-create %{_datadir}/mime/packages &> /dev/null || : @@ -132,7 +132,7 @@ xmlcatalog --noout --add 'delegateURI' \ %postun shared-data if [ "$1" = 0 ]; then -%if 0%{?fedora} < 26 && 0%{?rhel} < 8 +%if 0%{?rhel} && 0%{?rhel} < 8 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || : gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : update-desktop-database -q &> /dev/null ||: @@ -144,7 +144,7 @@ if [ "$1" = 0 ]; then %{_sysconfdir}/xml/catalog &> /dev/null || : fi -%if 0%{?fedora} < 26 && 0%{?rhel} < 8 +%if 0%{?rhel} && 0%{?rhel} < 8 %posttrans shared-data gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : update-mime-database %{_datadir}/mime &> /dev/null || : @@ -161,7 +161,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %doc %{bluefish_docdir}/ %{_datadir}/%{name}/ # appdata directory owned by filesystem package from Fedora 20 onwards -%if 0%{?fedora} < 20 && 0%{?rhel} < 8 +%if 0%{?rhel} && 0%{?rhel} < 8 %{_datadir}/appdata/ %else %{_datadir}/appdata/%{name}.appdata.xml @@ -178,6 +178,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_mandir}/man1/%{name}.1* %changelog +* Thu Jan 18 2018 Igor Gnatenko - 2.2.10-6.1 +- Remove obsolete scriptlets + * Mon Jan 8 2018 Paul Howarth - 2.2.10-6 - Retain legacy scriptlets for builds on legacy Fedoras - Remove a Group: tag that was missed earlier