rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

fixing requires for hpplugincheck

Browse Source
This commit is contained in:
Zdenek Dohnal 2016-11-29 10:28:23 +01:00
parent 95f6d6f12c
commit 1229d6af4b
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hplip.spec
View File

@ -4,8 +4,8 @@
%filter_setup %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 # 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,
# when you rebase package to new version (lately HP ships new plugins a few days after new release, which makes hp-plugin non-functional # 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. # during this time). Any other time it should be set to 0.
%define hpplugincheck 0 %define hpplugincheck 0
%define urlplugin http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/%{name}-%{version}-plugin.run %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 Summary: HP Linux Imaging and Printing Project
Name: hplip Name: hplip
Version: 3.16.11 Version: 3.16.11
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2+ and MIT and BSD License: GPLv2+ and MIT and BSD
Url: http://hplip.sourceforge.net/ Url: http://hplip.sourceforge.net/
@ -48,11 +48,7 @@ Patch25: hplip-badwhitespace.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: python3-pillow Requires: python3-pillow
Requires: cups Requires: cups
%if "%{hpplugincheck}" == "1"
BuildRequires: wget
%else
Requires: wget Requires: wget
%endif
Requires: python3-dbus Requires: python3-dbus
Requires: gnupg Requires: gnupg
# /usr/lib/udev/rules.d # /usr/lib/udev/rules.d
@ -75,6 +71,11 @@ BuildRequires: python3-cups, cups
# macros: %%{_tmpfilesdir}, %%{_udevrulesdir} # macros: %%{_tmpfilesdir}, %%{_udevrulesdir}
BuildRequires: systemd 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 # hpijs was merged into main package in 3.15.7-2
Obsoletes: hpijs < 1:%{version}-%{release} Obsoletes: hpijs < 1:%{version}-%{release}
Provides: 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 %postun libs -p /sbin/ldconfig
%changelog %changelog
* Tue Nov 29 2016 Zdenek Dohnal <zdohnal@redhat.com> - 3.16.11-3
- fixing requires for hpplugincheck
* Mon Nov 28 2016 Zdenek Dohnal <zdohnal@redhat.com> - 3.16.11-2 * Mon Nov 28 2016 Zdenek Dohnal <zdohnal@redhat.com> - 3.16.11-2
- adding spec switch hpplugincheck - for testing if new hp plugin is available - adding spec switch hpplugincheck - for testing if new hp plugin is available