From 820169a1f849c788a3d9f20afc6dd92ffcd0feab Mon Sep 17 00:00:00 2001 From: lleyton Date: Sun, 4 Dec 2022 02:44:15 -0800 Subject: [PATCH 01/21] Remove some duplicates (#49) --- .../desktops/elementary/editorconfig/anda.hcl | 6 - .../elementary/editorconfig/chkupdate.py | 20 -- .../elementary/editorconfig/editorconfig.spec | 155 --------- anda/desktops/elementary/plank/anda.hcl | 6 - anda/desktops/elementary/plank/plank.spec | 297 ------------------ .../58-impallari-raleway-fonts.xml | 18 -- anda/fonts/impallari-raleway-fonts/anda.hcl | 6 - .../impallari-raleway-fonts.spec | 103 ------ 8 files changed, 611 deletions(-) delete mode 100644 anda/desktops/elementary/editorconfig/anda.hcl delete mode 100644 anda/desktops/elementary/editorconfig/chkupdate.py delete mode 100644 anda/desktops/elementary/editorconfig/editorconfig.spec delete mode 100644 anda/desktops/elementary/plank/anda.hcl delete mode 100644 anda/desktops/elementary/plank/plank.spec delete mode 100644 anda/fonts/impallari-raleway-fonts/58-impallari-raleway-fonts.xml delete mode 100644 anda/fonts/impallari-raleway-fonts/anda.hcl delete mode 100644 anda/fonts/impallari-raleway-fonts/impallari-raleway-fonts.spec diff --git a/anda/desktops/elementary/editorconfig/anda.hcl b/anda/desktops/elementary/editorconfig/anda.hcl deleted file mode 100644 index 326e33c3b0..0000000000 --- a/anda/desktops/elementary/editorconfig/anda.hcl +++ /dev/null @@ -1,6 +0,0 @@ -project "pkg" { - rpm { - spec = "editorconfig.spec" - sources = "." - } -} diff --git a/anda/desktops/elementary/editorconfig/chkupdate.py b/anda/desktops/elementary/editorconfig/chkupdate.py deleted file mode 100644 index ca81deb137..0000000000 --- a/anda/desktops/elementary/editorconfig/chkupdate.py +++ /dev/null @@ -1,20 +0,0 @@ -import os -import requests -import re - -NAME = 'editorconfig' -REPO = "editorconfig/editorconfig-core-c" -REGEX_VER = r'Version:\s*([\.\d]+)\n' -SPEC = f"{NAME}.spec" -LINK = f'https://api.github.com/repos/{REPO}/releases/latest' - - -ver = requests.get(LINK, headers={'Authorization': 'Bearer ' + os.getenv('GITHUB_TOKEN')}).json()['tag_name'] -ver = ver[1:] -with open(SPEC, 'r') as f: - matches = re.findall(REGEX_VER, f.read()) -if not len(matches): exit(f"{NAME}: Failed to match regex!") -cur = matches[0] -if ver == cur: exit(f'{NAME}: Up to date!') -print(f'{NAME}: {cur} -> {ver}') -os.system(f'rpmdev-bumpspec -n {ver} {SPEC}') diff --git a/anda/desktops/elementary/editorconfig/editorconfig.spec b/anda/desktops/elementary/editorconfig/editorconfig.spec deleted file mode 100644 index 4d9be0a672..0000000000 --- a/anda/desktops/elementary/editorconfig/editorconfig.spec +++ /dev/null @@ -1,155 +0,0 @@ -# build process has race conditions, force single thread -%global _smp_mflags -j1 - -%global srcname editorconfig-core-c - -%global common_description %{expand: -EditorConfig makes it easy to maintain the correct coding style when -switching between different text editors and between different projects. -The EditorConfig project maintains a file format and plugins for various -text editors which allow this file format to be read and used by those -editors.} - -Name: editorconfig -Summary: Parser for EditorConfig files written in C -Version: v0.12.5 -Release: 1%{?dist} -License: BSD - -URL: https://github.com/editorconfig/editorconfig-core-c -Source0: %{url}/archive/v%{version}/%{srcname}-%{version}.tar.gz - -BuildRequires: cmake -BuildRequires: doxygen -BuildRequires: gcc -BuildRequires: pcre2-devel - -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - -%description %common_description - - -%package libs -Summary: Parser library for EditorConfig files (shared library) -%description libs %common_description - -This package contains the shared library. - - -%package devel -Summary: Parser library for EditorConfig files (development files) - -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: cmake - -%description devel %common_description - -This package contains the files needed for development. - - -%prep -%autosetup -n %{srcname}-%{version} -p1 - - -%build -%cmake -%cmake_build - - -%install -%cmake_install - -# Remove static library -rm %{buildroot}/%{_libdir}/libeditorconfig_static.a - - -%files -%doc README.md -%license LICENSE - -%{_bindir}/editorconfig -%{_bindir}/editorconfig-%{version} - -%{_mandir}/man1/editorconfig.1* - -%files libs -%doc README.md -%license LICENSE - -%{_libdir}/libeditorconfig.so.0* - -%{_mandir}/man3/editorconfig* -%{_mandir}/man5/editorconfig* - -%files devel -%{_includedir}/editorconfig/ - -%{_libdir}/libeditorconfig.so -%{_libdir}/cmake/EditorConfig/ -%{_libdir}/pkgconfig/editorconfig.pc - - -%changelog -* Sun Nov 27 2022 root - v0.12.5-1 -- new version - -* Sat Oct 15 2022 windowsboy111 -- Repackaged for Terra - -* Thu Jul 21 2022 Fedora Release Engineering - 0.12.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 0.12.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 0.12.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jun 17 2021 Fabio Valentini - 0.12.5-1 -- Update to version 0.12.5. - -* Thu Feb 04 2021 Fabio Valentini - 0.12.4-3 -- Force single-threaded build to work around race conditions. - -* Tue Jan 26 2021 Fedora Release Engineering - 0.12.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Aug 31 2020 Fabio Valentini - 0.12.4-1 -- Update to version 0.12.4. - -* Sat Aug 01 2020 Fabio Valentini - 0.12.3-7 -- Adapt to new cmake macros. - -* Sat Aug 01 2020 Fedora Release Engineering - 0.12.3-6 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 0.12.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jan 28 2020 Fedora Release Engineering - 0.12.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 0.12.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 0.12.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Nov 16 2018 Fabio Valentini - 0.12.3-1 -- Update to version 0.12.3. - -* Thu Jul 12 2018 Fedora Release Engineering - 0.12.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu May 03 2018 Fabio Valentini - 0.12.2-3 -- Fix broken ldconfig_scriptlets use. - -* Wed May 02 2018 Fabio Valentini - 0.12.2-2 -- Use single-job make for building. -- Added missing ldconfig scriptlets. -- Rewritten summaries. - -* Thu Mar 22 2018 Fabio Valentini - 0.12.2-1 -- Initial package. - diff --git a/anda/desktops/elementary/plank/anda.hcl b/anda/desktops/elementary/plank/anda.hcl deleted file mode 100644 index e54d4b957d..0000000000 --- a/anda/desktops/elementary/plank/anda.hcl +++ /dev/null @@ -1,6 +0,0 @@ -project "pkg" { - rpm { - spec = "plank.spec" - sources = "." - } -} diff --git a/anda/desktops/elementary/plank/plank.spec b/anda/desktops/elementary/plank/plank.spec deleted file mode 100644 index 7b86c5dc18..0000000000 --- a/anda/desktops/elementary/plank/plank.spec +++ /dev/null @@ -1,297 +0,0 @@ -%global commit 013d0513bcf029426db19aea4d8b19c7b3b0077c -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20210202 - -%global common_description %{expand: -Plank is meant to be the simplest dock on the planet. The goal is to -provide just what a dock needs and absolutely nothing more. It is, -however, a library which can be extended to create other dock programs -with more advanced features. - -Thus, Plank is the underlying technology for Docky (starting in version -3.0.0) and aims to provide all the core features while Docky extends it -to add fancier things like Docklets, painters, settings dialogs, etc.} - -Name: plank -Summary: Stupidly simple Dock -Version: 0.11.89 -Release: 11.%{commitdate}.git%{shortcommit}%{?dist} -License: GPLv3+ - -URL: https://launchpad.net/%{name} -# use sources from elementary OS dock "fork" which is actually maintained -# * dropped patented zoom animation -# * fixed session integration -# * support for automatic dark theme -# * migrated from autotools to meson -Source0: https://github.com/elementary/dock/archive/%{commit}/dock-%{shortcommit}.tar.gz - -BuildRequires: desktop-file-utils -BuildRequires: gettext -BuildRequires: help2man -BuildRequires: libappstream-glib -BuildRequires: meson -BuildRequires: vala - -BuildRequires: pkgconfig(cairo) >= 1.13 -BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.26.0 -BuildRequires: pkgconfig(gdk-x11-3.0) >= 3.10.0 -BuildRequires: pkgconfig(gee-0.8) -BuildRequires: pkgconfig(gio-2.0) >= 2.40.0 -BuildRequires: pkgconfig(gio-unix-2.0) >= 2.40.0 -BuildRequires: pkgconfig(glib-2.0) >= 2.40.0 -BuildRequires: pkgconfig(gmodule-2.0) -BuildRequires: pkgconfig(gobject-2.0) >= 2.40.0 -BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(granite) >= 5.4.0 -BuildRequires: pkgconfig(gtk+-3.0) >= 3.10.0 -BuildRequires: pkgconfig(libbamf3) >= 0.4.0 -BuildRequires: pkgconfig(libgnome-menu-3.0) -BuildRequires: pkgconfig(libwnck-3.0) -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xi) >= 1.6.99.1 -BuildRequires: pkgconfig(xfixes) >= 5.0 - -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - -Requires: bamf-daemon -Requires: hicolor-icon-theme - -%description %{common_description} - - -%package libs -Summary: Shared libraries for %{name} - -%description libs %{common_description} -This package contains the shared libraries. - - -%package docklets -Summary: Docklets for %{name} - -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description docklets %{common_description} -This package contains the docklets for plank. - - -%package devel -Summary: Development files for %{name} - -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - -%description devel %{common_description} -This package contains the files necessary to develop against plank. - - -%prep -%autosetup -n dock-%{commit} -p1 - - -%build -%meson -Denable-apport=false -%meson_build - - -%install -%meson_install - -%find_lang %{name} - - -%check -desktop-file-validate \ - %{buildroot}/%{_sysconfdir}/xdg/autostart/%{name}.desktop - -desktop-file-validate \ - %{buildroot}/%{_datadir}/applications/%{name}.desktop - -appstream-util validate-relax --nonet \ - %{buildroot}/%{_datadir}/metainfo/%{name}.appdata.xml - - -%files -f %{name}.lang -%config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop - -%{_bindir}/%{name} - -%{_datadir}/applications/%{name}.desktop -%{_datadir}/glib-2.0/schemas/net.launchpad.%{name}.gschema.xml -%{_datadir}/icons/hicolor/*/apps/%{name}.svg -%{_datadir}/metainfo/%{name}.appdata.xml -%{_datadir}/%{name}/ - -%{_mandir}/man1/%{name}.1* - -%files libs -%license COPYING COPYRIGHT -%doc README.md AUTHORS NEWS - -%{_libdir}/lib%{name}.so.1* -%dir %{_libdir}/%{name} - -%files docklets -%dir %{_libdir}/%{name}/docklets -%{_libdir}/%{name}/docklets/*.so - -%files devel -%{_libdir}/lib%{name}.so -%{_libdir}/pkgconfig/%{name}.pc - -%{_includedir}/%{name}/ - -%{_datadir}/vala/vapi/%{name}.vapi -%{_datadir}/vala/vapi/%{name}.deps - - -%changelog -* Sat Oct 15 2022 windowsboy111 -- Repackaged for Terra - -* Fri Jul 22 2022 Fedora Release Engineering - 0.11.89-11.20210202.git013d051 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 21 2022 Fedora Release Engineering - 0.11.89-10.20210202.git013d051 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Jul 27 2021 Fedora Release Engineering - 0.11.89-9.20210202.git013d051 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Feb 18 2021 Fabio Valentini - 0.11.89-8.20210202.git013d051 -- Rebuilt for granite 6 soname bump. - -* Sat Feb 06 2021 Fabio Valentini - 0.11.89-7.20210202.git013d051 -- Switch to elementary OS dock sources, commit 013d051. -- Remove all obsolete downstream patches. - -* Wed Jan 27 2021 Fedora Release Engineering - 0.11.89-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 0.11.89-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jun 04 2020 Fabio Valentini - 0.11.89-4 -- Drop unnecessary build dependency on libdbusmenu. - -* Tue Mar 03 2020 Fabio Valentini - 0.11.89-3 -- Include some patches from elementaryOS. -- Port to meson, drop autotools. -- Register with the GNOME session manager. - -* Thu Jan 30 2020 Fedora Release Engineering - 0.11.89-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Oct 19 2019 Fabio Valentini - 0.11.89-1 -- Update to version 0.11.89. - -* Sat Aug 03 2019 Fabio Valentini - 0.11.4-10 -- Add upstream patch to fix FTBFS with vala 0.45+. - -* Fri Jul 26 2019 Fedora Release Engineering - 0.11.4-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Feb 02 2019 Fedora Release Engineering - 0.11.4-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Nov 29 2018 Fabio Valentini - 0.11.4-7 -- Hide plank launcher in Pantheon. -- Modernize .spec file. - -* Fri Jul 13 2018 Fedora Release Engineering - 0.11.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 0.11.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jan 18 2018 Igor Gnatenko - 0.11.4-4 -- Remove obsolete scriptlets - -* Thu Aug 03 2017 Fedora Release Engineering - 0.11.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0.11.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon May 01 2017 Fabio Valentini - 0.11.4-1 -- Update to version 0.11.4. - -* Sat Feb 11 2017 Fedora Release Engineering - 0.11.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jan 24 2017 Fabio Valentini - 0.11.3-2 -- Make BR on /usr/bin/pkg-config explicit. - -* Sun Jan 22 2017 Fabio Valentini - 0.11.3-1 -- Update to version 0.11.3. -- Update .spec file for current Packaging Guidelines. - -* Fri Aug 19 2016 Wesley Hearn - 0.11.2-1 -- Updated to latest version - -* Fri Mar 25 2016 Wesley Hearn - 0.11.0-2 -- Fixed issue in the patent patch - -* Thu Mar 17 2016 Wesley Hearn - 0.11.0-1 -- Updated to latest version - -* Thu Feb 04 2016 Fedora Release Engineering - 0.10.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Oct 28 2015 Wesley Hearn - 0.10.1-1 -- Updated to latest version - -* Mon May 04 2015 Wesley Hearn - 0.10.0-2 -- Disable potential patent issue - -* Mon May 04 2015 Wesley Hearn - 0.10.0-1 -- Updated to latest version - -* Mon May 04 2015 Wesley Hearn - 0.9.1-1 -- Updated to latest upstream - -* Wed Jan 28 2015 Wesley Hearn - 0.8.1-1 -- Updated to latest upstream - -* Sat Oct 25 2014 Wesley Hearn - 0.7.1-1 -- Updated to latest upstream - -* Sun Aug 17 2014 Fedora Release Engineering - 0.6.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon Apr 14 2014 Wesley Hearn - 0.6.0-1 -- New upstream version - -* Mon Feb 17 2014 Wesley Hearn - 0.5.0-4 -- Build against bamf-devel and not bamf4-devel in Fedora 21+ - -* Mon Feb 17 2014 Wesley Hearn - 0.5.0-3 -- Removed Group from devel package - -* Fri Feb 14 2014 Wesley Hearn - 0.5.0-2 -- Cleaned up SPEC file - -* Tue Jan 14 2014 Wesley Hearn - 0.5.0-1 -- Updating to new upstream release - -* Thu Aug 08 2013 Wesley Hearn - 0.3.0-1 -- Updating to new upstream release - -* Thu Jan 24 2013 Wesley Hearn - 0.2.0.734-0.1.20130124bzr -- Updated to 734 - -* Mon Jan 21 2013 Wesley Hearn - 0.2.0.731-1.20130121 -- Updates to revision 731 -- Fixed version numbers and how I generate the source ball -- Cleaned up spec file some more - -* Thu Jan 17 2013 Wesley Hearn - 0.0-1.20130117bzr723 -- Updated to revision 723 -- Cleaned up the spec file some - -* Wed Jan 16 2013 Wesley Hearn - 0.0-1.20130116bzr722 -- Initial package diff --git a/anda/fonts/impallari-raleway-fonts/58-impallari-raleway-fonts.xml b/anda/fonts/impallari-raleway-fonts/58-impallari-raleway-fonts.xml deleted file mode 100644 index 2617f6c1f4..0000000000 --- a/anda/fonts/impallari-raleway-fonts/58-impallari-raleway-fonts.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - Raleway - - Raleway-v4020 - Raleway-v4013 - Museo Sans Cyrillic - Apercu - Circular - Founders Grotesk - sans-serif - - - - diff --git a/anda/fonts/impallari-raleway-fonts/anda.hcl b/anda/fonts/impallari-raleway-fonts/anda.hcl deleted file mode 100644 index f139bd898a..0000000000 --- a/anda/fonts/impallari-raleway-fonts/anda.hcl +++ /dev/null @@ -1,6 +0,0 @@ -project "pkg" { - rpm { - spec = "impallari-raleway-fonts.spec" - sources = "." - } -} diff --git a/anda/fonts/impallari-raleway-fonts/impallari-raleway-fonts.spec b/anda/fonts/impallari-raleway-fonts/impallari-raleway-fonts.spec deleted file mode 100644 index b7b14e6d31..0000000000 --- a/anda/fonts/impallari-raleway-fonts/impallari-raleway-fonts.spec +++ /dev/null @@ -1,103 +0,0 @@ -# SPDX-License-Identifier: MIT -%global forgeurl https://github.com/alexeiva/Raleway -%global commit 98add575720aa077b7d253477e26c463a55e71da -%forgemeta - -Version: 4.101 -Release: 10%{?dist} -URL: %{forgeurl} - -%global foundry Impallari -%global fontlicense OFL -%global fontlicenses OFL.txt -%global fontdocs *.txt *.md -%global fontdocsex %{fontlicenses} - -%global fontfamily Raleway -%global fontsummary Raleway, an elegant sans-serif font family -%global fonts fonts/TTF/*ttf -%global fontconfngs %{SOURCE10} -%global fontdescription %{expand: -Raleway is an elegant sans-serif font family intended for headings and other -large size usage. - -It features both old style and lining numerals, standard and discretionary -ligatures, a pretty complete set of diacritics, as well as a stylistic -alternate inspired by more geometric sans-serif typefaces than its -neo-grotesque inspired default character set.} - -Source0: %{forgesource} -Source10: 58-%{fontpkgname}.xml - -%fontpkg - -%package doc -Summary: Optional documentation files of %{fontpkgname} -BuildArch: noarch -%description doc -This package provides optional documentation files shipped with -%{fontpkgname}. - -%prep -%forgesetup -%linuxtext %{fontdocs} %{fontlicenses} - -%build -%fontbuild - -%install -%fontinstall - -%check -%fontcheck - -%fontfiles -%files doc -%defattr(644, root, root, 0755) -%license OFL.txt -%doc documents/* - -%changelog -* Thu Nov 17 2022 windowsboy111 - 4.101 -- Bump - -* Sat Oct 15 2022 windowsboy111 - 4.025 -- Repackaged for Terra - -* Thu Jul 21 2022 Fedora Release Engineering - 4.025-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Feb 02 2022 Parag Nemade - 4.025-9.20200310git98add57 -- Fix packaging issues - -* Thu Jan 20 2022 Fedora Release Engineering - 4.025-8.20200310git98add57 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 4.025-7.20200310git98add57 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 4.025-6.20200310git98add57 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 4.025-5.20200310git98add57 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Apr 27 2020 Nicolas Mailhot -- 4.025-4.20200310git98add57 -🐞 Workaround Fedora problems created by rpm commit 93604e2 - -* Thu Apr 02 2020 Nicolas Mailhot -- 4.025-3.20200310git98add57 -đŸ’„ Actually rebuild with fonts-rpm-macros 2.0.4 to make sure fontconfig files are - valid - -* Thu Apr 02 2020 Nicolas Mailhot -- 4.025-2.20200310git98add57 -đŸ‘» Rebuild with fonts-rpm-macros 2.0.4 to make sure fontconfig files are valid - -* Tue Mar 10 2020 Nicolas Mailhot -- 4.025-1.20200310git98add57.fc33 -✅ Convert to fonts-rpm-macros use - -* Sun Mar 12 2017 Fabio Valentini - 3.0-1.git20161116.6c67ab1 -- Initial package. From ba3b3093ce7e4114702dae71bd9ab3ef72423387 Mon Sep 17 00:00:00 2001 From: Lains <4886639+lainsce@users.noreply.github.com> Date: Sun, 4 Dec 2022 20:21:36 -0300 Subject: [PATCH 02/21] Update tau-hydrogen.spec (#51) Signed-off-by: Lains <4886639+lainsce@users.noreply.github.com> Signed-off-by: Lains <4886639+lainsce@users.noreply.github.com> --- anda/others/tau-hydrogen/tau-hydrogen.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/others/tau-hydrogen/tau-hydrogen.spec b/anda/others/tau-hydrogen/tau-hydrogen.spec index dce742df80..0b82084f6f 100644 --- a/anda/others/tau-hydrogen/tau-hydrogen.spec +++ b/anda/others/tau-hydrogen/tau-hydrogen.spec @@ -1,6 +1,6 @@ Summary: tauOS Icon Theme Name: tau-hydrogen -Version: 1.0.1 +Version: 1.0.2 Release: 1%{?dist} License: GPLv3 URL: https://github.com/tau-OS/tau-hydrogen From f849ad253625f94f09a2b0552fd510e7ead8b091 Mon Sep 17 00:00:00 2001 From: lleyton Date: Sun, 4 Dec 2022 15:51:22 -0800 Subject: [PATCH 03/21] gpg.signingkey -> user.signingkey --- .github/workflows/update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 8aba06fb08..23bf17bd9d 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -41,7 +41,7 @@ jobs: git config user.name "Raboneko" git config user.email "raboneko@fyralabs.com" git config gpg.format "ssh" - git config gpg.signingKey "${{ secrets.SSH_PUBLIC_SIGNING_KEY }}" + git config user.signingkey "${{ secrets.SSH_PUBLIC_SIGNING_KEY }}" git commit -S -a -m "Automatic Update: $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')" git push -u origin main fi From 8230e70ec6bfc109af8545b3f161b05b7516800f Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 5 Dec 2022 08:35:19 +0000 Subject: [PATCH 04/21] adopt new policies for prismlauncher (#54) * [prismlauncher] revise files to better follow fedora guidelines * add prismlauncher packages to CODEOWNERS --- CODEOWNERS | 5 + .../prismlauncher-nightly.spec | 167 ++++++------- .../prismlauncher-qt5-nightly.spec | 168 ++++++------- .../prismlauncher-qt5/prismlauncher-qt5.spec | 222 ++++++----------- anda/games/prismlauncher/prismlauncher.spec | 228 ++++++------------ 5 files changed, 316 insertions(+), 474 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 42edd91f1c..b666655219 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -20,3 +20,8 @@ /anda/tools/melody @lleyton /anda/go/curlie @lleyton + +/anda/games/prismlauncher @getchoo +/anda/games/prismlauncher-nightly @getchoo +/anda/games/prismlauncher-qt5-nightly @getchoo +/anda/games/prismlauncher-qt5 @getchoo diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 34fee58dc3..8c6fe5500c 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,16 +1,13 @@ -%global fancy_name PrismLauncher %global real_name prismlauncher -%global repo https://github.com/%{fancy_name}/%{fancy_name} %global commit 79d5beff8d45d9a66cfa91393167fc79d3a155a9 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global filesystem_commit cd6805e94dd5d6346be1b75a54cdc27787319dd2 %global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 %global tomlplusplus_commit 0a90913abf9390b9e08ab6d3b40ac11634553f38 %global commit_date %(date '+%Y%m%d') -%global git_rel .%{commit_date}.%{shortcommit} +%global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 @@ -29,10 +26,6 @@ %global build_platform unknown -%if 0%{?suse_version} -%global build_platform openSUSE -%endif - %if 0%{?fedora} %global build_platform Fedora %endif @@ -45,85 +38,56 @@ %global build_platform CentOS %endif -%if %{with qt6} -Name: prismlauncher-nightly -%else -Name: prismlauncher-qt5-nightly -%endif -Version: 6.0 -Release: 0.1%{?git_rel}%{?dist} -Summary: Minecraft launcher with ability to manage multiple instances -License: GPL-3.0-only -%if 0%{?suse_version} -Group: Amusements/Games/Action/Other -%else -Group: Amusements/Games -%endif -URL: https://prismlauncher.org/ -Source0: %{repo}/archive/%{commit}/%{fancy_name}-%{shortcommit}.tar.gz -Source1: https://github.com/PrismLauncher/libnbtplusplus/archive/%{libnbtplusplus_commit}/libnbtplusplus-%{libnbtplusplus_commit}.tar.gz -Source2: https://github.com/stachenov/quazip/archive/%{quazip_commit}/quazip-%{quazip_commit}.tar.gz -Source3: https://github.com/marzer/tomlplusplus/archive/%{tomlplusplus_commit}/tomlplusplus-%{tomlplusplus_commit}.tar.gz -Source4: https://github.com/gulrak/filesystem/archive/%{filesystem_commit}/filesystem-%{filesystem_commit}.tar.gz +Name: prismlauncher-nightly +Version: 6.0^%{snapshot_info} +Release: 1%{?dist} +Summary: Minecraft launcher with ability to manage multiple instances +License: GPL-3.0-only +Group: Amusements/Games +URL: https://prismlauncher.org/ +Source0: https://github.com/PrismLauncher/PrismLauncher/archive/%{commit}/%{real_name}-%{shortcommit}.tar.gz +Source1: https://github.com/PrismLauncher/libnbtplusplus/archive/%{libnbtplusplus_commit}/libnbtplusplus-%{libnbtplusplus_commit}.tar.gz +Source2: https://github.com/stachenov/quazip/archive/%{quazip_commit}/quazip-%{quazip_commit}.tar.gz +Source3: https://github.com/marzer/tomlplusplus/archive/%{tomlplusplus_commit}/tomlplusplus-%{tomlplusplus_commit}.tar.gz -BuildRequires: cmake >= 3.15 -BuildRequires: extra-cmake-modules -BuildRequires: gcc-c++ -BuildRequires: java-devel - -%if 0%{?suse_version} -BuildRequires: appstream-glib -%else -BuildRequires: libappstream-glib -%endif - -BuildRequires: desktop-file-utils -BuildRequires: cmake(Qt%{qt_version}Concurrent) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Core) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Gui) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Network) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Test) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Widgets) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Xml) >= %{min_qt_version} +BuildRequires: cmake >= 3.15 +BuildRequires: extra-cmake-modules +BuildRequires: gcc-c++ +BuildRequires: java-devel >= 17 +BuildRequires: desktop-file-utils +BuildRequires: libappstream-glib +BuildRequires: cmake(ghc_filesystem) +BuildRequires: cmake(Qt%{qt_version}Concurrent) >= %{min_qt_version} +BuildRequires: cmake(Qt%{qt_version}Core) >= %{min_qt_version} +BuildRequires: cmake(Qt%{qt_version}Gui) >= %{min_qt_version} +BuildRequires: cmake(Qt%{qt_version}Network) >= %{min_qt_version} +BuildRequires: cmake(Qt%{qt_version}Test) >= %{min_qt_version} +BuildRequires: cmake(Qt%{qt_version}Widgets) >= %{min_qt_version} +BuildRequires: cmake(Qt%{qt_version}Xml) >= %{min_qt_version} %if %{with qt6} -BuildRequires: cmake(Qt6Core5Compat) +BuildRequires: cmake(Qt6Core5Compat) %endif -BuildRequires: pkgconfig(scdoc) -BuildRequires: zlib-devel +BuildRequires: pkgconfig(scdoc) +BuildRequires: pkgconfig(zlib) -# Prism Launcher requires QuaZip >= 1.3 -%if 0%{?suse_version} >= 1550 -BuildRequires: cmake(QuaZip-Qt%{qt_version}) -%endif +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils -%if 0%{?suse_version} -Requires: %{!?with_qt6:lib}qt%{qt_version}-%{!?with_qt6:qt}imageformats -Requires: libQt%{qt_version}Svg%{qt_version} -%else -Requires: qt%{qt_version}-qtimageformats -Requires: qt%{qt_version}-qtsvg -%endif +Requires: qt%{qt_version}-qtimageformats +Requires: qt%{qt_version}-qtsvg +Requires: javapackages-filesystem +Requires: java-headless >= 17 +Requires: java-1.8.0-openjdk-headless -Recommends: java-openjdk-headless # xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 -Recommends: xrandr - +Recommends: xrandr # Prism supports enabling gamemode -%if 0%{?suse_version} -Recommends: gamemoded -%else -Recommends: gamemode -%endif +Suggests: gamemode -Conflicts: %{real_name} -Conflicts: %{real_name}-qt5 -%if %{with qt6} -Conflicts: %{real_name}-qt5-nightly -%else -Conflicts: %{real_name}-nightly -%endif +Conflicts: prismlauncher +Conflicts: prismlauncher-qt5 %description @@ -132,21 +96,21 @@ multiple installations of Minecraft at once (Fork of MultiMC) %prep -%autosetup -n %{fancy_name}-%{commit} +%autosetup -n PrismLauncher-%{commit} -tar -xvf %{SOURCE1} -C libraries +tar -xzf %{SOURCE1} -C libraries tar -xvf %{SOURCE2} -C libraries tar -xvf %{SOURCE3} -C libraries -tar -xvf %{SOURCE4} -C libraries -rmdir libraries/{quazip/,libnbtplusplus} -mv -f libraries/quazip-%{quazip_commit} libraries/quazip + +rmdir libraries/{libnbtplusplus,quazip,tomlplusplus}/ mv -f libraries/libnbtplusplus-%{libnbtplusplus_commit} libraries/libnbtplusplus -mv -f libraries/tomlplusplus-%{tomlplusplus_commit}/* libraries/tomlplusplus -mv -f libraries/filesystem-%{filesystem_commit}/* libraries/filesystem +mv -f libraries/quazip-%{quazip_commit} libraries/quazip +mv -f libraries/tomlplusplus-%{tomlplusplus_commit} libraries/tomlplusplus # Do not set RPATH sed -i "s|\$ORIGIN/||" CMakeLists.txt + %build %cmake \ -DLauncher_QT_VERSION_MAJOR="%{qt_version}" \ @@ -160,18 +124,41 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt %cmake_build + %install %cmake_install -%if 0%{?suse_version} > 1500 || 0%{?fedora} > 35 -appstream-util validate-relax --nonet \ - %{buildroot}%{_datadir}/metainfo/org.prismlauncher.PrismLauncher.metainfo.xml -%endif %check %ctest + +appstream-util validate-relax --nonet \ + %{buildroot}%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml + desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop + +%post +/usr/bin/update-desktop-database &> /dev/null || : +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +/bin/touch --no-create %{_datadir}/mime/packages &>/dev/null || : + + +%postun +/usr/bin/update-desktop-database &> /dev/null || : + +if [ $1 -eq 0 ] ; then + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : +fi + + +%posttrans +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : + + %files %doc README.md %license LICENSE COPYING.md @@ -180,13 +167,17 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.Pri %{_datadir}/%{real_name}/NewLaunch.jar %{_datadir}/%{real_name}/JavaCheck.jar %{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop -%{_datadir}/metainfo/org.prismlauncher.PrismLauncher.metainfo.xml +%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml %{_datadir}/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg %{_datadir}/mime/packages/modrinth-mrpack-mime.xml %{_mandir}/man?/prismlauncher.* %changelog +* Mon Dec 05 2022 seth - 6.0^20221204.79d5bef-1 +- revise file to better follow fedora packaging guidelines and add java 8 as a + dependency + * Thu Nov 10 2022 seth - 5.1-0.1.20221110.e6d057f - add package to Amusements/Games diff --git a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec index f56850105d..925d643e73 100644 --- a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec +++ b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec @@ -1,16 +1,13 @@ -%global fancy_name PrismLauncher %global real_name prismlauncher -%global repo https://github.com/%{fancy_name}/%{fancy_name} %global commit 79d5beff8d45d9a66cfa91393167fc79d3a155a9 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global filesystem_commit cd6805e94dd5d6346be1b75a54cdc27787319dd2 %global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 %global tomlplusplus_commit 0a90913abf9390b9e08ab6d3b40ac11634553f38 %global commit_date %(date '+%Y%m%d') -%global git_rel .%{commit_date}.%{shortcommit} +%global snapshot_info %{commit_date}.%{shortcommit} %bcond_with qt6 @@ -29,10 +26,6 @@ %global build_platform unknown -%if 0%{?suse_version} -%global build_platform openSUSE -%endif - %if 0%{?fedora} %global build_platform Fedora %endif @@ -45,85 +38,57 @@ %global build_platform CentOS %endif -%if %{with qt6} -Name: prismlauncher-nightly -%else -Name: prismlauncher-qt5-nightly -%endif -Version: 6.0 -Release: 0.1%{?git_rel}%{?dist} -Summary: Minecraft launcher with ability to manage multiple instances -License: GPL-3.0-only -%if 0%{?suse_version} -Group: Amusements/Games/Action/Other -%else -Group: Amusements/Games -%endif -URL: https://prismlauncher.org/ -Source0: %{repo}/archive/%{commit}/%{fancy_name}-%{shortcommit}.tar.gz -Source1: https://github.com/PrismLauncher/libnbtplusplus/archive/%{libnbtplusplus_commit}/libnbtplusplus-%{libnbtplusplus_commit}.tar.gz -Source2: https://github.com/stachenov/quazip/archive/%{quazip_commit}/quazip-%{quazip_commit}.tar.gz -Source3: https://github.com/marzer/tomlplusplus/archive/%{tomlplusplus_commit}/tomlplusplus-%{tomlplusplus_commit}.tar.gz -Source4: https://github.com/gulrak/filesystem/archive/%{filesystem_commit}/filesystem-%{filesystem_commit}.tar.gz +Name: prismlauncher-qt5-nightly +Version: 6.0^%{snapshot_info} +Release: 1%{?dist} +Summary: Minecraft launcher with ability to manage multiple instances +License: GPL-3.0-only +Group: Amusements/Games +URL: https://prismlauncher.org/ +Source0: https://github.com/PrismLauncher/PrismLauncher/archive/%{commit}/%{real_name}-%{shortcommit}.tar.gz +Source1: https://github.com/PrismLauncher/libnbtplusplus/archive/%{libnbtplusplus_commit}/libnbtplusplus-%{libnbtplusplus_commit}.tar.gz +Source2: https://github.com/stachenov/quazip/archive/%{quazip_commit}/quazip-%{quazip_commit}.tar.gz +Source3: https://github.com/marzer/tomlplusplus/archive/%{tomlplusplus_commit}/tomlplusplus-%{tomlplusplus_commit}.tar.gz -BuildRequires: cmake >= 3.15 -BuildRequires: extra-cmake-modules -BuildRequires: gcc-c++ -BuildRequires: java-devel - -%if 0%{?suse_version} -BuildRequires: appstream-glib -%else -BuildRequires: libappstream-glib -%endif - -BuildRequires: desktop-file-utils -BuildRequires: cmake(Qt%{qt_version}Concurrent) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Core) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Gui) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Network) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Test) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Widgets) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Xml) >= %{min_qt_version} +BuildRequires: cmake >= 3.15 +BuildRequires: extra-cmake-modules +BuildRequires: gcc-c++ +BuildRequires: java-devel >= 17 +BuildRequires: desktop-file-utils +BuildRequires: libappstream-glib +BuildRequires: cmake(ghc_filesystem) +BuildRequires: cmake(Qt%{qt_version}Concurrent) >= %{min_qt_version} +BuildRequires: cmake(Qt%{qt_version}Core) >= %{min_qt_version} +BuildRequires: cmake(Qt%{qt_version}Gui) >= %{min_qt_version} +BuildRequires: cmake(Qt%{qt_version}Network) >= %{min_qt_version} +BuildRequires: cmake(Qt%{qt_version}Test) >= %{min_qt_version} +BuildRequires: cmake(Qt%{qt_version}Widgets) >= %{min_qt_version} +BuildRequires: cmake(Qt%{qt_version}Xml) >= %{min_qt_version} %if %{with qt6} -BuildRequires: cmake(Qt6Core5Compat) +BuildRequires: cmake(Qt6Core5Compat) %endif -BuildRequires: pkgconfig(scdoc) -BuildRequires: zlib-devel +BuildRequires: pkgconfig(scdoc) +BuildRequires: pkgconfig(zlib) -# Prism Launcher requires QuaZip >= 1.3 -%if 0%{?suse_version} >= 1550 -BuildRequires: cmake(QuaZip-Qt%{qt_version}) -%endif +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils -%if 0%{?suse_version} -Requires: %{!?with_qt6:lib}qt%{qt_version}-%{!?with_qt6:qt}imageformats -Requires: libQt%{qt_version}Svg%{qt_version} -%else -Requires: qt%{qt_version}-qtimageformats -Requires: qt%{qt_version}-qtsvg -%endif +Requires: qt%{qt_version}-qtimageformats +Requires: qt%{qt_version}-qtsvg +Requires: javapackages-filesystem +Requires: java-headless >= 17 +Requires: java-1.8.0-openjdk-headless -Recommends: java-openjdk-headless # xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 -Recommends: xrandr - +Recommends: xrandr # Prism supports enabling gamemode -%if 0%{?suse_version} -Recommends: gamemoded -%else -Recommends: gamemode -%endif +Suggests: gamemode -Conflicts: %{real_name} -Conflicts: %{real_name}-qt5 -%if %{with qt6} -Conflicts: %{real_name}-qt5-nightly -%else -Conflicts: %{real_name}-nightly -%endif +Conflicts: prismlauncher +Conflicts: prismlauncher-qt5 +Conflicts: primslauncher-nightly %description @@ -132,21 +97,21 @@ multiple installations of Minecraft at once (Fork of MultiMC) %prep -%autosetup -n %{fancy_name}-%{commit} +%autosetup -n PrismLauncher-%{commit} -tar -xvf %{SOURCE1} -C libraries +tar -xzf %{SOURCE1} -C libraries tar -xvf %{SOURCE2} -C libraries tar -xvf %{SOURCE3} -C libraries -tar -xvf %{SOURCE4} -C libraries -rmdir libraries/{quazip/,libnbtplusplus} -mv -f libraries/quazip-%{quazip_commit} libraries/quazip + +rmdir libraries/{libnbtplusplus,quazip,tomlplusplus}/ mv -f libraries/libnbtplusplus-%{libnbtplusplus_commit} libraries/libnbtplusplus -mv -f libraries/tomlplusplus-%{tomlplusplus_commit}/* libraries/tomlplusplus -mv -f libraries/filesystem-%{filesystem_commit}/* libraries/filesystem +mv -f libraries/quazip-%{quazip_commit} libraries/quazip +mv -f libraries/tomlplusplus-%{tomlplusplus_commit} libraries/tomlplusplus # Do not set RPATH sed -i "s|\$ORIGIN/||" CMakeLists.txt + %build %cmake \ -DLauncher_QT_VERSION_MAJOR="%{qt_version}" \ @@ -160,18 +125,41 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt %cmake_build + %install %cmake_install -%if 0%{?suse_version} > 1500 || 0%{?fedora} > 35 -appstream-util validate-relax --nonet \ - %{buildroot}%{_datadir}/metainfo/org.prismlauncher.PrismLauncher.metainfo.xml -%endif %check %ctest + +appstream-util validate-relax --nonet \ + %{buildroot}%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml + desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop + +%post +/usr/bin/update-desktop-database &> /dev/null || : +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +/bin/touch --no-create %{_datadir}/mime/packages &>/dev/null || : + + +%postun +/usr/bin/update-desktop-database &> /dev/null || : + +if [ $1 -eq 0 ] ; then + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : +fi + + +%posttrans +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : + + %files %doc README.md %license LICENSE COPYING.md @@ -180,13 +168,17 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.Pri %{_datadir}/%{real_name}/NewLaunch.jar %{_datadir}/%{real_name}/JavaCheck.jar %{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop -%{_datadir}/metainfo/org.prismlauncher.PrismLauncher.metainfo.xml +%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml %{_datadir}/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg %{_datadir}/mime/packages/modrinth-mrpack-mime.xml %{_mandir}/man?/prismlauncher.* %changelog +* Mon Dec 05 2022 seth - 6.0^20221204.79d5bef-1 +- revise file to better follow fedora packaging guidelines and add java 8 as a + dependency + * Thu Nov 10 2022 seth - 5.1-0.1.20221110.e6d057f - add package to Amusements/Games diff --git a/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec b/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec index 61b4a3e887..e3824bba0e 100644 --- a/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec +++ b/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec @@ -1,6 +1,4 @@ -%global fancy_name PrismLauncher -%global real_name prismlauncher -%global repo https://github.com/%{fancy_name}/%{fancy_name} +%define real_name prismlauncher %global tomlplusplus_commit 0a90913abf9390b9e08ab6d3b40ac11634553f38 %bcond_with qt6 @@ -19,10 +17,6 @@ %global build_platform unknown -%if 0%{?suse_version} -%global build_platform openSUSE -%endif - %if 0%{?fedora} %global build_platform Fedora %endif @@ -35,81 +29,54 @@ %global build_platform CentOS %endif -%if %{with qt6} -Name: prismlauncher -%else -Name: prismlauncher-qt5 -%endif -Version: 5.2 -Release: 2%{?dist} -Summary: Minecraft launcher with ability to manage multiple instances -License: GPL-3.0-only -%if 0%{?suse_version} -Group: Amusements/Games/Action/Other -%else -Group: Amusements/Games -%endif -URL: https://prismlauncher.org/ -Source0: %{repo}/releases/download/%{version}/%{fancy_name}-%{version}.tar.gz -Source1: https://github.com/marzer/tomlplusplus/archive/%{tomlplusplus_commit}/tomlplusplus-%{tomlplusplus_commit}.tar.gz -Patch0: fix-disable-FLOAT16-in-toml.patch +Name: prismlauncher-qt5 +Version: 5.2 +Release: 3%{?dist} +Summary: Minecraft launcher with ability to manage multiple instances +License: GPL-3.0-only +Group: Amusements/Games +URL: https://prismlauncher.org/ +Source0: https://github.com/PrismLauncher/PrismLauncher/releases/download/%{version}/%{real_name}-%{version}.tar.gz +Source1: https://github.com/marzer/tomlplusplus/archive/%{tomlplusplus_commit}/tomlplusplus-%{tomlplusplus_commit}.tar.gz +Patch0: fix-disable-FLOAT16-in-toml.patch -BuildRequires: cmake >= 3.15 -BuildRequires: extra-cmake-modules -BuildRequires: gcc-c++ -BuildRequires: java-devel - -%if 0%{?suse_version} -BuildRequires: appstream-glib -%else -BuildRequires: libappstream-glib -%endif - -BuildRequires: desktop-file-utils -BuildRequires: cmake(Qt%{qt_version}Concurrent) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Core) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Gui) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Network) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Test) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Widgets) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Xml) >= %{min_qt_version} +BuildRequires: cmake >= 3.15 +BuildRequires: extra-cmake-modules +BuildRequires: gcc-c++ +BuildRequires: java-devel >= 17 +BuildRequires: desktop-file-utils +BuildRequires: libappstream-glib +BuildRequires: cmake(ghc_filesystem) +BuildRequires: cmake(Qt%{qt_version}Concurrent) >= %{min_qt_version} +BuildRequires: cmake(Qt%{qt_version}Core) >= %{min_qt_version} +BuildRequires: cmake(Qt%{qt_version}Gui) >= %{min_qt_version} +BuildRequires: cmake(Qt%{qt_version}Network) >= %{min_qt_version} +BuildRequires: cmake(Qt%{qt_version}Test) >= %{min_qt_version} +BuildRequires: cmake(Qt%{qt_version}Widgets) >= %{min_qt_version} +BuildRequires: cmake(Qt%{qt_version}Xml) >= %{min_qt_version} %if %{with qt6} -BuildRequires: cmake(Qt6Core5Compat) +BuildRequires: cmake(Qt6Core5Compat) %endif -BuildRequires: pkgconfig(scdoc) -BuildRequires: zlib-devel +BuildRequires: pkgconfig(scdoc) +BuildRequires: pkgconfig(zlib) -# Prism Launcher requires QuaZip >= 1.3 -%if 0%{?suse_version} >= 1550 -BuildRequires: cmake(QuaZip-Qt%{qt_version}) -%endif +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils -%if 0%{?suse_version} -Requires: %{!?with_qt6:lib}qt%{qt_version}-%{!?with_qt6:qt}imageformats -Requires: libQt%{qt_version}Svg%{qt_version} -%else -Requires: qt%{qt_version}-qtimageformats -Requires: qt%{qt_version}-qtsvg -%endif +Requires: qt%{qt_version}-qtimageformats +Requires: qt%{qt_version}-qtsvg +Requires: javapackages-filesystem +Requires: java-headless >= 17 +Requires: java-1.8.0-openjdk-headless -Recommends: java-openjdk-headless # xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 -Recommends: xrandr - +Recommends: xrandr # Prism supports enabling gamemode -%if 0%{?suse_version} -Recommends: gamemoded -%else -Recommends: gamemode -%endif +Suggests: gamemode -%if %{with qt6} -Conflicts: %{real_name}-qt5 -%else -Conflicts: %{real_name} -%endif +Conflicts: prismlauncher %description @@ -118,7 +85,7 @@ multiple installations of Minecraft at once (Fork of MultiMC) %prep -%autosetup -n %{fancy_name}-%{version} +%autosetup -n PrismLauncher-%{version} tar -xzf %{SOURCE1} -C libraries rm -rf libraries/tomlplusplus/* @@ -127,6 +94,7 @@ mv -f libraries/tomlplusplus-%{tomlplusplus_commit}/* libraries/tomlplusplus # Do not set RPATH sed -i "s|\$ORIGIN/||" CMakeLists.txt + %build %cmake \ -DLauncher_QT_VERSION_MAJOR="%{qt_version}" \ @@ -140,18 +108,37 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt %cmake_build + %install %cmake_install -%if 0%{?suse_version} > 1500 || 0%{?fedora} > 35 -appstream-util validate-relax --nonet \ - %{buildroot}%{_datadir}/metainfo/org.prismlauncher.PrismLauncher.metainfo.xml -%endif %check %ctest + +appstream-util validate-relax --nonet \ + %{buildroot}%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml + desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop + +%post +/usr/bin/update-desktop-database &> /dev/null || : +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + + +%postun +/usr/bin/update-desktop-database &> /dev/null || : +if [ $1 -eq 0 ] ; then + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + + +%posttrans +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + + %files %doc README.md %license LICENSE COPYING.md @@ -160,32 +147,33 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.Pri %{_datadir}/%{real_name}/NewLaunch.jar %{_datadir}/%{real_name}/JavaCheck.jar %{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop -%{_datadir}/metainfo/org.prismlauncher.PrismLauncher.metainfo.xml +%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml %{_datadir}/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg %{_mandir}/man?/prismlauncher.* %changelog -* Tue Nov 15 2022 seth - 5.2-2 -- use newer version of toml++ +* Mon Dec 05 2022 seth - 5.2-3 +- revise file to better follow fedora packaging guidelines and add java 8 as a + dependency -* Tue Nov 15 2022 root - 5.2-1 -- new version +* Tue Nov 15 2022 seth - 5.2-2 +- use newer version of toml++ to fix issues on aarch64 + +* Tue Nov 15 2022 seth - 5.2-1 +- update to 5.2 * Thu Nov 10 2022 seth - 5.1-2 - add package to Amusements/Games -* Tue Nov 01 2022 root - 5.1-1 -- new version - -* Wed Oct 19 2022 seth - 5.0-4 -- fix opensuse deps +* Tue Nov 01 2022 seth - 5.1-1 +- update to 5.1 * Wed Oct 19 2022 seth - 5.0-3 - add missing deps and build with qt6 by default * Wed Oct 19 2022 seth - 5.0-2 -- add change-jars-path.patch and allow for building on opensuse +- add change-jars-path.patch to allow for package-specific jar path * Wed Oct 19 2022 seth - 5.0-1 - update to version 5.0 @@ -198,63 +186,3 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.Pri * Tue Oct 18 2022 Cappy Ishihara - 1.4.2-1 - Repackaged as Prism Launcher - -* Thu Sep 08 2022 Jan Drögehoff - 1.4.2-1 -- Update to 1.4.2 - -* Fri Jul 29 2022 Jan Drögehoff - 1.4.1-1 -- Update to 1.4.1 - -* Sat Jul 23 2022 Jan Drögehoff - 1.4.0-2 -- Recommend gamemode - -* Sat Jul 23 2022 Jan Drögehoff - 1.4.0-1 -- Update to 1.4.0 - -* Wed Jun 15 2022 Jan Drögehoff - 1.3.2-2 -- Fixing OpenSuse Tumbleweed compilation - -* Sun Jun 12 2022 Jan Drögehoff - 1.3.2-1 -- Update to 1.3.2 - -* Mon May 30 2022 Jan Drögehoff - 1.3.1-1 -- Update to 1.3.1 - -* Mon May 23 2022 Jan Drögehoff - 1.3.0-1 -- Update to 1.3.0 - -* Sat May 14 2022 Jan Drögehoff - 1.2.2-1 -- Update to 1.2.2 - -* Mon Apr 25 2022 Jan Drögehoff - 1.2.1-2 -- Correct dependencies for openSUSE - -* Wed Apr 20 2022 Jan Drögehoff - 1.2.1-1 -- Update to 1.2.1 - -* Tue Apr 19 2022 Jan Drögehoff - 1.2.0-1 -- Update to 1.2.0 - -* Tue Apr 19 2022 Jan Drögehoff - 1.1.1-3 -- Correct dependencies for openSuse - -* Wed Apr 06 2022 Jan Drögehoff - 1.1.1-2 -- Add missing dependencies - -* Mon Mar 28 2022 Jan Drögehoff - 1.1.1-1 -- Update to 1.1.1 - -* Wed Mar 16 2022 Jan Drögehoff - 1.1.0-1 -- Update to 1.1.0 - -* Mon Jan 24 2022 Jan Drögehoff - 1.0.5-2 -- remove explicit dependencies, correct dependencies to work on OpenSuse - -* Sun Jan 09 2022 Jan Drögehoff - 1.0.5-1 -- Update to 1.0.5 - -* Sun Jan 09 2022 Jan Drögehoff - 1.0.4-2 -- rework spec - -* Fri Jan 7 2022 getchoo - 1.0.4-1 -- Initial polymc spec diff --git a/anda/games/prismlauncher/prismlauncher.spec b/anda/games/prismlauncher/prismlauncher.spec index fcaaa79365..3f5c43dfde 100644 --- a/anda/games/prismlauncher/prismlauncher.spec +++ b/anda/games/prismlauncher/prismlauncher.spec @@ -1,6 +1,3 @@ -%global fancy_name PrismLauncher -%global real_name prismlauncher -%global repo https://github.com/%{fancy_name}/%{fancy_name} %global tomlplusplus_commit 0a90913abf9390b9e08ab6d3b40ac11634553f38 %bcond_without qt6 @@ -19,10 +16,6 @@ %global build_platform unknown -%if 0%{?suse_version} -%global build_platform openSUSE -%endif - %if 0%{?fedora} %global build_platform Fedora %endif @@ -35,81 +28,52 @@ %global build_platform CentOS %endif -%if %{with qt6} -Name: prismlauncher -%else -Name: prismlauncher-qt5 -%endif -Version: 5.2 -Release: 2%{?dist} -Summary: Minecraft launcher with ability to manage multiple instances -License: GPL-3.0-only -%if 0%{?suse_version} -Group: Amusements/Games/Action/Other -%else -Group: Amusements/Games -%endif -URL: https://prismlauncher.org/ -Source0: %{repo}/releases/download/%{version}/%{fancy_name}-%{version}.tar.gz -Source1: https://github.com/marzer/tomlplusplus/archive/%{tomlplusplus_commit}/tomlplusplus-%{tomlplusplus_commit}.tar.gz -Patch0: fix-disable-FLOAT16-in-toml.patch +Name: prismlauncher +Version: 5.2 +Release: 3%{?dist} +Summary: Minecraft launcher with ability to manage multiple instances +License: GPL-3.0-only +Group: Amusements/Games +URL: https://prismlauncher.org/ +Source0: https://github.com/PrismLauncher/PrismLauncher/releases/download/%{version}/%{name}-%{version}.tar.gz +Source1: https://github.com/marzer/tomlplusplus/archive/%{tomlplusplus_commit}/tomlplusplus-%{tomlplusplus_commit}.tar.gz +Patch0: fix-disable-FLOAT16-in-toml.patch -BuildRequires: cmake >= 3.15 -BuildRequires: extra-cmake-modules -BuildRequires: gcc-c++ -BuildRequires: java-devel - -%if 0%{?suse_version} -BuildRequires: appstream-glib -%else -BuildRequires: libappstream-glib -%endif - -BuildRequires: desktop-file-utils -BuildRequires: cmake(Qt%{qt_version}Concurrent) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Core) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Gui) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Network) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Test) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Widgets) >= %{min_qt_version} -BuildRequires: cmake(Qt%{qt_version}Xml) >= %{min_qt_version} +BuildRequires: cmake >= 3.15 +BuildRequires: extra-cmake-modules +BuildRequires: gcc-c++ +BuildRequires: java-devel >= 17 +BuildRequires: desktop-file-utils +BuildRequires: libappstream-glib +BuildRequires: cmake(ghc_filesystem) +BuildRequires: cmake(Qt%{qt_version}Concurrent) >= %{min_qt_version} +BuildRequires: cmake(Qt%{qt_version}Core) >= %{min_qt_version} +BuildRequires: cmake(Qt%{qt_version}Gui) >= %{min_qt_version} +BuildRequires: cmake(Qt%{qt_version}Network) >= %{min_qt_version} +BuildRequires: cmake(Qt%{qt_version}Test) >= %{min_qt_version} +BuildRequires: cmake(Qt%{qt_version}Widgets) >= %{min_qt_version} +BuildRequires: cmake(Qt%{qt_version}Xml) >= %{min_qt_version} %if %{with qt6} -BuildRequires: cmake(Qt6Core5Compat) +BuildRequires: cmake(Qt6Core5Compat) %endif -BuildRequires: pkgconfig(scdoc) -BuildRequires: zlib-devel +BuildRequires: pkgconfig(scdoc) +BuildRequires: pkgconfig(zlib) -# Prism Launcher requires QuaZip >= 1.3 -%if 0%{?suse_version} >= 1550 -BuildRequires: cmake(QuaZip-Qt%{qt_version}) -%endif +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils -%if 0%{?suse_version} -Requires: %{!?with_qt6:lib}qt%{qt_version}-%{!?with_qt6:qt}imageformats -Requires: libQt%{qt_version}Svg%{qt_version} -%else -Requires: qt%{qt_version}-qtimageformats -Requires: qt%{qt_version}-qtsvg -%endif +Requires: qt%{qt_version}-qtimageformats +Requires: qt%{qt_version}-qtsvg +Requires: javapackages-filesystem +Requires: java-headless >= 17 +Requires: java-1.8.0-openjdk-headless -Recommends: java-openjdk-headless # xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 -Recommends: xrandr - +Recommends: xrandr # Prism supports enabling gamemode -%if 0%{?suse_version} -Recommends: gamemoded -%else -Recommends: gamemode -%endif - -%if %{with qt6} -Conflicts: %{real_name}-qt5 -%else -Conflicts: %{real_name} -%endif +Suggests: gamemode %description @@ -118,7 +82,7 @@ multiple installations of Minecraft at once (Fork of MultiMC) %prep -%autosetup -n %{fancy_name}-%{version} +%autosetup -n PrismLauncher-%{version} tar -xzf %{SOURCE1} -C libraries rm -rf libraries/tomlplusplus/* @@ -127,6 +91,7 @@ mv -f libraries/tomlplusplus-%{tomlplusplus_commit}/* libraries/tomlplusplus # Do not set RPATH sed -i "s|\$ORIGIN/||" CMakeLists.txt + %build %cmake \ -DLauncher_QT_VERSION_MAJOR="%{qt_version}" \ @@ -140,52 +105,73 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt %cmake_build + %install %cmake_install -%if 0%{?suse_version} > 1500 || 0%{?fedora} > 35 -appstream-util validate-relax --nonet \ - %{buildroot}%{_datadir}/metainfo/org.prismlauncher.PrismLauncher.metainfo.xml -%endif %check %ctest + +appstream-util validate-relax --nonet \ + %{buildroot}%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml + desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop + +%post +/usr/bin/update-desktop-database &> /dev/null || : +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + + +%postun +/usr/bin/update-desktop-database &> /dev/null || : +if [ $1 -eq 0 ] ; then + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + + +%posttrans +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + + %files %doc README.md %license LICENSE COPYING.md -%dir %{_datadir}/%{real_name} +%dir %{_datadir}/%{name} %{_bindir}/prismlauncher -%{_datadir}/%{real_name}/NewLaunch.jar -%{_datadir}/%{real_name}/JavaCheck.jar +%{_datadir}/%{name}/NewLaunch.jar +%{_datadir}/%{name}/JavaCheck.jar %{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop -%{_datadir}/metainfo/org.prismlauncher.PrismLauncher.metainfo.xml +%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml %{_datadir}/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg %{_mandir}/man?/prismlauncher.* %changelog -* Tue Nov 15 2022 seth - 5.2-2 -- use newer version of toml++ +* Mon Dec 05 2022 seth - 5.2-3 +- revise file to better follow fedora packaging guidelines and add java 8 as a + dependency -* Tue Nov 15 2022 root - 5.2-1 -- new version + +* Tue Nov 15 2022 seth - 5.2-2 +- use newer version of toml++ to fix issues on aarch64 + +* Tue Nov 15 2022 seth - 5.2-1 +- update to 5.2 * Thu Nov 10 2022 seth - 5.1-2 - add package to Amusements/Games -* Tue Nov 01 2022 root - 5.1-1 -- new version - -* Wed Oct 19 2022 seth - 5.0-4 -- fix opensuse deps +* Tue Nov 01 2022 seth - 5.1-1 +- update to 5.1 * Wed Oct 19 2022 seth - 5.0-3 - add missing deps and build with qt6 by default * Wed Oct 19 2022 seth - 5.0-2 -- add change-jars-path.patch and allow for building on opensuse +- add change-jars-path.patch to allow for package-specific jar path * Wed Oct 19 2022 seth - 5.0-1 - update to version 5.0 @@ -198,63 +184,3 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.Pri * Tue Oct 18 2022 Cappy Ishihara - 1.4.2-1 - Repackaged as Prism Launcher - -* Thu Sep 08 2022 Jan Drögehoff - 1.4.2-1 -- Update to 1.4.2 - -* Fri Jul 29 2022 Jan Drögehoff - 1.4.1-1 -- Update to 1.4.1 - -* Sat Jul 23 2022 Jan Drögehoff - 1.4.0-2 -- Recommend gamemode - -* Sat Jul 23 2022 Jan Drögehoff - 1.4.0-1 -- Update to 1.4.0 - -* Wed Jun 15 2022 Jan Drögehoff - 1.3.2-2 -- Fixing OpenSuse Tumbleweed compilation - -* Sun Jun 12 2022 Jan Drögehoff - 1.3.2-1 -- Update to 1.3.2 - -* Mon May 30 2022 Jan Drögehoff - 1.3.1-1 -- Update to 1.3.1 - -* Mon May 23 2022 Jan Drögehoff - 1.3.0-1 -- Update to 1.3.0 - -* Sat May 14 2022 Jan Drögehoff - 1.2.2-1 -- Update to 1.2.2 - -* Mon Apr 25 2022 Jan Drögehoff - 1.2.1-2 -- Correct dependencies for openSUSE - -* Wed Apr 20 2022 Jan Drögehoff - 1.2.1-1 -- Update to 1.2.1 - -* Tue Apr 19 2022 Jan Drögehoff - 1.2.0-1 -- Update to 1.2.0 - -* Tue Apr 19 2022 Jan Drögehoff - 1.1.1-3 -- Correct dependencies for openSuse - -* Wed Apr 06 2022 Jan Drögehoff - 1.1.1-2 -- Add missing dependencies - -* Mon Mar 28 2022 Jan Drögehoff - 1.1.1-1 -- Update to 1.1.1 - -* Wed Mar 16 2022 Jan Drögehoff - 1.1.0-1 -- Update to 1.1.0 - -* Mon Jan 24 2022 Jan Drögehoff - 1.0.5-2 -- remove explicit dependencies, correct dependencies to work on OpenSuse - -* Sun Jan 09 2022 Jan Drögehoff - 1.0.5-1 -- Update to 1.0.5 - -* Sun Jan 09 2022 Jan Drögehoff - 1.0.4-2 -- rework spec - -* Fri Jan 7 2022 getchoo - 1.0.4-1 -- Initial polymc spec From c2004c65d8265ad85fca75953ba65234d7a78ab3 Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 5 Dec 2022 02:25:07 -0500 Subject: [PATCH 05/21] support auto updating more packages --- anda/adwaita++-icons/chkupdate.py | 27 +++++++++++++++++++ anda/apps/openasar-canary/chkupdate.py | 23 ++++++++++++++++ .../apps/openasar-canary/openasar-canary.spec | 2 ++ .../budgie/budgie-extras/chkupdate.py | 27 +++++++++++++++++++ anda/moby-extras/moby-buildx/chkupdate.py | 27 +++++++++++++++++++ anda/moby-extras/moby-compose/chkupdate.py | 27 +++++++++++++++++++ anda/rust/bat-extras/chkupdate.py | 27 +++++++++++++++++++ anda/rust/pop-launcher/chkupdate.py | 27 +++++++++++++++++++ anda/rust/sccache/chkupdate.py | 27 +++++++++++++++++++ anda/rust/youki/chkupdate.py | 27 +++++++++++++++++++ anda/rust/zellij/chkupdate.py | 27 +++++++++++++++++++ anda/tools/appimagelauncher/chkupdate.py | 27 +++++++++++++++++++ anda/tools/gcm-core/chkupdate.py | 27 +++++++++++++++++++ 13 files changed, 322 insertions(+) create mode 100644 anda/adwaita++-icons/chkupdate.py create mode 100644 anda/apps/openasar-canary/chkupdate.py create mode 100644 anda/desktops/budgie/budgie-extras/chkupdate.py create mode 100644 anda/moby-extras/moby-buildx/chkupdate.py create mode 100644 anda/moby-extras/moby-compose/chkupdate.py create mode 100644 anda/rust/bat-extras/chkupdate.py create mode 100644 anda/rust/pop-launcher/chkupdate.py create mode 100644 anda/rust/sccache/chkupdate.py create mode 100644 anda/rust/youki/chkupdate.py create mode 100644 anda/rust/zellij/chkupdate.py create mode 100644 anda/tools/appimagelauncher/chkupdate.py create mode 100644 anda/tools/gcm-core/chkupdate.py diff --git a/anda/adwaita++-icons/chkupdate.py b/anda/adwaita++-icons/chkupdate.py new file mode 100644 index 0000000000..36fecb566c --- /dev/null +++ b/anda/adwaita++-icons/chkupdate.py @@ -0,0 +1,27 @@ +import os +import requests +import re + +NAME = "adwaita++-icons" +REPO = "Bonandry/adwaita-plus" +REGEX_VER = r"Version:\s*([\.\d]+)\n" +SPEC = f"{NAME}.spec" +LINK = f"https://api.github.com/repos/{REPO}/releases/latest" + + +token = os.getenv("GITHUB_TOKEN") +ver = requests.get(LINK, headers={"Authorization": f"Bearer {token}"}).json()[ + "tag_name" +][1:] + +with open(SPEC, "r") as f: + matches = re.findall(REGEX_VER, f.read()) + +if not len(matches): + exit(f"{NAME}: Failed to match regex!") +cur = matches[0] +if ver == cur: + exit(f"{NAME}: Up to date!") + +print(f"{NAME}: {cur} -> {ver}") +os.system(f"rpmdev-bumpspec -n {ver} {SPEC}") diff --git a/anda/apps/openasar-canary/chkupdate.py b/anda/apps/openasar-canary/chkupdate.py new file mode 100644 index 0000000000..02e3e48131 --- /dev/null +++ b/anda/apps/openasar-canary/chkupdate.py @@ -0,0 +1,23 @@ +import requests +import re +import os + + +NAME = "openasar-canary" +REPO = "GooseMod/OpenAsar" +REGEX_SHA = r"%define commit (.+)" +SPEC = f"{NAME}.spec" +LINK = f"https://api.github.com/repos/{REPO}/commits/HEAD" + +token = os.getenv("GITHUB_TOKEN") +sha = requests.get(LINK, headers={"Authorization": f"Bearer {token}"}).json()["sha"] +f = open(SPEC, "r") + +matches = re.findall(REGEX_SHA, txt := f.read()) +if not len(matches): + exit(f"{NAME}: Failed to match regex!") +cur = matches[0] + +if sha == cur: + exit(f"{NAME}: Up to date!") +print(f"{NAME}: {cur} -> {sha}") diff --git a/anda/apps/openasar-canary/openasar-canary.spec b/anda/apps/openasar-canary/openasar-canary.spec index c8596ae954..8b60d95c08 100644 --- a/anda/apps/openasar-canary/openasar-canary.spec +++ b/anda/apps/openasar-canary/openasar-canary.spec @@ -1,3 +1,5 @@ +%define commit ad9b161744b27acc5e333ee70df11afca09301ef + Name: openasar-canary Version: nightly.%{autogitdate} Release: 1%{?dist} diff --git a/anda/desktops/budgie/budgie-extras/chkupdate.py b/anda/desktops/budgie/budgie-extras/chkupdate.py new file mode 100644 index 0000000000..76360ad614 --- /dev/null +++ b/anda/desktops/budgie/budgie-extras/chkupdate.py @@ -0,0 +1,27 @@ +import os +import requests +import re + +NAME = "budgie-extras" +REPO = "UbuntuBudgie/budgie-extras" +REGEX_VER = r"Version:\s*([\.\d]+)\n" +SPEC = f"{NAME}.spec" +LINK = f"https://api.github.com/repos/{REPO}/releases/latest" + + +token = os.getenv("GITHUB_TOKEN") +ver = requests.get(LINK, headers={"Authorization": f"Bearer {token}"}).json()[ + "tag_name" +][1:] + +with open(SPEC, "r") as f: + matches = re.findall(REGEX_VER, f.read()) + +if not len(matches): + exit(f"{NAME}: Failed to match regex!") +cur = matches[0] +if ver == cur: + exit(f"{NAME}: Up to date!") + +print(f"{NAME}: {cur} -> {ver}") +os.system(f"rpmdev-bumpspec -n {ver} {SPEC}") diff --git a/anda/moby-extras/moby-buildx/chkupdate.py b/anda/moby-extras/moby-buildx/chkupdate.py new file mode 100644 index 0000000000..b61367dc4b --- /dev/null +++ b/anda/moby-extras/moby-buildx/chkupdate.py @@ -0,0 +1,27 @@ +import os +import requests +import re + +NAME = "moby-buildx" +REPO = "docker/buildx" +REGEX_VER = r"Version:\s*([\.\d]+)\n" +SPEC = f"{NAME}.spec" +LINK = f"https://api.github.com/repos/{REPO}/releases/latest" + + +token = os.getenv("GITHUB_TOKEN") +ver = requests.get(LINK, headers={"Authorization": f"Bearer {token}"}).json()[ + "tag_name" +][1:] + +with open(SPEC, "r") as f: + matches = re.findall(REGEX_VER, f.read()) + +if not len(matches): + exit(f"{NAME}: Failed to match regex!") +cur = matches[0] +if ver == cur: + exit(f"{NAME}: Up to date!") + +print(f"{NAME}: {cur} -> {ver}") +os.system(f"rpmdev-bumpspec -n {ver} {SPEC}") diff --git a/anda/moby-extras/moby-compose/chkupdate.py b/anda/moby-extras/moby-compose/chkupdate.py new file mode 100644 index 0000000000..dd79458b2e --- /dev/null +++ b/anda/moby-extras/moby-compose/chkupdate.py @@ -0,0 +1,27 @@ +import os +import requests +import re + +NAME = "moby-compose" +REPO = "docker/compose" +REGEX_VER = r"Version:\s*([\.\d]+)\n" +SPEC = f"{NAME}.spec" +LINK = f"https://api.github.com/repos/{REPO}/releases/latest" + + +token = os.getenv("GITHUB_TOKEN") +ver = requests.get(LINK, headers={"Authorization": f"Bearer {token}"}).json()[ + "tag_name" +][1:] + +with open(SPEC, "r") as f: + matches = re.findall(REGEX_VER, f.read()) + +if not len(matches): + exit(f"{NAME}: Failed to match regex!") +cur = matches[0] +if ver == cur: + exit(f"{NAME}: Up to date!") + +print(f"{NAME}: {cur} -> {ver}") +os.system(f"rpmdev-bumpspec -n {ver} {SPEC}") diff --git a/anda/rust/bat-extras/chkupdate.py b/anda/rust/bat-extras/chkupdate.py new file mode 100644 index 0000000000..5eaa9bfedc --- /dev/null +++ b/anda/rust/bat-extras/chkupdate.py @@ -0,0 +1,27 @@ +import os +import requests +import re + +NAME = "bat-extras" +REPO = "eth-p/bat-extras" +REGEX_VER = r"Version:\s*([\.\d]+)\n" +SPEC = f"{NAME}.spec" +LINK = f"https://api.github.com/repos/{REPO}/releases/latest" + + +token = os.getenv("GITHUB_TOKEN") +ver = requests.get(LINK, headers={"Authorization": f"Bearer {token}"}).json()[ + "tag_name" +][1:] + +with open(SPEC, "r") as f: + matches = re.findall(REGEX_VER, f.read()) + +if not len(matches): + exit(f"{NAME}: Failed to match regex!") +cur = matches[0] +if ver == cur: + exit(f"{NAME}: Up to date!") + +print(f"{NAME}: {cur} -> {ver}") +os.system(f"rpmdev-bumpspec -n {ver} {SPEC}") diff --git a/anda/rust/pop-launcher/chkupdate.py b/anda/rust/pop-launcher/chkupdate.py new file mode 100644 index 0000000000..6b742ea67d --- /dev/null +++ b/anda/rust/pop-launcher/chkupdate.py @@ -0,0 +1,27 @@ +import os +import requests +import re + +NAME = "pop-launcher" +REPO = "pop-os/launcher" +REGEX_VER = r"Version:\s*([\.\d]+)\n" +SPEC = f"{NAME}.spec" +LINK = f"https://api.github.com/repos/{REPO}/releases/latest" + + +token = os.getenv("GITHUB_TOKEN") +ver = requests.get(LINK, headers={"Authorization": f"Bearer {token}"}).json()[ + "tag_name" +] + +with open(SPEC, "r") as f: + matches = re.findall(REGEX_VER, f.read()) + +if not len(matches): + exit(f"{NAME}: Failed to match regex!") +cur = matches[0] +if ver == cur: + exit(f"{NAME}: Up to date!") + +print(f"{NAME}: {cur} -> {ver}") +os.system(f"rpmdev-bumpspec -n {ver} {SPEC}") diff --git a/anda/rust/sccache/chkupdate.py b/anda/rust/sccache/chkupdate.py new file mode 100644 index 0000000000..2f328d6ad9 --- /dev/null +++ b/anda/rust/sccache/chkupdate.py @@ -0,0 +1,27 @@ +import os +import requests +import re + +NAME = "rust-sccache" +REPO = "mozilla/sccache" +REGEX_VER = r"Version:\s*([\.\d]+)\n" +SPEC = f"{NAME}.spec" +LINK = f"https://api.github.com/repos/{REPO}/releases/latest" + + +token = os.getenv("GITHUB_TOKEN") +ver = requests.get(LINK, headers={"Authorization": f"Bearer {token}"}).json()[ + "tag_name" +][1:] + +with open(SPEC, "r") as f: + matches = re.findall(REGEX_VER, f.read()) + +if not len(matches): + exit(f"{NAME}: Failed to match regex!") +cur = matches[0] +if ver == cur: + exit(f"{NAME}: Up to date!") + +print(f"{NAME}: {cur} -> {ver}") +os.system(f"rpmdev-bumpspec -n {ver} {SPEC}") diff --git a/anda/rust/youki/chkupdate.py b/anda/rust/youki/chkupdate.py new file mode 100644 index 0000000000..16b2d6beda --- /dev/null +++ b/anda/rust/youki/chkupdate.py @@ -0,0 +1,27 @@ +import os +import requests +import re + +NAME = "youki" +REPO = "containers/youki" +REGEX_VER = r"Version:\s*([\.\d]+)\n" +SPEC = f"{NAME}.spec" +LINK = f"https://api.github.com/repos/{REPO}/releases/latest" + + +token = os.getenv("GITHUB_TOKEN") +ver = requests.get(LINK, headers={"Authorization": f"Bearer {token}"}).json()[ + "tag_name" +][1:] + +with open(SPEC, "r") as f: + matches = re.findall(REGEX_VER, f.read()) + +if not len(matches): + exit(f"{NAME}: Failed to match regex!") +cur = matches[0] +if ver == cur: + exit(f"{NAME}: Up to date!") + +print(f"{NAME}: {cur} -> {ver}") +os.system(f"rpmdev-bumpspec -n {ver} {SPEC}") diff --git a/anda/rust/zellij/chkupdate.py b/anda/rust/zellij/chkupdate.py new file mode 100644 index 0000000000..078f063ce3 --- /dev/null +++ b/anda/rust/zellij/chkupdate.py @@ -0,0 +1,27 @@ +import os +import requests +import re + +NAME = "rust-zellij" +REPO = "zellij-org/zellij" +REGEX_VER = r"Version:\s*([\.\d]+)\n" +SPEC = f"{NAME}.spec" +LINK = f"https://api.github.com/repos/{REPO}/releases/latest" + + +token = os.getenv("GITHUB_TOKEN") +ver = requests.get(LINK, headers={"Authorization": f"Bearer {token}"}).json()[ + "tag_name" +][1:] + +with open(SPEC, "r") as f: + matches = re.findall(REGEX_VER, f.read()) + +if not len(matches): + exit(f"{NAME}: Failed to match regex!") +cur = matches[0] +if ver == cur: + exit(f"{NAME}: Up to date!") + +print(f"{NAME}: {cur} -> {ver}") +os.system(f"rpmdev-bumpspec -n {ver} {SPEC}") diff --git a/anda/tools/appimagelauncher/chkupdate.py b/anda/tools/appimagelauncher/chkupdate.py new file mode 100644 index 0000000000..76a5b44328 --- /dev/null +++ b/anda/tools/appimagelauncher/chkupdate.py @@ -0,0 +1,27 @@ +import os +import requests +import re + +NAME = "appimagelauncher" +REPO = "TheAssassin/AppImageLauncher" +REGEX_VER = r"Version:\s*([\.\d]+)\n" +SPEC = f"{NAME}.spec" +LINK = f"https://api.github.com/repos/{REPO}/releases/latest" + + +token = os.getenv("GITHUB_TOKEN") +ver = requests.get(LINK, headers={"Authorization": f"Bearer {token}"}).json()[ + "tag_name" +][1:] + +with open(SPEC, "r") as f: + matches = re.findall(REGEX_VER, f.read()) + +if not len(matches): + exit(f"{NAME}: Failed to match regex!") +cur = matches[0] +if ver == cur: + exit(f"{NAME}: Up to date!") + +print(f"{NAME}: {cur} -> {ver}") +os.system(f"rpmdev-bumpspec -n {ver} {SPEC}") diff --git a/anda/tools/gcm-core/chkupdate.py b/anda/tools/gcm-core/chkupdate.py new file mode 100644 index 0000000000..ce4b7159c4 --- /dev/null +++ b/anda/tools/gcm-core/chkupdate.py @@ -0,0 +1,27 @@ +import os +import requests +import re + +NAME = "gcm-core" +REPO = "GitCredentialManager/git-credential-manager" +REGEX_VER = r"Version:\s*([\.\d]+)\n" +SPEC = f"{NAME}.spec" +LINK = f"https://api.github.com/repos/{REPO}/releases/latest" + + +token = os.getenv("GITHUB_TOKEN") +ver = requests.get(LINK, headers={"Authorization": f"Bearer {token}"}).json()[ + "tag_name" +][1:] + +with open(SPEC, "r") as f: + matches = re.findall(REGEX_VER, f.read()) + +if not len(matches): + exit(f"{NAME}: Failed to match regex!") +cur = matches[0] +if ver == cur: + exit(f"{NAME}: Up to date!") + +print(f"{NAME}: {cur} -> {ver}") +os.system(f"rpmdev-bumpspec -n {ver} {SPEC}") From 7653e48da9dfd9982d4337a19b7dfbed6af97658 Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 5 Dec 2022 03:50:24 -0500 Subject: [PATCH 06/21] [openasar-canary] save commit on auto update this was an L and i probably need sleep --- anda/apps/openasar-canary/chkupdate.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/anda/apps/openasar-canary/chkupdate.py b/anda/apps/openasar-canary/chkupdate.py index 02e3e48131..83da865ca4 100644 --- a/anda/apps/openasar-canary/chkupdate.py +++ b/anda/apps/openasar-canary/chkupdate.py @@ -21,3 +21,10 @@ cur = matches[0] if sha == cur: exit(f"{NAME}: Up to date!") print(f"{NAME}: {cur} -> {sha}") + +newspec = re.sub(REGEX_SHA, f"%define commit {sha}", txt) + +f.close() +f = open(SPEC, "w") +f.write(newspec) +f.close() From 10b0060bc675de1f0436eff16cf92903dab859a7 Mon Sep 17 00:00:00 2001 From: lleyton Date: Mon, 5 Dec 2022 02:06:58 -0800 Subject: [PATCH 07/21] I regret not using a GPG key (#56) --- .github/workflows/update.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 23bf17bd9d..8d3df34430 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -23,11 +23,8 @@ jobs: fetch-depth: 2 ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }} - - name: Install SSH key - uses: shimataro/ssh-key-action@v2 - with: - key: ${{ secrets.SSH_SIGNING_KEY }} - known_hosts: unnecessary + - name: Install SSH signing key + run: echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key - name: Run Update run: bash ./update.sh @@ -41,7 +38,7 @@ jobs: git config user.name "Raboneko" git config user.email "raboneko@fyralabs.com" git config gpg.format "ssh" - git config user.signingkey "${{ secrets.SSH_PUBLIC_SIGNING_KEY }}" + git config user.signingkey "${{ runner.temp }}/signing_key" git commit -S -a -m "Automatic Update: $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')" git push -u origin main fi From d799f8ab6112b1248a99c8b6e99185a5af75193d Mon Sep 17 00:00:00 2001 From: windowsboy111 Date: Mon, 5 Dec 2022 18:07:46 +0800 Subject: [PATCH 08/21] Fix build (#53) Signed-off-by: windowsboy111 Signed-off-by: windowsboy111 --- .../elementary-screenshot-tool/elementary-screenshot-tool.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/elementary/elementary-screenshot-tool/elementary-screenshot-tool.spec b/anda/desktops/elementary/elementary-screenshot-tool/elementary-screenshot-tool.spec index e9cec28499..2051c1a3c3 100644 --- a/anda/desktops/elementary/elementary-screenshot-tool/elementary-screenshot-tool.spec +++ b/anda/desktops/elementary/elementary-screenshot-tool/elementary-screenshot-tool.spec @@ -11,7 +11,7 @@ URL: https://github.com/elementary/screenshot Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz # meson: remove deprecated positional arguments from i18n.merge_file calls -Patch1: 0001-meson-remove-deprecated-positional-arguments-from-i1.patch +#Patch1: 0001-meson-remove-deprecated-positional-arguments-from-i1.patch BuildRequires: desktop-file-utils BuildRequires: gettext From 6b2f4d455f366bb8ad8645eda1e0fcf62d61a1c7 Mon Sep 17 00:00:00 2001 From: lleyton Date: Mon, 5 Dec 2022 15:19:36 -0800 Subject: [PATCH 09/21] runner.temp should exist... why doesn't it? (#57) --- .github/workflows/update.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 8d3df34430..4184fda302 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -24,7 +24,9 @@ jobs: ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }} - name: Install SSH signing key - run: echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key + run: | + mkdir -p ${{ runner.temp }} + echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key - name: Run Update run: bash ./update.sh From 5d76a6599233e9b1a68eb8f80c15e928865fc32f Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 5 Dec 2022 23:43:41 +0000 Subject: [PATCH 10/21] set strict permissions for signing key Signed-off-by: seth --- .github/workflows/update.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 4184fda302..e096a8fd1a 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -27,6 +27,7 @@ jobs: run: | mkdir -p ${{ runner.temp }} echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key + chmod 0700 ${{ runner.temp }}/signing_key - name: Run Update run: bash ./update.sh From 6271809f57d21230f3dc3b5d33b1d2b4dda06594 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 6 Dec 2022 00:54:50 +0000 Subject: [PATCH 11/21] Automatic Update: prismlauncher-nightly prismlauncher-qt5-nightly moby-compose gcm-core --- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 2 +- .../prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec | 2 +- anda/moby-extras/moby-compose/moby-compose.spec | 5 ++++- anda/tools/gcm-core/gcm-core.spec | 5 ++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 8c6fe5500c..005e62e50a 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,6 +1,6 @@ %global real_name prismlauncher -%global commit 79d5beff8d45d9a66cfa91393167fc79d3a155a9 +%global commit b29c99656e43a11cfb4397230b6ec7192d15215f %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 diff --git a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec index 925d643e73..cc5f608e61 100644 --- a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec +++ b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec @@ -1,6 +1,6 @@ %global real_name prismlauncher -%global commit 79d5beff8d45d9a66cfa91393167fc79d3a155a9 +%global commit b29c99656e43a11cfb4397230b6ec7192d15215f %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 diff --git a/anda/moby-extras/moby-compose/moby-compose.spec b/anda/moby-extras/moby-compose/moby-compose.spec index 8658883ca1..62fe0c20db 100644 --- a/anda/moby-extras/moby-compose/moby-compose.spec +++ b/anda/moby-extras/moby-compose/moby-compose.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: moby-compose -Version: 2.11.2 +Version: 2.14.0 Release: 1%{?dist} Summary: Define and run multi-container applications with Docker @@ -39,5 +39,8 @@ install -m 0755 bin/build/docker-compose %{buildroot}%{_libexecdir}/docker/cli-p %{_libexecdir}/docker/cli-plugins/docker-compose %changelog +* Tue Dec 06 2022 root - 2.14.0-1 +- new version + * Tue Oct 04 2022 Cappy Ishihara - Initial Release diff --git a/anda/tools/gcm-core/gcm-core.spec b/anda/tools/gcm-core/gcm-core.spec index 269c1a2826..469396b6b3 100644 --- a/anda/tools/gcm-core/gcm-core.spec +++ b/anda/tools/gcm-core/gcm-core.spec @@ -5,7 +5,7 @@ %global forgeurl https://github.com/GitCredentialManager/git-credential-manager Name: gcm-core -Version: 2.0.785 +Version: 2.0.877 %forgemeta -i Release: 1%{?dist} Summary: Secure, cross-platform Git credential storage @@ -45,5 +45,8 @@ install -D -m 755 out/linux/Packaging.Linux/payload/Release/%{long_name}-core %{ %changelog +* Tue Dec 06 2022 root - Packaging variables read or set by %forgemeta +- new version + * Sat Oct 22 2022 Cappy Ishihara - From 0b3175176ac5807a41faab6839d1d84c8e63243d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 6 Dec 2022 02:16:18 +0000 Subject: [PATCH 12/21] Automatic Update: elementary-camera --- .../elementary/elementary-camera/elementary-camera.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/anda/desktops/elementary/elementary-camera/elementary-camera.spec b/anda/desktops/elementary/elementary-camera/elementary-camera.spec index b97803dd25..2ef39495d9 100644 --- a/anda/desktops/elementary/elementary-camera/elementary-camera.spec +++ b/anda/desktops/elementary/elementary-camera/elementary-camera.spec @@ -3,8 +3,8 @@ Name: elementary-camera Summary: Camera app designed for elementary -Version: 6.2.0 -Release: 2%{?dist} +Version: 6.2.1 +Release: 1%{?dist} License: GPLv3 URL: https://github.com/elementary/camera @@ -68,5 +68,8 @@ appstream-util validate-relax --nonet \ %changelog +* Tue Dec 06 2022 root - 6.2.1-1 +- new version + * Sat Oct 15 2022 windowsboy111 - Repackaged for Terra From e9fcd6e2fee38766a370e60d2169a35ea57948fa Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 6 Dec 2022 03:05:47 +0000 Subject: [PATCH 13/21] Automatic Update: libhelium --- anda/lib/libhelium/libhelium.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anda/lib/libhelium/libhelium.spec b/anda/lib/libhelium/libhelium.spec index 9ac2453f7d..633ea3ae19 100644 --- a/anda/lib/libhelium/libhelium.spec +++ b/anda/lib/libhelium/libhelium.spec @@ -1,6 +1,6 @@ Summary: The Application Framework for tauOS apps Name: libhelium -Version: 1.1.6 +Version: 1.1.7 Release: 1%{?dist} License: GPLv3 URL: https://github.com/tau-OS/libhelium @@ -66,6 +66,9 @@ rm -rf %{buildroot}%{_datadir}/themes/* %{_datadir}/vala/* %changelog +* Tue Dec 06 2022 root - 1.1.7-1 +- new version + * Sat Nov 19 2022 root - 1.1.6-1 - new version From 61bce94753a93f41dee1a874bb2a83877771274a Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 5 Dec 2022 22:11:42 -0500 Subject: [PATCH 14/21] [prismlauncher] support EPEL and F35 (again) --- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 6 ++++-- .../prismlauncher-qt5-nightly.spec | 6 ++++-- anda/games/prismlauncher-qt5/prismlauncher-qt5.spec | 6 ++++-- anda/games/prismlauncher/prismlauncher.spec | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 005e62e50a..122096b991 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -30,11 +30,11 @@ %global build_platform Fedora %endif -%if 0%{?rhel_version} +%if 0%{?rhel} %global build_platform RedHat %endif -%if 0%{?centos_version} +%if 0%{?centos} %global build_platform CentOS %endif @@ -132,8 +132,10 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt %check %ctest +%if 0%{?fedora} > 35 appstream-util validate-relax --nonet \ %{buildroot}%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml +%endif desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop diff --git a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec index cc5f608e61..47c5801355 100644 --- a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec +++ b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec @@ -30,11 +30,11 @@ %global build_platform Fedora %endif -%if 0%{?rhel_version} +%if 0%{?rhel} %global build_platform RedHat %endif -%if 0%{?centos_version} +%if 0%{?centos} %global build_platform CentOS %endif @@ -133,8 +133,10 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt %check %ctest +%if 0%{?fedora} > 35 appstream-util validate-relax --nonet \ %{buildroot}%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml +%endif desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop diff --git a/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec b/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec index e3824bba0e..eed0727ec7 100644 --- a/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec +++ b/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec @@ -21,11 +21,11 @@ %global build_platform Fedora %endif -%if 0%{?rhel_version} +%if 0%{?rhel} %global build_platform RedHat %endif -%if 0%{?centos_version} +%if 0%{?centos} %global build_platform CentOS %endif @@ -116,8 +116,10 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt %check %ctest +%if 0%{?fedora} > 35 appstream-util validate-relax --nonet \ %{buildroot}%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml +%endif desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop diff --git a/anda/games/prismlauncher/prismlauncher.spec b/anda/games/prismlauncher/prismlauncher.spec index 3f5c43dfde..6b6204c4e8 100644 --- a/anda/games/prismlauncher/prismlauncher.spec +++ b/anda/games/prismlauncher/prismlauncher.spec @@ -20,11 +20,11 @@ %global build_platform Fedora %endif -%if 0%{?rhel_version} +%if 0%{?rhel} %global build_platform RedHat %endif -%if 0%{?centos_version} +%if 0%{?centos} %global build_platform CentOS %endif @@ -113,8 +113,10 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt %check %ctest +%if 0%{?fedora} > 35 appstream-util validate-relax --nonet \ %{buildroot}%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml +%endif desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop From 43145fe224136528c6c0f2a4e93b4e87b13fef65 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 6 Dec 2022 04:13:53 +0000 Subject: [PATCH 15/21] Automatic Update: libhelium --- anda/lib/libhelium/libhelium.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/anda/lib/libhelium/libhelium.spec b/anda/lib/libhelium/libhelium.spec index 633ea3ae19..ad0c24590c 100644 --- a/anda/lib/libhelium/libhelium.spec +++ b/anda/lib/libhelium/libhelium.spec @@ -1,6 +1,6 @@ Summary: The Application Framework for tauOS apps Name: libhelium -Version: 1.1.7 +Version: 1.2.0 Release: 1%{?dist} License: GPLv3 URL: https://github.com/tau-OS/libhelium @@ -66,6 +66,9 @@ rm -rf %{buildroot}%{_datadir}/themes/* %{_datadir}/vala/* %changelog +* Tue Dec 06 2022 root - 1.2.0-1 +- new version + * Tue Dec 06 2022 root - 1.1.7-1 - new version From 701b26febf7695a2c3815494e9063b032f868d89 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 6 Dec 2022 14:20:34 +0000 Subject: [PATCH 16/21] Automatic Update: prismlauncher-nightly prismlauncher-qt5-nightly --- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 2 +- .../prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 122096b991..2c8af30ed3 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,6 +1,6 @@ %global real_name prismlauncher -%global commit b29c99656e43a11cfb4397230b6ec7192d15215f +%global commit 9669377b06f12093d8b96a6b6d4f570fd5a8a790 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 diff --git a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec index 47c5801355..ce62098aad 100644 --- a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec +++ b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec @@ -1,6 +1,6 @@ %global real_name prismlauncher -%global commit b29c99656e43a11cfb4397230b6ec7192d15215f +%global commit 9669377b06f12093d8b96a6b6d4f570fd5a8a790 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 From e565f0980bf325654e0c3bcef076036ea5977619 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 6 Dec 2022 18:14:49 +0000 Subject: [PATCH 17/21] Automatic Update: discord-ptb --- anda/discord-ptb/discord-ptb.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/discord-ptb/discord-ptb.spec b/anda/discord-ptb/discord-ptb.spec index 52d4b95555..dee5301a02 100644 --- a/anda/discord-ptb/discord-ptb.spec +++ b/anda/discord-ptb/discord-ptb.spec @@ -1,5 +1,5 @@ Name: discord-ptb -Version: 0.0.35 +Version: 0.0.36 Release: %autorelease Summary: Free Voice and Text Chat for Gamers. URL: discord.com From 849ef368c70d0595ff43c838dfbbaac528e2ca19 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 6 Dec 2022 19:10:44 +0000 Subject: [PATCH 18/21] Automatic Update: openasar-canary --- anda/apps/openasar-canary/openasar-canary.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/openasar-canary/openasar-canary.spec b/anda/apps/openasar-canary/openasar-canary.spec index 8b60d95c08..3ee8f884d7 100644 --- a/anda/apps/openasar-canary/openasar-canary.spec +++ b/anda/apps/openasar-canary/openasar-canary.spec @@ -1,4 +1,4 @@ -%define commit ad9b161744b27acc5e333ee70df11afca09301ef +%define commit bb6165c1ad640ea7c45ecff2efbc01b48eaf2445 Name: openasar-canary Version: nightly.%{autogitdate} From fea46a03f2856317db2f1bbe9571bf798f1cba9a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 6 Dec 2022 20:12:23 +0000 Subject: [PATCH 19/21] Automatic Update: prismlauncher-nightly prismlauncher-qt5-nightly --- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 2 +- .../prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 2c8af30ed3..f399371fbb 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,6 +1,6 @@ %global real_name prismlauncher -%global commit 9669377b06f12093d8b96a6b6d4f570fd5a8a790 +%global commit 5ae044db93373e20add854e3be48e59e6c38421b %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 diff --git a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec index ce62098aad..6a12bfcd11 100644 --- a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec +++ b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec @@ -1,6 +1,6 @@ %global real_name prismlauncher -%global commit 9669377b06f12093d8b96a6b6d4f570fd5a8a790 +%global commit 5ae044db93373e20add854e3be48e59e6c38421b %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 From 389abea4c51c2c3d0b0dd26619169ea2f3c1d467 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 6 Dec 2022 22:12:00 +0000 Subject: [PATCH 20/21] Automatic Update: rnote --- anda/rust/rnote/rnote.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/rust/rnote/rnote.spec b/anda/rust/rnote/rnote.spec index 3d9c6fb71f..50198b2ec4 100644 --- a/anda/rust/rnote/rnote.spec +++ b/anda/rust/rnote/rnote.spec @@ -1,5 +1,5 @@ Name: rnote -Version: 0.5.8 +Version: 0.5.9 Release: %autorelease Summary: Sketch and take handwritten notes. License: GPLv3 From aed10b299730e0b0160be0c658338d5555be9102 Mon Sep 17 00:00:00 2001 From: lleyton Date: Tue, 6 Dec 2022 15:21:03 -0800 Subject: [PATCH 21/21] [packages/libhelium] Fix tau-helium dependency (#62) Co-authored-by: Lains <4886639+lainsce@users.noreply.github.com> --- anda/lib/libhelium/libhelium.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/lib/libhelium/libhelium.spec b/anda/lib/libhelium/libhelium.spec index ad0c24590c..3925e68d54 100644 --- a/anda/lib/libhelium/libhelium.spec +++ b/anda/lib/libhelium/libhelium.spec @@ -22,7 +22,7 @@ Requires: libbismuth Requires: gtk4 >= 4.4 Requires: glib2 >= 2.66.0 Requires: libgee >= 0.20 -Requires: tau-helium >= %{version} +Requires: tau-helium >= 1.1.25 %description The Application Framework for tauOS apps