From 9886bfa2e0d7b261857cc61a36477b3f284e6ee8 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 4 Aug 2017 14:28:32 +0200 Subject: [PATCH 1/2] adding hplip-rebase.sh script for testing if plugin is available - removing its testing from spec --- hplip-rebase.sh | 24 ++++++++++++++++++++++++ hplip.spec | 29 +++++------------------------ 2 files changed, 29 insertions(+), 24 deletions(-) create mode 100755 hplip-rebase.sh diff --git a/hplip-rebase.sh b/hplip-rebase.sh new file mode 100755 index 0000000..e3bd930 --- /dev/null +++ b/hplip-rebase.sh @@ -0,0 +1,24 @@ +#!/bin/sh +if [ "$1" == "-h" -o "$1" == "--help" ] +then + echo "Usage: ./hplip-rebase.sh X.Y.Z" + exit 0 +fi + +wget -O hplip-plugin.run http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-$1-plugin.run + +if [ $? -gt 0 ] +then + echo "Error while downloading plugin. Check version passed by argument or internet connection. For usage run script with -h or --help argument." + rm hplip-plugin.run + exit 1 +fi +rm hplip-plugin.run + +fedpkg mockbuild +if [ $? -gt 0 ] +then + echo "Error during mockbuild." + exit 1 +fi +exit 0 diff --git a/hplip.spec b/hplip.spec index cb9df06..cdc9b7e 100644 --- a/hplip.spec +++ b/hplip.spec @@ -4,16 +4,10 @@ %filter_setup } -# 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 - Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 3.17.4 -Release: 2%{?dist} +Version: 3.17.6 +Release: 1%{?dist} License: GPLv2+ and MIT and BSD Url: http://hplip.sourceforge.net/ @@ -71,11 +65,6 @@ 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} @@ -338,17 +327,6 @@ rm -f %{buildroot}%{_unitdir}/hplip-printer@.service # window), so don't ship the launcher yet. rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop -%check -%if "%{hpplugincheck}" == "1" - wget -O hp-plugin.run %{urlplugin} - %if "$?" == "0" - echo "New plugin is not available yet. Rerun build later." - rm hp-plugin.run - exit 1 - %endif - rm hp-plugin.run -%endif - %files %doc COPYING doc/* # ex-hpijs @@ -487,6 +465,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %postun libs -p /sbin/ldconfig %changelog +* Fri Aug 04 2017 Zdenek Dohnal - 3.17.6-1 +- adding hplip-rebase.sh script for testing if plugin is available - removing its testing from spec + * Mon May 29 2017 Zdenek Dohnal - 3.17.4-2 - 1456467 - hp-check shows 'CUPS incompatible or not running' even if CUPS is running From fd90e76e64c5946425da905b4d0f4708e736fec7 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 4 Aug 2017 14:42:46 +0200 Subject: [PATCH 2/2] rebase to 3.17.6 --- .gitignore | 1 + hplip-3.17.4.tar.gz.asc | 7 ------- hplip-3.17.6.tar.gz.asc | 7 +++++++ hplip-rebase.sh | 1 + hplip.spec | 1 + sources | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) delete mode 100644 hplip-3.17.4.tar.gz.asc create mode 100644 hplip-3.17.6.tar.gz.asc diff --git a/.gitignore b/.gitignore index fc3293f..8152688 100644 --- a/.gitignore +++ b/.gitignore @@ -81,3 +81,4 @@ hplip-3.10.6.tar.gz /hplip-3.16.10.tar.gz /hplip-3.16.11.tar.gz /hplip-3.17.4.tar.gz +/hplip-3.17.6.tar.gz diff --git a/hplip-3.17.4.tar.gz.asc b/hplip-3.17.4.tar.gz.asc deleted file mode 100644 index 8e26b97..0000000 --- a/hplip-3.17.4.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iEYEABECAAYFAljty0kACgkQc9dwzaWQR7mRAwCcCeOnZPH22yBMH8TKVCAk5vRC -tmQAn3uTUnklynBYgqC18ZuHQYhMw1+h -=UQnM ------END PGP SIGNATURE----- diff --git a/hplip-3.17.6.tar.gz.asc b/hplip-3.17.6.tar.gz.asc new file mode 100644 index 0000000..b640ff7 --- /dev/null +++ b/hplip-3.17.6.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iEYEABECAAYFAlkw9OYACgkQc9dwzaWQR7mVOQCgxM3Lh1itLq5ST456mgq4RosT +brAAoJtZIVXXp+A/HQV0uyG7ljJ4SYKJ +=32fJ +-----END PGP SIGNATURE----- diff --git a/hplip-rebase.sh b/hplip-rebase.sh index e3bd930..f33edca 100755 --- a/hplip-rebase.sh +++ b/hplip-rebase.sh @@ -2,6 +2,7 @@ if [ "$1" == "-h" -o "$1" == "--help" ] then echo "Usage: ./hplip-rebase.sh X.Y.Z" + echo " X.Y.Z - new hplip version" exit 0 fi diff --git a/hplip.spec b/hplip.spec index cdc9b7e..454b307 100644 --- a/hplip.spec +++ b/hplip.spec @@ -466,6 +466,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %changelog * Fri Aug 04 2017 Zdenek Dohnal - 3.17.6-1 +- rebase to 3.17.6 - adding hplip-rebase.sh script for testing if plugin is available - removing its testing from spec * Mon May 29 2017 Zdenek Dohnal - 3.17.4-2 diff --git a/sources b/sources index 6be314f..0dfb6f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hplip-3.17.4.tar.gz) = ea295502df5b6c44839a7c03a725dc7475d256994eac2a7950058a68c805ca4942611df2688384c8acbc6551009841bb4623e7a3e7c8c0b16f44a2215a7316e6 +SHA512 (hplip-3.17.6.tar.gz) = 370fa0e07f4f5b4dc4a6f52b02271102894da98bc902912ff1770a9e5029d486227f4170ff90a063c686d23e8bd075961073ecc59961419a226a850db9e71738