From 0484bcb9efa266f1c9a939e9e46dd785f2777838 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Sun, 14 May 2023 11:07:31 -0500 Subject: [PATCH 1/3] Update to 0.8.1 and revise to reflect upstream name change Upstream moved its repository to https://github.com/wowchemy/hugo-academic-cli and renamed the source file from academic-admin to hugo-academic-cli. This package revision reflects that, and it adds "Provides: hugo-academic-cli". Signed-off-by: W. Michael Petullo --- .gitignore | 1 + academic-admin-0.5.1-shebang-fix.patch | 10 ---------- academic-admin-0.8.1-dependencies.patch | 26 +++++++++++++++++++++++++ academic-admin.spec | 16 ++++++++------- sources | 2 +- 5 files changed, 37 insertions(+), 18 deletions(-) delete mode 100644 academic-admin-0.5.1-shebang-fix.patch create mode 100644 academic-admin-0.8.1-dependencies.patch diff --git a/.gitignore b/.gitignore index b75142b..0386df9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /academic-admin-0.5.1.tar.gz +/hugo-academic-cli-0.8.1.tar.gz diff --git a/academic-admin-0.5.1-shebang-fix.patch b/academic-admin-0.5.1-shebang-fix.patch deleted file mode 100644 index ce0d232..0000000 --- a/academic-admin-0.5.1-shebang-fix.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/academic/cli.py b/academic/cli.py -index 03f5fce..a64bfb8 100755 ---- a/academic/cli.py -+++ b/academic/cli.py -@@ -1,5 +1,3 @@ --#!/usr/bin/env python3 -- - import subprocess - import sys - import os diff --git a/academic-admin-0.8.1-dependencies.patch b/academic-admin-0.8.1-dependencies.patch new file mode 100644 index 0000000..3ec50dc --- /dev/null +++ b/academic-admin-0.8.1-dependencies.patch @@ -0,0 +1,26 @@ +diff -u --recursive hugo-academic-cli-0.8.1-vanilla/Pipfile hugo-academic-cli-0.8.1/Pipfile +--- hugo-academic-cli-0.8.1-vanilla/Pipfile 2021-11-29 14:56:51.000000000 -0600 ++++ hugo-academic-cli-0.8.1/Pipfile 2023-05-14 10:43:04.917011451 -0500 +@@ -6,8 +6,8 @@ + [packages] + toml = "*" + requests = "*" +-bibtexparser = "==1.1.0" +-"ruamel.yaml" = "==0.16.10" ++bibtexparser = "==1.2.0" ++"ruamel.yaml" = "==0.17.22" + + [dev-packages] + pytest = "*" +diff -u --recursive hugo-academic-cli-0.8.1-vanilla/setup.py hugo-academic-cli-0.8.1/setup.py +--- hugo-academic-cli-0.8.1-vanilla/setup.py 2021-11-29 14:56:51.000000000 -0600 ++++ hugo-academic-cli-0.8.1/setup.py 2023-05-14 10:43:30.580777109 -0500 +@@ -13,7 +13,7 @@ + + + version = get_version("academic") +-requirements = ["ruamel.yaml==0.16.10", "toml", "requests", "bibtexparser==1.1.0"] ++requirements = ["ruamel.yaml==0.17.22", "toml", "requests", "bibtexparser==1.2.0"] + + if sys.argv[-1] == "publish": + if os.system("pip3 freeze --all | grep wheel"): diff --git a/academic-admin.spec b/academic-admin.spec index b79568f..33633f2 100644 --- a/academic-admin.spec +++ b/academic-admin.spec @@ -1,14 +1,14 @@ -%global srcname academic-admin +%global srcname hugo-academic-cli -Name: %{srcname} -Version: 0.5.1 +Name: academic-admin +Version: 0.8.1 Release: %autorelease Summary: Admin tool for the Academic website builder License: MIT -URL: https://github.com/sourcethemes/%{srcname} -Source0: https://github.com/sourcethemes/%{srcname}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: academic-admin-0.5.1-shebang-fix.patch +URL: https://github.com/wowchemy/%{srcname} +Source0: https://github.com/wowchemy/%{srcname}/archive/%{version}/%{srcname}-%{version}.tar.gz +Patch0: academic-admin-0.8.1-dependencies.patch BuildArch: noarch BuildRequires: python3-devel @@ -17,6 +17,8 @@ BuildRequires: python3-toml BuildRequires: python3-requests BuildRequires: python3-bibtexparser +Provides: %srcname + %description An admin tool for the Academic website builder. @@ -29,7 +31,7 @@ An admin tool for the Academic website builder. %install %py3_install -%files -n %{srcname} +%files -n academic-admin %doc README.md %license LICENSE.md %{python3_sitelib}/academic-%{version}-py%{python3_version}.egg-info/ diff --git a/sources b/sources index 6f8cdc5..1b23095 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (academic-admin-0.5.1.tar.gz) = 26a84183eaa8dcd9107db0c5d5b70da52cd2478d0b97aee1e0a9f90eb4b6cb3e36166fb43f2db26fd4105eb11f3a38b1a52251c971d25d19b3c38676f9ae50be +SHA512 (hugo-academic-cli-0.8.1.tar.gz) = 3900072e129e906d5b1bb619f78f9194fe5f4b60cc802a3d3a5b64f597b93b9ffb6c1fb8e596f1dec23f1d22025875af044ae5b06c287abb80a7c64f3e12d056 From f515b5bf8ff821fb35b22dc7092c3c1ed8b1ea28 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Thu, 18 May 2023 10:21:27 -0500 Subject: [PATCH 2/3] Update patch to make use of python-bibtexparser-1.4.0 Signed-off-by: W. Michael Petullo --- academic-admin-0.8.1-dependencies.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/academic-admin-0.8.1-dependencies.patch b/academic-admin-0.8.1-dependencies.patch index 3ec50dc..48108a2 100644 --- a/academic-admin-0.8.1-dependencies.patch +++ b/academic-admin-0.8.1-dependencies.patch @@ -7,7 +7,7 @@ diff -u --recursive hugo-academic-cli-0.8.1-vanilla/Pipfile hugo-academic-cli-0. requests = "*" -bibtexparser = "==1.1.0" -"ruamel.yaml" = "==0.16.10" -+bibtexparser = "==1.2.0" ++bibtexparser = "==1.4.0" +"ruamel.yaml" = "==0.17.22" [dev-packages] @@ -20,7 +20,7 @@ diff -u --recursive hugo-academic-cli-0.8.1-vanilla/setup.py hugo-academic-cli-0 version = get_version("academic") -requirements = ["ruamel.yaml==0.16.10", "toml", "requests", "bibtexparser==1.1.0"] -+requirements = ["ruamel.yaml==0.17.22", "toml", "requests", "bibtexparser==1.2.0"] ++requirements = ["ruamel.yaml==0.17.22", "toml", "requests", "bibtexparser==1.4.0"] if sys.argv[-1] == "publish": if os.system("pip3 freeze --all | grep wheel"): From 495273f141cd8314e5d4f37b08dbd87476b427d8 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Tue, 23 May 2023 18:04:45 -0500 Subject: [PATCH 3/3] Revise academic-admin-0.8.1-dependencies.patch to use more liberal dependencies Signed-off-by: W. Michael Petullo --- academic-admin-0.8.1-dependencies.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/academic-admin-0.8.1-dependencies.patch b/academic-admin-0.8.1-dependencies.patch index 48108a2..364c27e 100644 --- a/academic-admin-0.8.1-dependencies.patch +++ b/academic-admin-0.8.1-dependencies.patch @@ -1,26 +1,26 @@ diff -u --recursive hugo-academic-cli-0.8.1-vanilla/Pipfile hugo-academic-cli-0.8.1/Pipfile --- hugo-academic-cli-0.8.1-vanilla/Pipfile 2021-11-29 14:56:51.000000000 -0600 -+++ hugo-academic-cli-0.8.1/Pipfile 2023-05-14 10:43:04.917011451 -0500 ++++ hugo-academic-cli-0.8.1/Pipfile 2023-05-23 18:01:32.585050210 -0500 @@ -6,8 +6,8 @@ [packages] toml = "*" requests = "*" -bibtexparser = "==1.1.0" -"ruamel.yaml" = "==0.16.10" -+bibtexparser = "==1.4.0" -+"ruamel.yaml" = "==0.17.22" ++bibtexparser = ">=1.1.0" ++"ruamel.yaml" = ">=0.16.10" [dev-packages] pytest = "*" diff -u --recursive hugo-academic-cli-0.8.1-vanilla/setup.py hugo-academic-cli-0.8.1/setup.py --- hugo-academic-cli-0.8.1-vanilla/setup.py 2021-11-29 14:56:51.000000000 -0600 -+++ hugo-academic-cli-0.8.1/setup.py 2023-05-14 10:43:30.580777109 -0500 ++++ hugo-academic-cli-0.8.1/setup.py 2023-05-23 18:01:01.554343034 -0500 @@ -13,7 +13,7 @@ version = get_version("academic") -requirements = ["ruamel.yaml==0.16.10", "toml", "requests", "bibtexparser==1.1.0"] -+requirements = ["ruamel.yaml==0.17.22", "toml", "requests", "bibtexparser==1.4.0"] ++requirements = ["ruamel.yaml>=0.16.10", "toml", "requests", "bibtexparser>=1.1.0"] if sys.argv[-1] == "publish": if os.system("pip3 freeze --all | grep wheel"):