1969767 - remove redundant files

Resolves: rhbz#1969767

.gitignore

@@ -102,3 +102,4 @@ hplip-3.10.6.tar.gz
 /hplip-3.20.9.tar.gz
 /hplip-3.20.11.tar.gz
 /hplip-3.21.2.tar.gz
+/hplip-3.21.2-repack.tar.gz

hplip-repack.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/bash
+
+
+VERSION=$1
+
+if [ "${VERSION:="*"}" == "*" ]
+then
+  echo "Define a version of hplip as an argument."
+  exit 1
+fi
+
+# extract the original tarball
+tar -xaf hplip-$VERSION.tar.gz || exit 1
+
+# remove unwanted files
+rm hplip-$VERSION/prnt/hpcups/ErnieFilter.{cpp,h} hplip-$VERSION/prnt/hpijs/ernieplatform.h || exit 1
+
+# compress into a new tarball
+tar -cjvf hplip-$VERSION-repack.tar.gz hplip-$VERSION || exit 1
+
+# upload a new source tarball
+#fedpkg new-sources hplip-$VERSION-repack.tar.gz || exit 1

hplip.spec

@@ -7,16 +7,26 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.21.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and MIT and BSD and IJG and Public Domain and GPLv2+ with exceptions and ISC
 
 Url: https://developers.hp.com/hp-linux-imaging-and-printing
-Source0: http://downloads.sourceforge.net/sourceforge/hplip/hplip-%{version}.tar.gz
+# Original source tarball
+# Source0: http://downloads.sourceforge.net/sourceforge/hplip/hplip-%%{version}.tar.gz
+#
+# Repacked source tarball without redundant files - always repack
+# the original tarball once a new version arrives by:
+#
+# ./hplip-repack.sh <version>
+#
+
+Source0: hplip-%{version}-repack.tar.gz
 Source1: hpcups-update-ppds.sh
 Source2: copy-deviceids.py
 Source3: %{name}.appdata.xml
 Source4: hp-laserjet_cp_1025nw.ppd.gz
 Source5: hp-laserjet_professional_p_1102w.ppd.gz
+
 Patch1: hplip-pstotiff-is-rubbish.patch
 Patch2: hplip-strstr-const.patch
 Patch3: hplip-ui-optional.patch
@@ -385,8 +395,6 @@ done
 # hplip appdata
 %patch26 -p1 -b .appdata
 
-rm prnt/hpcups/ErnieFilter.{cpp,h} prnt/hpijs/ernieplatform.h
-
 # hp-check shows 'CUPS incompatible or not running' even if CUPS is running (bug #1456467)
 %patch27 -p1 -b .check-cups
 
@@ -817,6 +825,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio
 
 %changelog
+* Wed Jun 09 2021 Zdenek Dohnal <zdohnal@redhat.com> - 3.21.2-3
+- 1969767 - remove redundant files
+
 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.21.2-2
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 

sources

@@ -1 +1 @@
-SHA512 (hplip-3.21.2.tar.gz) = 73ba37275cfe34a58b81c9656514e15da67c1a69af5471ad132a1538d324efe640879cb7e60c359915607e41b63e653e7ae757661e553235f6e83e378ab46474
+SHA512 (hplip-3.21.2-repack.tar.gz) = d39469676d518bee0c36a0fff0e74f140c685148217fcab07d71dc3809b2114e3cfea10968937d0844fb0518c74a1653b346d6e64320fa9b969e5b40a425422b