diff --git a/packaging/rocky-el9/main.spec b/packaging/rocky-el9/main.spec.j2 similarity index 97% rename from packaging/rocky-el9/main.spec rename to packaging/rocky-el9/main.spec.j2 index 322759c..7fbf6ad 100644 --- a/packaging/rocky-el9/main.spec +++ b/packaging/rocky-el9/main.spec.j2 @@ -1,15 +1,15 @@ %global debug_package %{nil} %define _build_id_links none -Name: ::package_name:: -Version: ::package_version:: -Release: ::package_build_version::%{?dist} -Summary: ::package_description_short:: -License: ::package_licence:: -URL: ::package_url:: +Name: {{ name }} +Version: {{ version }} +Release: {{ build_number }}%{?dist} +Summary: {{ description }} +License: {{ license }} +URL: {{ git_url }} Source0: %{name}-%{version}.tar.gz -BuildArch: ::package_architecture_el:: -Requires: ::package_dependencies_el:: +BuildArch: {{ architecture.rocky }} +Requires: {{ dependencies.rocky_common | join(',') }} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -17,8 +17,8 @@ Provides: %{name} = %{version}-%{release} Conflicts: %{name}-1.7 %description -::package_title:: -::package_description_long:: +{{ title }} +{{ description }} %prep %setup -q @@ -26,7 +26,7 @@ Conflicts: %{name}-1.7 %build %install -make DESTDIR=%{buildroot} TOOLS_VERSION="%{version}-::package_build_version::" install +make DESTDIR=%{buildroot} TOOLS_VERSION="%{version}-{{ version }}" install %postun if [ $1 == 0 ];then diff --git a/packaging/ubuntu-jammy/control b/packaging/ubuntu-jammy/control deleted file mode 100644 index bda07c7..0000000 --- a/packaging/ubuntu-jammy/control +++ /dev/null @@ -1,12 +0,0 @@ -Source: ::package_name:: -Section: ::package_category:: -Priority: ::package_priority:: -Maintainer: ::package_author:: -Build-Depends: debhelper-compat (= 13) -Standards-Version: 4.4.1 -Homepage: ::package_url:: - -Package: ::package_name:: -Architecture: ::package_architecture_deb:: -Depends: ::package_dependencies_deb:: -Description: ::package_description_short:: diff --git a/packaging/ubuntu-jammy/control.j2 b/packaging/ubuntu-jammy/control.j2 new file mode 100644 index 0000000..15cb7a2 --- /dev/null +++ b/packaging/ubuntu-jammy/control.j2 @@ -0,0 +1,13 @@ +Source: "{{ name }}"" +Section: utils +Priority: optional +Maintainer: "{{ author }}" +Build-Depends: debhelper-compat (= 13) +Standards-Version: 4.4.1 +Homepage: "{{ git_url }}" +Vcs-Git: "{{ git_url }}" + +Package: "{{ name }}" +Architecture: "{{ architecture.ubuntu }}" +Depends: "{{ dependancies.ubuntu_common | join{',') }}" +Description: "{{ description }}"" diff --git a/packaging/ubuntu-jammy/copyright b/packaging/ubuntu-jammy/copyright index de01342..3fb3cb9 100644 --- a/packaging/ubuntu-jammy/copyright +++ b/packaging/ubuntu-jammy/copyright @@ -1,10 +1,10 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: ::package_name:: -Upstream-Contact: ::package_author:: -Source: ::package_url:: +Upstream-Name: "{{ name }}" +Upstream-Contact: "{{ author }}" +Source: "{{ git_url }}" Files: * -Copyright: 2021 Mark Hooper +Copyright: 2024 45Drives Team License: GPL-3.0+ License: GPL-3.0+