From 3dd5caa8600a8e9ccb3cd929ee91e0343fdfd0edc3d7f5182004a197d1a6b72a Mon Sep 17 00:00:00 2001
From: Johannes Weberhofer <jweberhofer@weberhofer.at>
Date: Fri, 13 Jan 2023 16:00:23 +0000
Subject: [PATCH] Accepting request 1058271 from home:weberho:qmailtoaster

- spamassassin-dqs version 1.4.0
  * Added support for SA 4.0.0+
  * Updated README.md

OBS-URL: https://build.opensuse.org/request/show/1058271
OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-Mail-SpamAssassin-Plugin-dqs?expand=0&rev=5
---
 perl-Mail-SpamAssassin-Plugin-dqs.changes |  9 ++++++++
 perl-Mail-SpamAssassin-Plugin-dqs.spec    | 26 ++++++++++++-----------
 spamassassin-dqs-1.4.0.tar.gz             |  3 +++
 v1.2.2.tar.gz                             |  3 ---
 4 files changed, 26 insertions(+), 15 deletions(-)
 create mode 100644 spamassassin-dqs-1.4.0.tar.gz
 delete mode 100644 v1.2.2.tar.gz

diff --git a/perl-Mail-SpamAssassin-Plugin-dqs.changes b/perl-Mail-SpamAssassin-Plugin-dqs.changes
index 20f91dc..bc8fd2b 100644
--- a/perl-Mail-SpamAssassin-Plugin-dqs.changes
+++ b/perl-Mail-SpamAssassin-Plugin-dqs.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Jan 13 13:35:49 UTC 2023 - Johannes Weberhofer <jweberhofer@weberhofer.at>
+
+- spamassassin-dqs version 1.4.0
+  * Added support for SA 4.0.0+
+
+- spamassassin-dqs version 1.3.0
+  * Updated README.md
+
 -------------------------------------------------------------------
 Wed Nov 16 10:28:49 UTC 2022 - Johannes Weberhofer <jweberhofer@weberhofer.at>
 
diff --git a/perl-Mail-SpamAssassin-Plugin-dqs.spec b/perl-Mail-SpamAssassin-Plugin-dqs.spec
index 8a84375..45ede15 100644
--- a/perl-Mail-SpamAssassin-Plugin-dqs.spec
+++ b/perl-Mail-SpamAssassin-Plugin-dqs.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package perl-Mail-SpamAssassin-Plugin-dqs
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,16 +17,16 @@
 
 
 Name:           perl-Mail-SpamAssassin-Plugin-dqs
-Version:        1.2.2
+Version:        1.4.0
 Release:        0
 Summary:        SpamAssassin plugin for Spamhaus Data Query Service (DQS)
 License:        Apache-2.0
 Group:          Development/Libraries/Perl
 URL:            https://github.com/spamhaus/spamassassin-dqs/tags
-Source0:        https://github.com/spamhaus/spamassassin-dqs/archive/refs/tags/v%{version}.tar.gz
+Source0:        https://github.com/spamhaus/spamassassin-dqs/archive/refs/tags/v%{version}.tar.gz#/spamassassin-dqs-%{version}.tar.gz
 Source1:        README-SUSE.md
-BuildRequires:  spamassassin >= 3.4.1
-Requires:       spamassassin >= 3.4.1
+BuildRequires:  spamassassin >= 4.0.0
+Requires:       spamassassin >= 4.0.0
 %{perl_requires}
 
 %description
@@ -45,25 +45,27 @@ registration procedure for a free DQS key is mandatory nevertheless.
 
 %prep
 %setup -q -n spamassassin-dqs-%{version}
-sed -e 's|<config_directory>|%{perl_vendorlib}/Mail/SpamAssassin/Plugin|' -i sh.pre
+sed -e 's|<config_directory>|%{perl_vendorlib}/Mail/SpamAssassin/Plugin|' -i "3.4.1+/sh.pre"
 cp %{SOURCE1} .
 
 %build
 
 %install
-install -D -p -m 0644 SH.pm %{buildroot}%{perl_vendorlib}/Mail/SpamAssassin/Plugin/SH.pm
+install -D -p -m 0644 "3.4.1+/SH.pm" %{buildroot}%{perl_vendorlib}/Mail/SpamAssassin/Plugin/SH.pm
 mkdir -p %{buildroot}/%{_bindir}
-install -m 0755 hbltest.sh %{buildroot}%{_bindir}/hbltest.sh
-for FILE in sh.pre sh.cf sh_hbl.cf sh_hbl_scores.cf sh_scores.cf ; do
-	install -D -p -m 0644 $FILE %{buildroot}%{_sysconfdir}/mail/spamassassin/$FILE
+install -m 0755 "3.4.1+/hbltest.sh" %{buildroot}%{_bindir}/hbltest.sh
+install -D -p -m 0644 "3.4.1+/sh.pre" "%{buildroot}%{_sysconfdir}/mail/spamassassin/sh.pre"
+for FILE in sh.cf sh_scores.cf sh_hbl.cf sh_hbl_scores.cf ; do
+	install -D -p -m 0644 "4.0.0+/$FILE" "%{buildroot}%{_sysconfdir}/mail/spamassassin/$FILE"
 done
 
 %check
 # setup config files
 mkdir tests
 cp %{_sysconfdir}/mail/spamassassin/* tests/
-for FILE in sh.pre sh.cf sh_scores.cf ; do
-	cp $FILE tests/
+cp "3.4.1+/sh.pre" tests/
+for FILE in sh.cf sh_scores.cf ; do
+	cp "4.0.0+/$FILE" tests/
 done
 sed -e 's|%{perl_vendorlib}|%{buildroot}%{perl_vendorlib}|' -i tests/sh.pre
 # execute the tests
diff --git a/spamassassin-dqs-1.4.0.tar.gz b/spamassassin-dqs-1.4.0.tar.gz
new file mode 100644
index 0000000..5bd3cd1
--- /dev/null
+++ b/spamassassin-dqs-1.4.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7a0e912d0eb4e24f3f07657e12d8fdd9785e1a36951deb19ddae3a020c2e0312
+size 25532
diff --git a/v1.2.2.tar.gz b/v1.2.2.tar.gz
deleted file mode 100644
index d8c4051..0000000
--- a/v1.2.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:209b33877122965ae2323884270a3d2f24b6838fabbeb87db150f4a132f6f561
-size 22304