diff --git a/.gitignore b/.gitignore index 0386df9..c273606 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /academic-admin-0.5.1.tar.gz /hugo-academic-cli-0.8.1.tar.gz +/academic-file-converter-0.11.2.tar.gz diff --git a/academic-admin-0.11.2-dependencies.patch b/academic-admin-0.11.2-dependencies.patch new file mode 100644 index 0000000..c12a151 --- /dev/null +++ b/academic-admin-0.11.2-dependencies.patch @@ -0,0 +1,12 @@ +diff -u --recursive academic-file-converter-vanilla/pyproject.toml academic-file-converter/pyproject.toml +--- academic-file-converter-vanilla/pyproject.toml 2025-06-18 13:14:28.847064863 -0500 ++++ academic-file-converter/pyproject.toml 2025-06-18 15:35:16.337538039 -0500 +@@ -29,7 +29,7 @@ + [tool.poetry.dependencies] + python = ">=3.11.5" + bibtexparser = "~1.4" +-"ruamel.yaml" = "~0.17" ++"ruamel.yaml" = ">=0.17" + nbconvert = "^7.10.0" + pyyaml = "^6.0.1" + diff --git a/academic-admin-0.8.1-dependencies.patch b/academic-admin-0.8.1-dependencies.patch deleted file mode 100644 index 364c27e..0000000 --- a/academic-admin-0.8.1-dependencies.patch +++ /dev/null @@ -1,26 +0,0 @@ -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-23 18:01:32.585050210 -0500 -@@ -6,8 +6,8 @@ - [packages] - toml = "*" - requests = "*" --bibtexparser = "==1.1.0" --"ruamel.yaml" = "==0.16.10" -+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-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.16.10", "toml", "requests", "bibtexparser>=1.1.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 33633f2..262a4ea 100644 --- a/academic-admin.spec +++ b/academic-admin.spec @@ -1,41 +1,40 @@ -%global srcname hugo-academic-cli +%global srcname academic-file-converter Name: academic-admin -Version: 0.8.1 +Version: 0.11.2 Release: %autorelease Summary: Admin tool for the Academic website builder License: MIT -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 +URL: https://github.com/BuildLore/%{srcname} +Source: https://github.com/BuildLore/%{srcname}/archive/%{version}/%{srcname}-%{version}.tar.gz +Patch0: academic-admin-0.11.2-dependencies.patch BuildArch: noarch BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-toml -BuildRequires: python3-requests -BuildRequires: python3-bibtexparser -Provides: %srcname +%global _description %{expand: +An admin tool for the Academic website builder.} -%description -An admin tool for the Academic website builder. +%description %_description %prep -%autosetup -n %{srcname}-%{version} -p1 +%autosetup -p1 -n %{srcname}-%{version} + +%generate_buildrequires +%pyproject_buildrequires %build -%py3_build +%pyproject_wheel %install -%py3_install +%pyproject_install %files -n academic-admin %doc README.md %license LICENSE.md -%{python3_sitelib}/academic-%{version}-py%{python3_version}.egg-info/ %{python3_sitelib}/academic/ +%{python3_sitelib}/academic-%{version}.dist-info/ %{_bindir}/* %changelog diff --git a/sources b/sources index 1b23095..fc32e52 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hugo-academic-cli-0.8.1.tar.gz) = 3900072e129e906d5b1bb619f78f9194fe5f4b60cc802a3d3a5b64f597b93b9ffb6c1fb8e596f1dec23f1d22025875af044ae5b06c287abb80a7c64f3e12d056 +SHA512 (academic-file-converter-0.11.2.tar.gz) = 913451c99a823cfb63e1490fc1067cfaf8c4dfd66fb61d42a123e6a691321f34d698e6f03cf590cc952e475da19422b16645a60abd52280c1e6c071a026b1a8f