From 1229d6af4be9ac4864f5d87c22b19fa1c6a4be2b Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 29 Nov 2016 10:28:23 +0100 Subject: [PATCH] fixing requires for hpplugincheck --- hplip.spec | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/hplip.spec b/hplip.spec index 37b9071..fd371ba 100644 --- a/hplip.spec +++ b/hplip.spec @@ -4,8 +4,8 @@ %filter_setup } -# Hp-plugin-check is a switch, which allows testing if new hp-plugin is already available - this should be set to 1 only for local builds -# when you rebase package to new version (lately HP ships new plugins a few days after new release, which makes hp-plugin non-functional +# Hp-plugin-check is a switch, which allows testing if new hp-plugin is already available - SET TO 1 ONLY FOR LOCAL BUILDS WHEN REBASING, +# NO COMMITS WITH HPPLUGINCHECK 1 (lately HP ships new plugins a few days after new release, which makes hp-plugin non-functional # during this time). Any other time it should be set to 0. %define hpplugincheck 0 %define urlplugin http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/%{name}-%{version}-plugin.run @@ -13,7 +13,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.16.11 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and MIT and BSD Url: http://hplip.sourceforge.net/ @@ -48,11 +48,7 @@ Patch25: hplip-badwhitespace.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: python3-pillow Requires: cups -%if "%{hpplugincheck}" == "1" -BuildRequires: wget -%else Requires: wget -%endif Requires: python3-dbus Requires: gnupg # /usr/lib/udev/rules.d @@ -75,6 +71,11 @@ BuildRequires: python3-cups, cups # macros: %%{_tmpfilesdir}, %%{_udevrulesdir} BuildRequires: systemd +# if hpplugincheck is on, it will need wget as BuildRequire. USE ONLY FOR TESTING, NO COMMITS WITH HPPLUGINCHECK = 1 +%if "%{hpplugincheck}" == "1" +BuildRequires: wget +%endif + # hpijs was merged into main package in 3.15.7-2 Obsoletes: hpijs < 1:%{version}-%{release} Provides: hpijs = 1:%{version}-%{release} @@ -487,6 +488,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %postun libs -p /sbin/ldconfig %changelog +* Tue Nov 29 2016 Zdenek Dohnal - 3.16.11-3 +- fixing requires for hpplugincheck + * Mon Nov 28 2016 Zdenek Dohnal - 3.16.11-2 - adding spec switch hpplugincheck - for testing if new hp plugin is available