From 53eed71203335a6da48d8e225b79eb6b9a869599a98562b475eddb0cdd679c79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 8 Dec 2015 20:14:50 +0000 Subject: [PATCH] Accepting request 347977 from home:scarabeus_iv:branches:Printing - Do not bother with fsf address fix, if they move again or if the package update it we would needlessly fail - Do not bother with one condition that is equal to the following one OBS-URL: https://build.opensuse.org/request/show/347977 OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=123 --- hplip.changes | 7 +++++++ hplip.spec | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hplip.changes b/hplip.changes index 1fca527..f610918 100644 --- a/hplip.changes +++ b/hplip.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Dec 8 20:09:01 UTC 2015 - tchvatal@suse.com + +- Do not bother with fsf address fix, if they move again or if the + package update it we would needlessly fail +- Do not bother with one condition that is equal to the following one + ------------------------------------------------------------------- Thu Nov 19 11:25:19 UTC 2015 - ecsos@opensuse.org diff --git a/hplip.spec b/hplip.spec index 868e486..538b00b 100644 --- a/hplip.spec +++ b/hplip.spec @@ -350,10 +350,6 @@ This sub-package is only required by developers. # Patch108 add_missing_includes_and_define_GNU_SOURCE.patch adds missing '#include <...>' # and missing '#define _GNU_SOURCE' see https://bugs.launchpad.net/hplip/+bug/1456590 %patch108 -p1 -b .add_missing_includes_and_define_GNU_SOURCE.orig -# rpmlint: fix incorrect-fsf-address -find . -type f | xargs sed -i -e 's:59 Temple Place\, Suite 330\, Boston\, MA 02111-1307 USA:51 Franklin Street\, Fifth Floor\, Boston\, MA 02110-1301 USA:g' -find . -type f | xargs sed -i -e 's:59 Temple Place\, Suite 330\, Boston\, MA 02111-1307 USA:51 Franklin Street\, Fifth Floor\, Boston\, MA 02110-1301 USA:g' -find . -type f | xargs sed -i -e 's:59 Temple Place\, Suite 330\, Boston\, MA 02111-1307 USA:51 Franklin Street\, Fifth Floor\, Boston\, MA 02110-1301 USA:g' %build # If AUTOMAKE='automake --foreign' is not set, autoreconf (in fact automake) @@ -606,8 +602,6 @@ exit 0 %postun -p /bin/bash %if 0%{?suse_version} >= 1140 %desktop_database_postun -%endif -%if 0%{?suse_version} > 1130 %icon_theme_cache_postun %else gtk-update-icon-cache %{_datadir}/icons/hicolor || true