From 0adeb7e620b88ec9868313062a3c9003ac8416b3 Mon Sep 17 00:00:00 2001 From: nmontero Date: Mon, 17 Mar 2025 13:36:53 +0100 Subject: [PATCH 1/9] New package --- .gitignore | 1 + 59-adwaita-mono-fonts.conf | 16 +++++++++ 59-adwaita-sans-fonts.conf | 16 +++++++++ README.md | 3 -- adwaita-fonts.spec | 70 ++++++++++++++++++++++++++++++++++++++ sources | 1 + 6 files changed, 104 insertions(+), 3 deletions(-) create mode 100644 .gitignore create mode 100644 59-adwaita-mono-fonts.conf create mode 100644 59-adwaita-sans-fonts.conf delete mode 100644 README.md create mode 100644 adwaita-fonts.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..da287b9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/adwaita-fonts-48.2.tar.xz diff --git a/59-adwaita-mono-fonts.conf b/59-adwaita-mono-fonts.conf new file mode 100644 index 0000000..502181d --- /dev/null +++ b/59-adwaita-mono-fonts.conf @@ -0,0 +1,16 @@ + + + + + monospace + + Adwaita Mono + + + + Adwaita Mono + + monospace + + + \ No newline at end of file diff --git a/59-adwaita-sans-fonts.conf b/59-adwaita-sans-fonts.conf new file mode 100644 index 0000000..b8c991b --- /dev/null +++ b/59-adwaita-sans-fonts.conf @@ -0,0 +1,16 @@ + + + + + sans-serif + + Adwaita Sans + + + + Adwaita Sans + + sans-serif + + + \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index 8a669b2..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# adwaita-fonts - -The adwaita-fonts package diff --git a/adwaita-fonts.spec b/adwaita-fonts.spec new file mode 100644 index 0000000..1f07a8b --- /dev/null +++ b/adwaita-fonts.spec @@ -0,0 +1,70 @@ +%global tarball_version %%(echo %{version} | tr '~' '.') + +BuildArch: noarch +BuildRequires: meson +BuildRequires: fonts-rpm-macros +BuildRequires: fonts-rpm-templates + +Version: 48.2 +Release: 2%{?dist} +License: OFL-1.1 +URL: https://gitlab.gnome.org/GNOME/adwaita-fonts.git + +%global foundry adwaita-fonts +%global fontdocs README.md + +%global common_description %{expand: +Adwaita Fonts contains Adwaita Sans, a variation of Inter, +and Adwaita Mono, Iosevka customized to match Inter. +} + +%global fontfamily1 adwaita-sans-fonts +%global fontsummary1 Adwaita Sans font family +%global fonts1 sans/*.ttf +%global fontlicenses1 sans/LICENSE.md +%global fontconfs1 %{SOURCE1} +%global fontdescription1 %{expand: +%{common_description} +Adwaita Sans is a variation of the Inter font family. +} + +%global fontfamily2 adwaita-mono-fonts +%global fontsummary2 Adwaita Mono font family +%global fonts2 mono/*.ttf +%global fontlicenses2 mono/LICENSE.md +%global fontconfs2 %{SOURCE2} +%global fontdescription2 %{expand: +%{common_description} +Adwaita Mono is a customized version of the Iosevka font, designed to match Inter. +} + + +Source0: https://download.gnome.org/sources/adwaita-fonts/48/adwaita-fonts-%{tarball_version}.tar.xz +Source1: 59-adwaita-sans-fonts.conf +Source2: 59-adwaita-mono-fonts.conf + +Name: adwaita-fonts +Summary: Adwaita fonts +%description +%wordwrap -v common_description + +%fontpkg -a +%fontmetapkg + +%prep +%autosetup -n %{name}-%{tarball_version} + +%build +%fontbuild -a + +%install +%fontinstall -a + +%check +%fontcheck -a + +%fontfiles -a + +%changelog +* Fri Mar 14 2025 Nieves Montero - 48.2-2 +- New package diff --git a/sources b/sources new file mode 100644 index 0000000..6287590 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (adwaita-fonts-48.2.tar.xz) = 598f763b62cf3fda7585e30622acf82f4150cec137fd13940ab5a38255d53d06de1ccccd4168f18c2b09611f9a33303c92c74be0e5677378873ea8d32329ba93 From 15087e979e4e19d6efa57aeea6aac0ea6b6350e5 Mon Sep 17 00:00:00 2001 From: nmontero Date: Mon, 17 Mar 2025 13:36:53 +0100 Subject: [PATCH 2/9] New package --- .gitignore | 1 + 59-adwaita-mono-fonts.conf | 16 +++++++++ 59-adwaita-sans-fonts.conf | 16 +++++++++ README.md | 3 -- adwaita-fonts.spec | 70 ++++++++++++++++++++++++++++++++++++++ sources | 1 + 6 files changed, 104 insertions(+), 3 deletions(-) create mode 100644 .gitignore create mode 100644 59-adwaita-mono-fonts.conf create mode 100644 59-adwaita-sans-fonts.conf delete mode 100644 README.md create mode 100644 adwaita-fonts.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..da287b9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/adwaita-fonts-48.2.tar.xz diff --git a/59-adwaita-mono-fonts.conf b/59-adwaita-mono-fonts.conf new file mode 100644 index 0000000..502181d --- /dev/null +++ b/59-adwaita-mono-fonts.conf @@ -0,0 +1,16 @@ + + + + + monospace + + Adwaita Mono + + + + Adwaita Mono + + monospace + + + \ No newline at end of file diff --git a/59-adwaita-sans-fonts.conf b/59-adwaita-sans-fonts.conf new file mode 100644 index 0000000..b8c991b --- /dev/null +++ b/59-adwaita-sans-fonts.conf @@ -0,0 +1,16 @@ + + + + + sans-serif + + Adwaita Sans + + + + Adwaita Sans + + sans-serif + + + \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index 8a669b2..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# adwaita-fonts - -The adwaita-fonts package diff --git a/adwaita-fonts.spec b/adwaita-fonts.spec new file mode 100644 index 0000000..1f07a8b --- /dev/null +++ b/adwaita-fonts.spec @@ -0,0 +1,70 @@ +%global tarball_version %%(echo %{version} | tr '~' '.') + +BuildArch: noarch +BuildRequires: meson +BuildRequires: fonts-rpm-macros +BuildRequires: fonts-rpm-templates + +Version: 48.2 +Release: 2%{?dist} +License: OFL-1.1 +URL: https://gitlab.gnome.org/GNOME/adwaita-fonts.git + +%global foundry adwaita-fonts +%global fontdocs README.md + +%global common_description %{expand: +Adwaita Fonts contains Adwaita Sans, a variation of Inter, +and Adwaita Mono, Iosevka customized to match Inter. +} + +%global fontfamily1 adwaita-sans-fonts +%global fontsummary1 Adwaita Sans font family +%global fonts1 sans/*.ttf +%global fontlicenses1 sans/LICENSE.md +%global fontconfs1 %{SOURCE1} +%global fontdescription1 %{expand: +%{common_description} +Adwaita Sans is a variation of the Inter font family. +} + +%global fontfamily2 adwaita-mono-fonts +%global fontsummary2 Adwaita Mono font family +%global fonts2 mono/*.ttf +%global fontlicenses2 mono/LICENSE.md +%global fontconfs2 %{SOURCE2} +%global fontdescription2 %{expand: +%{common_description} +Adwaita Mono is a customized version of the Iosevka font, designed to match Inter. +} + + +Source0: https://download.gnome.org/sources/adwaita-fonts/48/adwaita-fonts-%{tarball_version}.tar.xz +Source1: 59-adwaita-sans-fonts.conf +Source2: 59-adwaita-mono-fonts.conf + +Name: adwaita-fonts +Summary: Adwaita fonts +%description +%wordwrap -v common_description + +%fontpkg -a +%fontmetapkg + +%prep +%autosetup -n %{name}-%{tarball_version} + +%build +%fontbuild -a + +%install +%fontinstall -a + +%check +%fontcheck -a + +%fontfiles -a + +%changelog +* Fri Mar 14 2025 Nieves Montero - 48.2-2 +- New package diff --git a/sources b/sources new file mode 100644 index 0000000..6287590 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (adwaita-fonts-48.2.tar.xz) = 598f763b62cf3fda7585e30622acf82f4150cec137fd13940ab5a38255d53d06de1ccccd4168f18c2b09611f9a33303c92c74be0e5677378873ea8d32329ba93 From e9f0d766b3b87294d5d1f14dc1af19d452cf4a44 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 9 Jul 2025 13:28:53 +0200 Subject: [PATCH 3/9] Update to 49.0 --- .gitignore | 3 ++- adwaita-fonts.spec | 15 +++++++-------- sources | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index da287b9..5ed2f69 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -/adwaita-fonts-48.2.tar.xz +/adwaita-fonts-*.tar.xz +/adwaita-fonts-*-build diff --git a/adwaita-fonts.spec b/adwaita-fonts.spec index 1f07a8b..eef8d2a 100644 --- a/adwaita-fonts.spec +++ b/adwaita-fonts.spec @@ -5,8 +5,8 @@ BuildRequires: meson BuildRequires: fonts-rpm-macros BuildRequires: fonts-rpm-templates -Version: 48.2 -Release: 2%{?dist} +Version: 49.0 +Release: 1%{?dist} License: OFL-1.1 URL: https://gitlab.gnome.org/GNOME/adwaita-fonts.git @@ -21,7 +21,7 @@ and Adwaita Mono, Iosevka customized to match Inter. %global fontfamily1 adwaita-sans-fonts %global fontsummary1 Adwaita Sans font family %global fonts1 sans/*.ttf -%global fontlicenses1 sans/LICENSE.md +%global fontlicenses1 LICENSE %global fontconfs1 %{SOURCE1} %global fontdescription1 %{expand: %{common_description} @@ -31,7 +31,7 @@ Adwaita Sans is a variation of the Inter font family. %global fontfamily2 adwaita-mono-fonts %global fontsummary2 Adwaita Mono font family %global fonts2 mono/*.ttf -%global fontlicenses2 mono/LICENSE.md +%global fontlicenses2 LICENSE %global fontconfs2 %{SOURCE2} %global fontdescription2 %{expand: %{common_description} @@ -39,11 +39,11 @@ Adwaita Mono is a customized version of the Iosevka font, designed to match Inte } -Source0: https://download.gnome.org/sources/adwaita-fonts/48/adwaita-fonts-%{tarball_version}.tar.xz +Source0: https://download.gnome.org/sources/adwaita-fonts/49/adwaita-fonts-%{tarball_version}.tar.xz Source1: 59-adwaita-sans-fonts.conf Source2: 59-adwaita-mono-fonts.conf -Name: adwaita-fonts +Name: adwaita-fonts Summary: Adwaita fonts %description %wordwrap -v common_description @@ -66,5 +66,4 @@ Summary: Adwaita fonts %fontfiles -a %changelog -* Fri Mar 14 2025 Nieves Montero - 48.2-2 -- New package +%autochangelog diff --git a/sources b/sources index 6287590..3f764ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (adwaita-fonts-48.2.tar.xz) = 598f763b62cf3fda7585e30622acf82f4150cec137fd13940ab5a38255d53d06de1ccccd4168f18c2b09611f9a33303c92c74be0e5677378873ea8d32329ba93 +SHA512 (adwaita-fonts-49.0.tar.xz) = 38c991817ad0e737bfa901d62d6366f132a77cf452d210bbf33691dc3c6c396a7ec50f75b6655bf2d16a05bc3c3d0b648057dd58b9cc65ab93234661bd547fef From 9870fc694dd5cac4a449985edf6378481e63be9b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:47:55 +0000 Subject: [PATCH 4/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- adwaita-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adwaita-fonts.spec b/adwaita-fonts.spec index eef8d2a..9cf38ce 100644 --- a/adwaita-fonts.spec +++ b/adwaita-fonts.spec @@ -6,7 +6,7 @@ BuildRequires: fonts-rpm-macros BuildRequires: fonts-rpm-templates Version: 49.0 -Release: 1%{?dist} +Release: 2%{?dist} License: OFL-1.1 URL: https://gitlab.gnome.org/GNOME/adwaita-fonts.git @@ -66,4 +66,7 @@ Summary: Adwaita fonts %fontfiles -a %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 49.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + %autochangelog From 02112a030738ca355b9fc2c0547c0bb17bf40f7f Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Fri, 29 Aug 2025 14:21:11 -0500 Subject: [PATCH 5/9] Fix changelog and add %autorelease --- adwaita-fonts.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/adwaita-fonts.spec b/adwaita-fonts.spec index 9cf38ce..347b374 100644 --- a/adwaita-fonts.spec +++ b/adwaita-fonts.spec @@ -6,7 +6,7 @@ BuildRequires: fonts-rpm-macros BuildRequires: fonts-rpm-templates Version: 49.0 -Release: 2%{?dist} +Release: %autorelease License: OFL-1.1 URL: https://gitlab.gnome.org/GNOME/adwaita-fonts.git @@ -66,7 +66,4 @@ Summary: Adwaita fonts %fontfiles -a %changelog -* Wed Jul 23 2025 Fedora Release Engineering - 49.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - %autochangelog From e5902f7e3303d41196d344f2c42d5d09395997c7 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 31 Oct 2025 17:28:28 +0100 Subject: [PATCH 6/9] Skip %changelog entries for user-invisible changes The Fedora 43 mass rebuild had added manual RPM %changelog entries above %autochangelog [1], because the rebuild script got confused by the absence of %autorelease. Commit 02112a030738ca35 sorted this out by removing the manual entries, but it didn't use '[skip changelog]' [2]. Thus, future RPM builds would have a %changelog entry for it: * Fri Aug 29 2025 Michael Catanzaro - 49.0-3 - Fix changelog and add %autorelease Since commit 02112a030738ca35 is not interesting for the user, it would be good if it could be skipped from the RPM %changelog. This is done by introducing a 'changelog' file with all the previous entries that are desired, because rpmautospec with only generate entries from Git commits after the last change to this file [2]. Fallout from 02112a030738ca355b9fc2c0547c0bb17bf40f7f [1] Commit 9870fc694dd5cac4 https://src.fedoraproject.org/rpms/adwaita-fonts/c/9870fc694dd5cac4 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild [2] https://docs.pagure.org/fedora-infra.rpmautospec/autochangelog.html https://fedora-infra.github.io/rpmautospec-docs/autochangelog.html [skip changelog] --- changelog | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..88831a6 --- /dev/null +++ b/changelog @@ -0,0 +1,8 @@ +* Wed Jul 23 2025 Fedora Release Engineering - 49.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Wed Jul 09 2025 Milan Crha - 49.0-1 +- Update to 49.0 + +* Mon Mar 17 2025 nmontero - 48.2-1 +- New package From f67a56da6b2205fd7326c5a84a368488f6ad6c98 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 31 Oct 2025 18:23:42 +0100 Subject: [PATCH 7/9] Silence mixed-use-of-spaces-and-tabs Fallout from 0adeb7e620b88ec9868313062a3c9003ac8416b3 [skip changelog] --- adwaita-fonts.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adwaita-fonts.spec b/adwaita-fonts.spec index 347b374..247a64b 100644 --- a/adwaita-fonts.spec +++ b/adwaita-fonts.spec @@ -13,7 +13,7 @@ URL: https://gitlab.gnome.org/GNOME/adwaita-fonts.git %global foundry adwaita-fonts %global fontdocs README.md -%global common_description %{expand: +%global common_description %{expand: Adwaita Fonts contains Adwaita Sans, a variation of Inter, and Adwaita Mono, Iosevka customized to match Inter. } @@ -39,7 +39,7 @@ Adwaita Mono is a customized version of the Iosevka font, designed to match Inte } -Source0: https://download.gnome.org/sources/adwaita-fonts/49/adwaita-fonts-%{tarball_version}.tar.xz +Source0: https://download.gnome.org/sources/adwaita-fonts/49/adwaita-fonts-%{tarball_version}.tar.xz Source1: 59-adwaita-sans-fonts.conf Source2: 59-adwaita-mono-fonts.conf From b32ea254ce98a3fa43cdc3c00f1e57c287aa1528 Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Mon, 24 Nov 2025 17:13:25 +0530 Subject: [PATCH 8/9] Drop 'BuildRequires: fonts-rpm-templates' ... because it's is not required to build this package. Fallout from 0adeb7e620b88ec9868313062a3c9003ac8416b3 https://src.fedoraproject.org/rpms/adwaita-fonts/pull-request/1 [skip changelog] --- adwaita-fonts.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/adwaita-fonts.spec b/adwaita-fonts.spec index 247a64b..1b49679 100644 --- a/adwaita-fonts.spec +++ b/adwaita-fonts.spec @@ -3,7 +3,6 @@ BuildArch: noarch BuildRequires: meson BuildRequires: fonts-rpm-macros -BuildRequires: fonts-rpm-templates Version: 49.0 Release: %autorelease From 14c80998d87bdfbb72c029e6dc35e83c3d2e0bfb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:29:14 +0000 Subject: [PATCH 9/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild