From 99761ab3820b778844e6c43cf40a5f3d982ff4dc604abd9be842f52f8efd80d2 Mon Sep 17 00:00:00 2001 From: Sasi Olin Date: Thu, 17 Oct 2024 14:34:54 +0000 Subject: [PATCH 1/2] - Update to version 20241017: * Add new Tumbleweed logos * Increade horizontal padding for light-inline * Make square-symbolic edge to edge * Optimize PNGs * Make favicon multisize * Optimize SVGs * Narrow down light-inline * Resize square-symbolix to 16x16 * Resize symbolic icon to 16x16 OBS-URL: https://build.opensuse.org/package/show/Base:System/distribution-logos-openSUSE?expand=0&rev=37 --- .gitattributes | 23 ++++ .gitignore | 1 + _service | 13 ++ _servicedata | 4 + distribution-logos-20240429.tar.zst | 3 + distribution-logos-20241017.tar.zst | 3 + distribution-logos-openSUSE.changes | 102 +++++++++++++++ distribution-logos-openSUSE.spec | 185 ++++++++++++++++++++++++++++ 8 files changed, 334 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 _service create mode 100644 _servicedata create mode 100644 distribution-logos-20240429.tar.zst create mode 100644 distribution-logos-20241017.tar.zst create mode 100644 distribution-logos-openSUSE.changes create mode 100644 distribution-logos-openSUSE.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/_service b/_service new file mode 100644 index 0000000..15c3d26 --- /dev/null +++ b/_service @@ -0,0 +1,13 @@ + + + https://github.com/openSUSE/distribution-logos + git + main + %cd + enable + + + distribution-logos-*.tar + zst + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..58b320f --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://github.com/openSUSE/distribution-logos + 00cfc3121f5ad27aaf43176a0053507dde6e9d82 \ No newline at end of file diff --git a/distribution-logos-20240429.tar.zst b/distribution-logos-20240429.tar.zst new file mode 100644 index 0000000..38826a2 --- /dev/null +++ b/distribution-logos-20240429.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b087a71849bc21ad6182ecc17a365bb5e4de9d7cd2a1d160459d94faa9ff4f3 +size 122086 diff --git a/distribution-logos-20241017.tar.zst b/distribution-logos-20241017.tar.zst new file mode 100644 index 0000000..aee0ae2 --- /dev/null +++ b/distribution-logos-20241017.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1843e813cceaed91382f96929a655739fcda18bbed1d444f8ef39b69c70d7eb0 +size 117569 diff --git a/distribution-logos-openSUSE.changes b/distribution-logos-openSUSE.changes new file mode 100644 index 0000000..a2ecc09 --- /dev/null +++ b/distribution-logos-openSUSE.changes @@ -0,0 +1,102 @@ +------------------------------------------------------------------- +Thu Oct 17 12:56:06 UTC 2024 - lubos.kocman@suse.com + +- Update to version 20241017: + * Add new Tumbleweed logos + * Increade horizontal padding for light-inline + * Make square-symbolic edge to edge + * Optimize PNGs + * Make favicon multisize + * Optimize SVGs + * Narrow down light-inline + * Resize square-symbolix to 16x16 + * Resize symbolic icon to 16x16 + +------------------------------------------------------------------- +Wed May 08 13:31:35 UTC 2024 - bwiedemann@suse.com + +- Update to version 20240429: + * Introduce Slowroll logos + * Aeon: Correct colored icons to use Aeon brand color + +------------------------------------------------------------------- +Wed Apr 24 13:09:07 UTC 2024 - Jacob Michalskie + +- Update to version 20240424: + * Aeon: Make light versions actually light + +------------------------------------------------------------------- +Thu Apr 04 14:28:34 UTC 2024 - lubos.kocman@suse.com + +- Update to version 20240404: + * Turn apple-touch-icon into round square ones + * SLES Compatability supply apple-touch-icon for Leap, LeapMicro, TW + * Delete dist/package directory + * fix source mismatch with package name + +------------------------------------------------------------------- +Mon Feb 26 16:47:41 UTC 2024 - Lubos Kocman + +- Add handling for Leap Micro 6.X and Leap 16.X + +------------------------------------------------------------------- +Thu Feb 8 10:12:09 UTC 2024 - Dirk Müller + +- switch to a service using zstd + +------------------------------------------------------------------- +Thu Feb 1 14:45:43 UTC 2024 - Dirk Müller + +- list the source url + +------------------------------------------------------------------- +Thu Feb 1 10:15:48 UTC 2024 - Lubos Kocman + +- Update Leap 15.6 branding poo#131666 + +------------------------------------------------------------------- +Thu Sep 21 17:54:52 UTC 2023 - Jacob Michalskie + +- Add Aeon branding + +------------------------------------------------------------------- +Tue Mar 22 14:37:28 UTC 2022 - Lubos Kocman + +- Initial Leap Micro 5.2 branding + +------------------------------------------------------------------- +Fri Feb 18 18:09:45 UTC 2022 - Sasi Olin + +- Fix the obsoleted and provided versions of the old systemd logo branding package + +------------------------------------------------------------------- +Sun Jun 6 16:37:14 UTC 2021 - Sasi Olin + +- Add icons package to handle systemd branding better + +------------------------------------------------------------------- +Sat Jan 2 11:06:52 UTC 2021 - Stasiek Michalski + +- Only build Leap subpackage on Leap base and Tumbleweed based + distros subpackages on Tumbleweed base + +------------------------------------------------------------------- +Tue Nov 17 12:21:00 UTC 2020 - Stasiek Michalski + +- Add favicon.ico format + +------------------------------------------------------------------- +Thu Oct 17 17:35:47 UTC 2019 - Richard Brown + +- Remove obsolete Groups tag (fate#326485) + +------------------------------------------------------------------- +Mon May 6 15:16:52 UTC 2019 - Stasiek Michalski + +- Add viewBox and preserveAspectRatio to SVGs + +------------------------------------------------------------------- +Sat Apr 13 23:01:06 UTC 2019 - Stasiek Michalski + +- Initial package + diff --git a/distribution-logos-openSUSE.spec b/distribution-logos-openSUSE.spec new file mode 100644 index 0000000..addb553 --- /dev/null +++ b/distribution-logos-openSUSE.spec @@ -0,0 +1,185 @@ +# +# spec file for package distribution-logos-openSUSE +# +# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2021 Sasi Olin . +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: distribution-logos-openSUSE +Version: 20241017 +Release: 0 +Summary: Logos for openSUSE Distros +License: CC-BY-SA-4.0 +URL: https://github.com/openSUSE/distribution-logos +# updated via "osc service manualrun" +Source: distribution-logos-%{version}.tar.zst +BuildRequires: hicolor-icon-theme +BuildRequires: zstd +BuildArch: noarch + +%description +Logos for openSUSE Distributions + +%if 0%{?sle_version} || 0%{?suse_version} == 1600 +%package Leap +Summary: Logos for openSUSE Leap +Conflicts: distribution-logos +Obsoletes: distribution-logos +Provides: distribution-logos +Removepathpostfixes: .Leap +BuildArch: noarch + +%description Leap +Logos for openSUSE Leap + +%package LeapMicro +Summary: Logos for openSUSE Leap Micro +Conflicts: distribution-logos +Obsoletes: distribution-logos +Provides: distribution-logos +Removepathpostfixes: .LeapMicro +BuildArch: noarch + +%description LeapMicro +Logos for openSUSE Leap Micro + +%else + +%package Tumbleweed +Summary: Logos for openSUSE Tumbleweed +Conflicts: distribution-logos +Obsoletes: distribution-logos +Provides: distribution-logos +Removepathpostfixes: .Tumbleweed +BuildArch: noarch + +%description Tumbleweed +Logos for openSUSE Tumbleweed + +%package Slowroll +Summary: Logos for openSUSE Slowroll +Conflicts: distribution-logos +Obsoletes: distribution-logos +Provides: distribution-logos +Removepathpostfixes: .Slowroll +BuildArch: noarch + +%description Slowroll +Logos for openSUSE Slowroll + +%package Kubic +Summary: Logos for openSUSE Kubic +Conflicts: distribution-logos +Obsoletes: distribution-logos +Provides: distribution-logos +Removepathpostfixes: .Kubic +BuildArch: noarch + +%description Kubic +Logos for openSUSE Kubic + +%package MicroOS +Summary: Logos for openSUSE MicroOS +Conflicts: distribution-logos +Obsoletes: distribution-logos +Provides: distribution-logos +Removepathpostfixes: .MicroOS +BuildArch: noarch + +%description MicroOS +Logos for openSUSE MicroOS + +%package Aeon +Summary: Logos for openSUSE Aeon +Conflicts: distribution-logos +Obsoletes: distribution-logos +Provides: distribution-logos +Removepathpostfixes: .Aeon +BuildArch: noarch + +%description Aeon +Logos for openSUSE Aeon + +%endif + +%package icons +Summary: Icons with distribution logos +Requires: distribution-logos +Conflicts: systemd-icon-branding-openSUSE +Provides: systemd-icon-branding +Obsoletes: systemd-icon-branding-openSUSE < 84.87.20210910 +Provides: systemd-icon-branding-openSUSE = 84.87.20210910 +BuildArch: noarch + +%description icons +Icons with openSUSE distribution logos. + +%prep +%setup -q -n distribution-logos-%{version} + +%build +# Skip build + +%install +export NO_BRP_STALE_LINK_ERROR=yes +mkdir -p %{buildroot}%{_datadir}/pixmaps/distribution-logos +mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{scalable,symbolic}/apps +%if 0%{?sle_version} || 0%{?suse_version} == 1600 +for distro in Leap LeapMicro; do \ +%else +for distro in Tumbleweed Slowroll Kubic MicroOS Aeon; do \ +%endif +for file in `ls ${distro}`; do \ +cp -r ${distro}/${file} %{buildroot}%{_datadir}/pixmaps/distribution-logos/${file}.${distro}; \ +done; \ +cp -r ${distro}/square-hicolor.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/distributor-logo-${distro}.svg; \ +cp -r ${distro}/square-symbolic.svg %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps/distributor-logo-${distro}-symbolic.svg; \ +done +ln -sf %{_datadir}/pixmaps/distribution-logos/square-hicolor.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/distributor-logo.svg +ln -sf %{_datadir}/pixmaps/distribution-logos/square-symbolic.svg %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps/distributor-logo-symbolic.svg + +%files +%dir %{_datadir}/pixmaps/distribution-logos + +%if 0%{?sle_version} || 0%{?suse_version} == 1600 +%files Leap +%{_datadir}/pixmaps/distribution-logos/*.Leap + +%files LeapMicro +%{_datadir}/pixmaps/distribution-logos/*.LeapMicro + +%else + +%files Tumbleweed +%{_datadir}/pixmaps/distribution-logos/*.Tumbleweed + +%files Slowroll +%{_datadir}/pixmaps/distribution-logos/*.Slowroll + +%files Kubic +%{_datadir}/pixmaps/distribution-logos/*.Kubic + +%files MicroOS +%{_datadir}/pixmaps/distribution-logos/*.MicroOS + +%files Aeon +%{_datadir}/pixmaps/distribution-logos/*.Aeon + +%endif + +%files icons +%{_datadir}/icons/hicolor/* + +%changelog From b5de7b2b99a58507bccc2b0659ee0d1ae723eb603a638b5b243daa42241c9f6f Mon Sep 17 00:00:00 2001 From: Sasi Olin Date: Tue, 22 Oct 2024 08:07:14 +0000 Subject: [PATCH 2/2] - Update to version 20241022: * TW: rename highcolor back to hicolor OBS-URL: https://build.opensuse.org/package/show/Base:System/distribution-logos-openSUSE?expand=0&rev=38 --- _servicedata | 2 +- distribution-logos-20241017.tar.zst | 3 --- distribution-logos-20241022.tar.zst | 3 +++ distribution-logos-openSUSE.changes | 6 ++++++ distribution-logos-openSUSE.spec | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 distribution-logos-20241017.tar.zst create mode 100644 distribution-logos-20241022.tar.zst diff --git a/_servicedata b/_servicedata index 58b320f..8ef99bf 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/distribution-logos - 00cfc3121f5ad27aaf43176a0053507dde6e9d82 \ No newline at end of file + d8afb67f721afd6165bf05c0e5221a58ac3a7027 \ No newline at end of file diff --git a/distribution-logos-20241017.tar.zst b/distribution-logos-20241017.tar.zst deleted file mode 100644 index aee0ae2..0000000 --- a/distribution-logos-20241017.tar.zst +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1843e813cceaed91382f96929a655739fcda18bbed1d444f8ef39b69c70d7eb0 -size 117569 diff --git a/distribution-logos-20241022.tar.zst b/distribution-logos-20241022.tar.zst new file mode 100644 index 0000000..52e1eee --- /dev/null +++ b/distribution-logos-20241022.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f89bc0e5dd18335137b527b3b3d2e1b58c6318b83d38233ede71a660fcca567 +size 116568 diff --git a/distribution-logos-openSUSE.changes b/distribution-logos-openSUSE.changes index a2ecc09..d0f06b7 100644 --- a/distribution-logos-openSUSE.changes +++ b/distribution-logos-openSUSE.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 22 07:58:33 UTC 2024 - lubos.kocman@suse.com + +- Update to version 20241022: + * TW: rename highcolor back to hicolor + ------------------------------------------------------------------- Thu Oct 17 12:56:06 UTC 2024 - lubos.kocman@suse.com diff --git a/distribution-logos-openSUSE.spec b/distribution-logos-openSUSE.spec index addb553..6e9f639 100644 --- a/distribution-logos-openSUSE.spec +++ b/distribution-logos-openSUSE.spec @@ -18,7 +18,7 @@ Name: distribution-logos-openSUSE -Version: 20241017 +Version: 20241022 Release: 0 Summary: Logos for openSUSE Distros License: CC-BY-SA-4.0