From 2546c82bc44660a1b55fed7ae98b5233fa14e07b Mon Sep 17 00:00:00 2001
From: bbrucezhang <bbrucezhang@tencent.com>
Date: Thu, 11 Dec 2025 15:58:38 +0800
Subject: [PATCH 1/2] Update to 3.0.4.1

---
 duplicity.gpg  | Bin 2799 -> 0 bytes
 duplicity.spec |  33 +++++++++++++++++++++++----------
 sources        |   2 +-
 ver312.patch   |  11 -----------
 4 files changed, 24 insertions(+), 22 deletions(-)
 delete mode 100644 duplicity.gpg
 delete mode 100644 ver312.patch

diff --git a/duplicity.gpg b/duplicity.gpg
deleted file mode 100644
index 4e863f4c991094b43a31a24e1e80a4c28f041934..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2799
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

diff --git a/duplicity.spec b/duplicity.spec
index 6695772..fbf08c2 100644
--- a/duplicity.spec
+++ b/duplicity.spec
@@ -1,24 +1,23 @@
 %bcond_without check
 
 Name:           duplicity
-Version:        2.1.5
-Release:    2%{?dist}
+Version:        3.0.4.1
+Release:        1%{?dist}
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 
 License:        GPL-2.0-or-later AND MIT AND GPL-3.0-or-later
 URL:            https://duplicity.gitlab.io/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0:        https://gitlab.com/duplicity/duplicity/-/archive/rel.%{version}/duplicity-rel.%{version}.tar.bz2
 Patch0:         e6671cdf4ed8b21b4a8bd1973bd458f62792cd29.patch
-Patch1:         ver312.patch
 
 Requires:       ca-certificates
 Requires:       gnupg >= 1.0.6
 Requires:       python3dist(pexpect)
+Requires:  python3dist(fasteners)
 Requires:       rsync
 
 Recommends:     ncftp >= 3.1.9
 Recommends:     openssh-clients
-Recommends:     python3dist(PyDrive2)
 Recommends:     python3dist(boto3)
 Recommends:     python3dist(dropbox)
 Recommends:     python3dist(paramiko)
@@ -34,6 +33,7 @@ BuildRequires:  python3dist(setuptools-scm)
 BuildRequires:  python3dist(fasteners)
 BuildRequires:  python3dist(pexpect)
 BuildRequires:  python3dist(pytest)
+BuildRequires:  python3dist(pycodestyle)
 
 %description
 Duplicity incrementally backs up files and directory by encrypting
@@ -49,7 +49,16 @@ unix permissions, directories, symbolic links, fifos, device files,
 but not hard links.
 
 %prep
-%autosetup -p1
+%autosetup -p1 -n %{name}-rel.%{version}
+
+sed -i "s/==.*$//g" requirements.txt
+sed -i "s/<.*$//g" requirements.txt
+sed -i "s/>=.[^\s][^,][^\"]*//g" pyproject.toml
+sed -i /pipx/d pyproject.toml
+
+for i in atom boxsdk gdata-python3 gettext jottalib mediafire megatools pyrax pydrive2; do
+  sed -i /"$i"/d requirements.txt
+done
 
 %generate_buildrequires
 %pyproject_buildrequires
@@ -67,28 +76,32 @@ ln -sf %{_sysconfdir}/pki/tls/cert.pem \
 
 %find_lang %{name}
 
-rm -rf %{buildroot}%{_docdir}/duplicity-%{version}/AUTHORS
+rm -rf %{buildroot}%{_docdir}/duplicity-%{version}/AUTHORS.md
 rm -rf %{buildroot}%{_docdir}/duplicity-%{version}/CHANGELOG.md
 rm -rf %{buildroot}%{_docdir}/duplicity-%{version}/COPYING
 rm -rf %{buildroot}%{_docdir}/duplicity-%{version}/README.md
 rm -rf %{buildroot}%{_docdir}/duplicity-%{version}/README-LOG.md
+rm -rf %{buildroot}%{_docdir}/duplicity-%{version}/README-SNAP.md
 rm -rf %{buildroot}%{_docdir}/duplicity-%{version}/README-TESTING.md
 rm -rf %{buildroot}%{_docdir}/duplicity-%{version}/README-REPO.md
-rm -rf %{buildroot}%{_docdir}/duplicity-%{version}/CONTRIBUTING.md
 
 %if %{with check}
 %check
-%pytest
+%pytest -k 'not test_pylint and not test_black'
 %endif
 
 %files -f %{name}.lang -f %{pyproject_files}
-%doc CHANGELOG.md README.md CONTRIBUTING.md
+%doc AUTHORS.md CHANGELOG.md README.md
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}*
 %dir %{_sysconfdir}/%{name}
 %{_sysconfdir}/%{name}/cacert.pem
 
 %changelog
+* Thu Dec 11 2025 bbrucezhang <bbrucezhang@tencent.com> - 3.0.4.1-1
+- [Type] other
+- [DESC] Update to 3.0.4.1
+
 * Wed Jun 04 2025 bbrucezhang <bbrucezhang@tencent.com> - 2.1.5-2
 - Rebuilt for loongarch64
 
diff --git a/sources b/sources
index 6fa7b0b..0052c43 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (duplicity-2.1.5.tar.gz) = f560ca0ebb843238eb4d2c1d20632cb88ee1d1b20c223c48546a8b94a6ea5acb618c307f8384d651c6e570f561791eec5890a639314e6bd7296073569e0b699b
+SHA512 (duplicity-rel.3.0.4.1.tar.bz2) = 51dde6e06395ae0de86fbf1a80c325f568464d6b4c96f6e1756cfec3e7194f38b2efd888100fd00853af37199ca1798f614fd4388662da32a7593047016014a3
diff --git a/ver312.patch b/ver312.patch
deleted file mode 100644
index 10c8e6e..0000000
--- a/ver312.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- duplicity-2.1.5/setup.py~	2023-12-28 10:11:28.000000000 -0600
-+++ duplicity-2.1.5/setup.py	2024-01-18 16:34:05.962015996 -0600
-@@ -43,7 +43,7 @@
- 
- # check that we can function here
- min_version = (3, 8)
--max_version = (3, 11)
-+max_version = (3, 12)
- this_version = (sys.version_info.major, sys.version_info.minor)
- if not (min_version <= this_version <= max_version):
-     print(
-- 
Gitee


From 8dd1faad55778236de32719a01d76aaca93ae7f4 Mon Sep 17 00:00:00 2001
From: bbrucezhang <bbrucezhang@tencent.com>
Date: Thu, 18 Dec 2025 14:58:16 +0800
Subject: [PATCH 2/2] update requirements.txt

---
 duplicity.spec | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/duplicity.spec b/duplicity.spec
index fbf08c2..7ee877f 100644
--- a/duplicity.spec
+++ b/duplicity.spec
@@ -53,6 +53,12 @@ but not hard links.
 
 sed -i "s/==.*$//g" requirements.txt
 sed -i "s/<.*$//g" requirements.txt
+
+sed -i "/azure-storage-blob/d" requirements.txt
+sed -i "/b2sdk/d" requirements.txt
+sed -i "/google-auth-oauthlib/d" requirements.txt
+sed -i "/dropbox/d" requirements.txt
+
 sed -i "s/>=.[^\s][^,][^\"]*//g" pyproject.toml
 sed -i /pipx/d pyproject.toml
 
-- 
Gitee