diff --git a/README.md b/README.md index f7ceb493b2..b94f0d92a8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # Terra Sources -[![Repository status](https://repology.org/badge/repository-big/terra_37.svg)](https://repology.org/repository/terra_37) +[![Repository status](https://repology.org/badge/repository-big/terra_37.svg?header=Terra+37)](https://repology.org/repository/terra_37) +[![Repository status](https://repology.org/badge/repository-big/terra_38.svg?header=Terra+38)](https://repology.org/repository/terra_38) Terra is a rolling-release Fedora repository for all the software you need. With Terra, you can install the latest packages knowing that quality and security are assured. @@ -16,6 +17,8 @@ sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/r ## Documentation Our documentation can be found on our [GitHub Wiki](https://github.com/terrapkg/packages/wiki). +> Note: you can also take a look at our [devdocs](https://developer.fyralabs.com/terra/). + ## Questions? Feel free to reach out on [Discord](https://discord.gg/5fdPuxTg5Q). We're always happy to help! diff --git a/anda/desktops/unity-shell/unity-shell.spec b/anda/desktops/unity-shell/unity-shell.spec index a2381e313e..6b1ad9eee3 100644 --- a/anda/desktops/unity-shell/unity-shell.spec +++ b/anda/desktops/unity-shell/unity-shell.spec @@ -19,7 +19,7 @@ BuildRequires: pkgconfig(zeitgeist-2.0) BuildRequires: libappstream-glib-devel BuildRequires: libdbusmenu-devel BuildRequires: bamf-devel -BuildRequires: libindicator-gtk3-devel +BuildRequires: terra-libindicator-gtk3-devel BuildRequires: json-glib-devel BuildRequires: libnotify-devel BuildRequires: libsigc++20-devel @@ -45,7 +45,7 @@ Requires: pam Requires: bamf-daemon Requires: unity-gtk-module-common Requires: compiz9 -Requires: libindicator-gtk3 +Requires: terra-libindicator-gtk3 Recommends: unity-greeter Recommends: unity-scope-home diff --git a/anda/desktops/unityx-shell/unityx-shell.spec b/anda/desktops/unityx-shell/unityx-shell.spec index cbadc5ba2f..3de1e171e5 100644 --- a/anda/desktops/unityx-shell/unityx-shell.spec +++ b/anda/desktops/unityx-shell/unityx-shell.spec @@ -26,7 +26,7 @@ BuildRequires: zeitgeist-devel BuildRequires: libappstream-glib-devel BuildRequires: libdbusmenu-devel BuildRequires: bamf-devel -BuildRequires: libindicator-gtk3-devel +BuildRequires: terra-libindicator-gtk3-devel BuildRequires: json-glib-devel BuildRequires: libnotify-devel BuildRequires: libsigc++20-devel @@ -61,7 +61,7 @@ Requires: geis-devel Requires: unity-settings-daemon Requires: unity-gtk3-module Requires: unity-gtk2-module -Requires: libindicator-gtk3 +Requires: terra-libindicator-gtk3 Requires: plotinus%{?_isa} = %{version}-%{release} Requires: bamf-daemon Requires: xbindkeys diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index fc412fce32..e300b70c29 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 954d4d701a136e79c25b58f9680d26a555a6e6fe +%global commit bfe7e3afed286de02dfc1ec4cc2b39f31972d295 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 @@ -38,23 +38,26 @@ %global build_platform CentOS %endif +%if %{with qt6} Name: prismlauncher-nightly +%else +Name: prismlauncher-qt5-nightly +%endif Version: 7.0^%{snapshot_info} Release: 1%{?dist} Summary: Minecraft launcher with ability to manage multiple instances -License: GPL-3.0-only +License: GPL-3.0-only AND Apache-2.0 AND LGPL-3.0-only AND GPL-3.0-or-later AND GPL-2.0-or-later AND ISC AND OFL-1.1 AND LGPL-2.1-only AND MIT AND BSD-2-Clause-FreeBSD AND BSD-3-Clause AND LGPL-3.0-or-later 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 -Patch0: 0001-find-cmark-with-pkgconfig.patch BuildRequires: cmake >= 3.15 BuildRequires: extra-cmake-modules BuildRequires: gcc-c++ -BuildRequires: java-devel >= 17 +BuildRequires: java-17-openjdk-devel BuildRequires: desktop-file-utils BuildRequires: libappstream-glib BuildRequires: cmake(ghc_filesystem) @@ -71,8 +74,6 @@ BuildRequires: cmake(Qt6Core5Compat) %endif BuildRequires: pkgconfig(libcmark) -# https://bugzilla.redhat.com/show_bug.cgi?id=2166815 -BuildRequires: cmark BuildRequires: pkgconfig(scdoc) BuildRequires: pkgconfig(zlib) @@ -82,7 +83,7 @@ Requires(postun): desktop-file-utils Requires: qt%{qt_version}-qtimageformats Requires: qt%{qt_version}-qtsvg Requires: javapackages-filesystem -Requires: java >= 17 +Requires: java-17-openjdk Requires: java-1.8.0-openjdk # xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 @@ -92,8 +93,11 @@ Recommends: flite # Prism supports enabling gamemode Suggests: gamemode -Conflicts: prismlauncher -Conflicts: prismlauncher-qt5 +Conflicts: %{real_name} +Conflicts: %{real_name}-qt5 +%if %{without qt6} +Conflicts: %{real_name}-nightly +%endif %description @@ -108,7 +112,7 @@ tar -xzf %{SOURCE1} -C libraries tar -xvf %{SOURCE2} -C libraries tar -xvf %{SOURCE3} -C libraries -rmdir libraries/{libnbtplusplus,quazip,tomlplusplus}/ +rmdir libraries/{extra-cmake-modules,filesystem,libnbtplusplus,quazip,tomlplusplus,zlib}/ mv -f libraries/libnbtplusplus-%{libnbtplusplus_commit} libraries/libnbtplusplus mv -f libraries/quazip-%{quazip_commit} libraries/quazip mv -f libraries/tomlplusplus-%{tomlplusplus_commit} libraries/tomlplusplus @@ -137,24 +141,26 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt %check -## disabled due to inconsistent results in copr builds that are not reproducible locally -%dnl %ctest +%ctest -%if 0%{?fedora} > 35 -appstream-util validate-relax --nonet \ - %{buildroot}%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml -%endif +%if 0%{?rhel} > 8 +# disabled due to rhel not shipping a new enough version of libappstream-glib +# appstream-util validate-relax --nonet \ +# %{buildroot}%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop - +%endif %post +%if 0%{?rhel} > 8 /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 || : +%endif %postun +%if 0%{?rhel} > 8 /usr/bin/update-desktop-database &> /dev/null || : if [ $1 -eq 0 ] ; then @@ -162,18 +168,21 @@ if [ $1 -eq 0 ] ; then /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : fi +%endif %posttrans +%if 0%{?rhel} > 8 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : +%endif %files %doc README.md %license LICENSE COPYING.md %dir %{_datadir}/%{real_name} -%{_bindir}/prismlauncher +%{_bindir}/%{real_name} %{_datadir}/%{real_name}/NewLaunch.jar %{_datadir}/%{real_name}/JavaCheck.jar %{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop @@ -186,13 +195,16 @@ fi %changelog +* Wed Jun 07 2023 seth - 7.0^20230603.954d4d7-1 +- specify jdk 17 + cleanup outdated patches/scriptlets + * Sun May 14 2023 seth - 7.0^20230513.c5aff7c-1 - add qtlogging.ini to files list * Mon Mar 20 2023 seth - 7.0^20230319.6dcf34a-1 - recommend flite to support narrator in minecraft -* Fri Feb 03 2023 seth flynn - 7.0^20230203.58d9ced-1 +* Fri Feb 03 2023 seth - 7.0^20230203.58d9ced-1 - disable tests and explicitly require cmark * Sun Jan 15 2023 seth - 7.0^20230115.f1247d2-1 diff --git a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec index c21c2f34eb..b0e0a277f2 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 954d4d701a136e79c25b58f9680d26a555a6e6fe +%global commit bfe7e3afed286de02dfc1ec4cc2b39f31972d295 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 @@ -38,23 +38,26 @@ %global build_platform CentOS %endif +%if %{with qt6} +Name: prismlauncher-nightly +%else Name: prismlauncher-qt5-nightly +%endif Version: 7.0^%{snapshot_info} Release: 1%{?dist} Summary: Minecraft launcher with ability to manage multiple instances -License: GPL-3.0-only +License: GPL-3.0-only AND Apache-2.0 AND LGPL-3.0-only AND GPL-3.0-or-later AND GPL-2.0-or-later AND ISC AND OFL-1.1 AND LGPL-2.1-only AND MIT AND BSD-2-Clause-FreeBSD AND BSD-3-Clause AND LGPL-3.0-or-later 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 -Patch0: 0001-find-cmark-with-pkgconfig.patch BuildRequires: cmake >= 3.15 BuildRequires: extra-cmake-modules BuildRequires: gcc-c++ -BuildRequires: java-devel >= 17 +BuildRequires: java-17-openjdk-devel BuildRequires: desktop-file-utils BuildRequires: libappstream-glib BuildRequires: cmake(ghc_filesystem) @@ -71,8 +74,6 @@ BuildRequires: cmake(Qt6Core5Compat) %endif BuildRequires: pkgconfig(libcmark) -# https://bugzilla.redhat.com/show_bug.cgi?id=2166815 -BuildRequires: cmark BuildRequires: pkgconfig(scdoc) BuildRequires: pkgconfig(zlib) @@ -82,7 +83,7 @@ Requires(postun): desktop-file-utils Requires: qt%{qt_version}-qtimageformats Requires: qt%{qt_version}-qtsvg Requires: javapackages-filesystem -Requires: java >= 17 +Requires: java-17-openjdk Requires: java-1.8.0-openjdk # xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 @@ -92,9 +93,11 @@ Recommends: flite # Prism supports enabling gamemode Suggests: gamemode -Conflicts: prismlauncher -Conflicts: prismlauncher-qt5 -Conflicts: primslauncher-nightly +Conflicts: %{real_name} +Conflicts: %{real_name}-qt5 +%if %{without qt6} +Conflicts: %{real_name}-nightly +%endif %description @@ -109,7 +112,7 @@ tar -xzf %{SOURCE1} -C libraries tar -xvf %{SOURCE2} -C libraries tar -xvf %{SOURCE3} -C libraries -rmdir libraries/{libnbtplusplus,quazip,tomlplusplus}/ +rmdir libraries/{extra-cmake-modules,filesystem,libnbtplusplus,quazip,tomlplusplus,zlib}/ mv -f libraries/libnbtplusplus-%{libnbtplusplus_commit} libraries/libnbtplusplus mv -f libraries/quazip-%{quazip_commit} libraries/quazip mv -f libraries/tomlplusplus-%{tomlplusplus_commit} libraries/tomlplusplus @@ -138,24 +141,26 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt %check -## disabled due to inconsistent results in copr builds that are not reproducible locally -%dnl %ctest +%ctest -%if 0%{?fedora} > 35 -appstream-util validate-relax --nonet \ - %{buildroot}%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml -%endif +%if 0%{?rhel} > 8 +# disabled due to rhel not shipping a new enough version of libappstream-glib +# appstream-util validate-relax --nonet \ +# %{buildroot}%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop - +%endif %post +%if 0%{?rhel} > 8 /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 || : +%endif %postun +%if 0%{?rhel} > 8 /usr/bin/update-desktop-database &> /dev/null || : if [ $1 -eq 0 ] ; then @@ -163,18 +168,21 @@ if [ $1 -eq 0 ] ; then /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : fi +%endif %posttrans +%if 0%{?rhel} > 8 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : +%endif %files %doc README.md %license LICENSE COPYING.md %dir %{_datadir}/%{real_name} -%{_bindir}/prismlauncher +%{_bindir}/%{real_name} %{_datadir}/%{real_name}/NewLaunch.jar %{_datadir}/%{real_name}/JavaCheck.jar %{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop @@ -187,13 +195,16 @@ fi %changelog +* Wed Jun 07 2023 seth - 7.0^20230603.954d4d7-1 +- specify jdk 17 + cleanup outdated patches/scriptlets + * Sun May 14 2023 seth - 7.0^20230513.c5aff7c-1 - add qtlogging.ini to files list * Mon Mar 20 2023 seth - 7.0^20230319.6dcf34a-1 - recommend flite to support narrator in minecraft -* Fri Feb 03 2023 seth flynn - 7.0^20230203.58d9ced-1 +* Fri Feb 03 2023 seth - 7.0^20230203.58d9ced-1 - disable tests and explicitly require cmark * Sun Jan 15 2023 seth - 7.0^20230115.f1247d2-1 diff --git a/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec b/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec index 21158e0409..fe3f66206f 100644 --- a/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec +++ b/anda/games/prismlauncher-qt5/prismlauncher-qt5.spec @@ -1,4 +1,4 @@ -%define real_name prismlauncher +%global real_name prismlauncher %bcond_with qt6 # Change this variables if you want to use custom keys @@ -28,20 +28,25 @@ %global build_platform CentOS %endif +%if %{with qt6} +Name: prismlauncher +%else Name: prismlauncher-qt5 -Version: 6.3 -Release: 2%{?dist} +%endif +Version: 7.0 +Release: 1%{?dist} Summary: Minecraft launcher with ability to manage multiple instances -License: GPL-3.0-only +# see COPYING.md for more information +# each file in the source also contains a SPDX-License-Identifier header that declares its license +License: GPL-3.0-only AND Apache-2.0 AND LGPL-3.0-only AND GPL-3.0-or-later AND GPL-2.0-or-later AND ISC AND OFL-1.1 AND LGPL-2.1-only AND MIT AND BSD-2-Clause-FreeBSD AND BSD-3-Clause AND LGPL-3.0-or-later Group: Amusements/Games URL: https://prismlauncher.org/ Source0: https://github.com/PrismLauncher/PrismLauncher/releases/download/%{version}/%{real_name}-%{version}.tar.gz -Patch0: 0001-find-cmark-with-pkgconfig.patch BuildRequires: cmake >= 3.15 BuildRequires: extra-cmake-modules BuildRequires: gcc-c++ -BuildRequires: java-devel >= 17 +BuildRequires: java-17-openjdk-devel BuildRequires: desktop-file-utils BuildRequires: libappstream-glib BuildRequires: cmake(ghc_filesystem) @@ -58,8 +63,6 @@ BuildRequires: cmake(Qt6Core5Compat) %endif BuildRequires: pkgconfig(libcmark) -# https://bugzilla.redhat.com/show_bug.cgi?id=2166815 -BuildRequires: cmark BuildRequires: pkgconfig(scdoc) BuildRequires: pkgconfig(zlib) @@ -69,7 +72,7 @@ Requires(postun): desktop-file-utils Requires: qt%{qt_version}-qtimageformats Requires: qt%{qt_version}-qtsvg Requires: javapackages-filesystem -Requires: java >= 17 +Requires: java-17-openjdk Requires: java-1.8.0-openjdk # xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 @@ -79,8 +82,9 @@ Recommends: flite # Prism supports enabling gamemode Suggests: gamemode -Conflicts: prismlauncher - +%if %{without qt6} +Conflicts: %{real_name} +%endif %description A custom launcher for Minecraft that allows you to easily manage @@ -88,7 +92,9 @@ multiple installations of Minecraft at once (Fork of MultiMC) %prep -%autosetup -p1 -n PrismLauncher-%{version} +%autosetup -n PrismLauncher-%{version} + +rm -rf libraries/{extra-cmake-modules,filesystem,zlib} # Do not set RPATH sed -i "s|\$ORIGIN/||" CMakeLists.txt @@ -114,35 +120,41 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt %check -## disabled due to inconsistent results in copr builds that are not reproducible locally -%dnl %ctest +%ctest -%if 0%{?fedora} > 35 -appstream-util validate-relax --nonet \ - %{buildroot}%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml -%endif +%if 0%{?rhel} > 8 +# disabled due to rhel not shipping a new enough version of libappstream-glib +# appstream-util validate-relax --nonet \ +# %{buildroot}%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop +%endif %post +%if 0%{?rhel} > 8 /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 || : +%endif %postun +%if 0%{?rhel} > 8 /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 +%endif %posttrans +%if 0%{?rhel} > 8 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : +%endif %files @@ -156,11 +168,15 @@ fi %{_datadir}/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg %{_datadir}/mime/packages/modrinth-mrpack-mime.xml %{_datadir}/qlogging-categories%{qt_version}/prismlauncher.categories +%{_datadir}/PrismLauncher/qtlogging.ini %{_mandir}/man?/prismlauncher.* %{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml %changelog +* Thu Jun 08 2023 seth - 6.3-3 +- specify jdk 17 + cleanup outdated patches/scriptlets + * Mon Mar 20 2023 seth - 6.3-2 - recommend flite to support narrator in minecraft diff --git a/anda/games/prismlauncher/prismlauncher.spec b/anda/games/prismlauncher/prismlauncher.spec index 7fb6a02b25..6d892a05b5 100644 --- a/anda/games/prismlauncher/prismlauncher.spec +++ b/anda/games/prismlauncher/prismlauncher.spec @@ -1,3 +1,4 @@ +%global real_name prismlauncher %bcond_without qt6 # Change this variables if you want to use custom keys @@ -27,20 +28,25 @@ %global build_platform CentOS %endif +%if %{with qt6} Name: prismlauncher -Version: 6.3 -Release: 2%{?dist} +%else +Name: prismlauncher-qt5 +%endif +Version: 7.0 +Release: 1%{?dist} Summary: Minecraft launcher with ability to manage multiple instances -License: GPL-3.0-only +# see COPYING.md for more information +# each file in the source also contains a SPDX-License-Identifier header that declares its license +License: GPL-3.0-only AND Apache-2.0 AND LGPL-3.0-only AND GPL-3.0-or-later AND GPL-2.0-or-later AND ISC AND OFL-1.1 AND LGPL-2.1-only AND MIT AND BSD-2-Clause-FreeBSD AND BSD-3-Clause AND LGPL-3.0-or-later Group: Amusements/Games URL: https://prismlauncher.org/ -Source0: https://github.com/PrismLauncher/PrismLauncher/releases/download/%{version}/%{name}-%{version}.tar.gz -Patch0: 0001-find-cmark-with-pkgconfig.patch +Source0: https://github.com/PrismLauncher/PrismLauncher/releases/download/%{version}/%{real_name}-%{version}.tar.gz BuildRequires: cmake >= 3.15 BuildRequires: extra-cmake-modules BuildRequires: gcc-c++ -BuildRequires: java-devel >= 17 +BuildRequires: java-17-openjdk-devel BuildRequires: desktop-file-utils BuildRequires: libappstream-glib BuildRequires: cmake(ghc_filesystem) @@ -57,8 +63,6 @@ BuildRequires: cmake(Qt6Core5Compat) %endif BuildRequires: pkgconfig(libcmark) -# https://bugzilla.redhat.com/show_bug.cgi?id=2166815 -BuildRequires: cmark BuildRequires: pkgconfig(scdoc) BuildRequires: pkgconfig(zlib) @@ -68,7 +72,7 @@ Requires(postun): desktop-file-utils Requires: qt%{qt_version}-qtimageformats Requires: qt%{qt_version}-qtsvg Requires: javapackages-filesystem -Requires: java >= 17 +Requires: java-17-openjdk Requires: java-1.8.0-openjdk # xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 @@ -78,6 +82,9 @@ Recommends: flite # Prism supports enabling gamemode Suggests: gamemode +%if %{without qt6} +Conflicts: %{real_name} +%endif %description A custom launcher for Minecraft that allows you to easily manage @@ -85,7 +92,9 @@ multiple installations of Minecraft at once (Fork of MultiMC) %prep -%autosetup -p1 -n PrismLauncher-%{version} +%autosetup -n PrismLauncher-%{version} + +rm -rf libraries/{extra-cmake-modules,filesystem,zlib} # Do not set RPATH sed -i "s|\$ORIGIN/||" CMakeLists.txt @@ -111,53 +120,63 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt %check -## disabled due to inconsistent results in copr builds that are not reproducible locally -%dnl %ctest +%ctest -%if 0%{?fedora} > 35 -appstream-util validate-relax --nonet \ - %{buildroot}%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml -%endif +%if 0%{?rhel} > 8 +# disabled due to rhel not shipping a new enough version of libappstream-glib +# appstream-util validate-relax --nonet \ +# %{buildroot}%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml desktop-file-validate %{buildroot}%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop +%endif %post +%if 0%{?rhel} > 8 /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 || : +%endif %postun +%if 0%{?rhel} > 8 /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 +%endif %posttrans +%if 0%{?rhel} > 8 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : +%endif %files %doc README.md %license LICENSE COPYING.md -%dir %{_datadir}/%{name} +%dir %{_datadir}/%{real_name} %{_bindir}/prismlauncher -%{_datadir}/%{name}/NewLaunch.jar -%{_datadir}/%{name}/JavaCheck.jar +%{_datadir}/%{real_name}/NewLaunch.jar +%{_datadir}/%{real_name}/JavaCheck.jar %{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop %{_datadir}/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg %{_datadir}/mime/packages/modrinth-mrpack-mime.xml %{_datadir}/qlogging-categories%{qt_version}/prismlauncher.categories +%{_datadir}/PrismLauncher/qtlogging.ini %{_mandir}/man?/prismlauncher.* %{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml %changelog +* Thu Jun 08 2023 seth - 6.3-3 +- specify jdk 17 + cleanup outdated patches/scriptlets + * Mon Mar 20 2023 seth - 6.3-2 - recommend flite to support narrator in minecraft diff --git a/anda/lib/gsettings-qt-lomiri/anda.hcl b/anda/lib/gsettings-qt-lomiri/anda.hcl new file mode 100644 index 0000000000..9fb5369697 --- /dev/null +++ b/anda/lib/gsettings-qt-lomiri/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "gsettings-qt-lomiri.spec" + } +} diff --git a/anda/lib/gsettings-qt-lomiri/gsettings-qt-lomiri.spec b/anda/lib/gsettings-qt-lomiri/gsettings-qt-lomiri.spec new file mode 100644 index 0000000000..c26122c344 --- /dev/null +++ b/anda/lib/gsettings-qt-lomiri/gsettings-qt-lomiri.spec @@ -0,0 +1,63 @@ +%global forgeurl https://gitlab.com/ubports/development/core/gsettings-qt +%global commit d5e002d7e0bce46c315bcc99a44a8bd51f49f488 +%forgemeta + +Name: gsettings-qt-lomiri +Version: 0.2 +Release: %autorelease +Summary: QML Bindings for GSettings +License: LGPL-3.0 +URL: https://gitlab.com/ubports/development/core/gsettings-qt +Source0: %{url}/-/archive/%commit/gsettings-qt-%commit.tar.gz + +BuildRequires: gcc-c++ +BuildRequires: glib2-devel +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtdeclarative +BuildRequires: qt5-qtdeclarative-devel + +%description +gsettings-qt provides Qt binding to GSettings, a high-level API +for application settings. This library can be used to access GSettings from Qt +applications. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%prep +%autosetup -n gsettings-qt-%commit + +%build +%qmake_qt5 + +%make_build + +%install +%make_install INSTALL_ROOT=%{buildroot} +# Files underneath are part of coreutils and cpptest packages +rm -rf %{buildroot}/usr/tests + +%files +%license COPYING +%{_libdir}/libgsettings-qt.so.1 +%{_libdir}/libgsettings-qt.so.1.0 +%{_libdir}/libgsettings-qt.so.1.0.0 +%dir %{_libdir}/qt5/qml/GSettings.1.0 +%{_libdir}/qt5/qml/GSettings.1.0/libGSettingsQmlPlugin.so +%{_libdir}/qt5/qml/GSettings.1.0/plugins.qmltypes +%{_libdir}/qt5/qml/GSettings.1.0/qmldir + +%files devel +%dir %{_includedir}/qt5/QGSettings +%{_includedir}/qt5/QGSettings/QGSettings +%{_includedir}/qt5/QGSettings/qgsettings.h +%{_libdir}/libgsettings-qt.so +%{_libdir}/pkgconfig/gsettings-qt.pc + +%changelog +%autochangelog diff --git a/anda/lib/libindicator/anda.hcl b/anda/lib/libindicator/anda.hcl index e10f0fb50b..b76b3d96ec 100644 --- a/anda/lib/libindicator/anda.hcl +++ b/anda/lib/libindicator/anda.hcl @@ -1,5 +1,5 @@ project pkg { rpm { - spec = "libindicator.spec" + spec = "terra-libindicator.spec" } } diff --git a/anda/lib/libindicator/terra-libindicator.spec b/anda/lib/libindicator/terra-libindicator.spec new file mode 100644 index 0000000000..313090e5d8 --- /dev/null +++ b/anda/lib/libindicator/terra-libindicator.spec @@ -0,0 +1,176 @@ +Name: terra-libindicator +Version: 16.10.0 +Release: %autorelease +Summary: Shared functions for Ayatana indicators + +License: GPL-3.0 +URL: https://launchpad.net/libindicator +Source0: http://archive.ubuntu.com/ubuntu/pool/universe/libi/libindicator/libindicator_16.10.0+18.04.20180321.1.orig.tar.gz +Source1: https://raw.githubusercontent.com/ubports/libindicator/097906132ffb479205be15a92cae97e5daf4e154/data/indicators.target +# From GLib 2.62 +Patch1: http://archive.ubuntu.com/ubuntu/pool/universe/libi/libindicator/libindicator_16.10.0+18.04.20180321.1-0ubuntu5.diff.gz + +BuildRequires: chrpath +BuildRequires: gtk-doc +BuildRequires: libtool +BuildRequires: pkgconfig +BuildRequires: pkgconfig(systemd) +BuildRequires: dbus-glib-devel +BuildRequires: gtk2-devel +BuildRequires: gtk3-devel +BuildRequires: systemd-rpm-macros +BuildRequires: gnome-common +BuildRequires: make + +%description +A set of symbols and convenience functions that all Ayatana indicators are +likely to use. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: pkgconfig + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + + +%package gtk3 +Summary: GTK+3 build of %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description gtk3 +A set of symbols and convenience functions that all Ayatana indicators +are likely to use. This is the GTK+ 3 build of %{name}, for use +by GTK+ 3 apps. + + +%package gtk3-devel +Summary: Development files for %{name}-gtk3 +Requires: %{name}-gtk3%{?_isa} = %{version}-%{release} +Requires: pkgconfig + +%description gtk3-devel +The %{name}-gtk3-devel package contains libraries and header files for +developing applications that use %{name}-gtk3. + +%prep +%setup -q -c +%patch1 -p1 -b .orig +# Remove all IDO references +# This is only needed for tools/indicator-loader.c +sed -i '6d' ./Makefile.am +sed -i 's!libindicator \\!libindicator!' Makefile.am +sed -i '59d' configure.ac +sed -ie 58's/$/) &/' configure.ac + +sed -i.addvar configure.ac \ + -e '\@LIBINDICATOR_LIBS@s|\$LIBM| \$LIBM|' +sed -i 's!tests/Makefile!!' configure.ac + +NOCONFIGURE=1 \ + sh autogen.sh + +%build +%global _configure ../configure --libdir=%{_libdir} +rm -rf build-gtk2 build-gtk3 +mkdir build-gtk2 build-gtk3 + +pushd build-gtk2 +export CFLAGS="%{optflags} -Wno-error=deprecated-declarations" +%configure --with-gtk=2 --disable-tests --disable-static --disable-silent-rules +sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +make %{?_smp_mflags} +popd + +pushd build-gtk3 +export CFLAGS="%{optflags} -Wno-error=deprecated-declarations" +%configure --with-gtk=3 --disable-tests --disable-static --disable-silent-rules +sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +make %{?_smp_mflags} +popd + + +%install +pushd build-gtk2 +make install DESTDIR=%{buildroot} +popd +( + PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig + export PKG_CONFIG_PATH + for var in \ + iconsdir \ + indicatordir \ + %{nil} + do + vardir=$(pkg-config --variable=${var} indicator-0.4) + mkdir -p %{buildroot}${vardir} + done +) + +pushd build-gtk3 +make install DESTDIR=%{buildroot} +popd +( + PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig + export PKG_CONFIG_PATH + for var in \ + iconsdir \ + indicatordir \ + %{nil} + do + vardir=$(pkg-config --variable=${var} indicator3-0.4) + mkdir -p %{buildroot}${vardir} + done +) + +# Ubuntu doesn't package the dummy indicator +%dnl rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so + +# Remove libtool files +find %{buildroot} -type f -name '*.la' -delete + +# Lomiri compatability +install -Dm644 %{SOURCE1} %{buildroot}%{_userunitdir}/ + +%ldconfig_scriptlets +%ldconfig_scriptlets gtk3 + +%files +%license COPYING +%doc AUTHORS COPYING NEWS ChangeLog +%{_libdir}/libindicator.so.* +%{_prefix}/lib/indicators/ +%dir %{_datadir}/libindicator/ +%dir %{_datadir}/libindicator/icons/ +%{_userunitdir}/indicators-pre.target +%{_userunitdir}/indicators.target + +%files devel +%dir %{_includedir}/libindicator-0.4/ +%dir %{_includedir}/libindicator-0.4/libindicator/ +%{_includedir}/libindicator-0.4/libindicator/*.h +%{_libdir}/libindicator.so +%{_libdir}/pkgconfig/indicator-0.4.pc + +%files gtk3 +%doc AUTHORS COPYING NEWS ChangeLog +%{_libdir}/libindicator3.so.* +%{_prefix}/lib/indicators3/ +%dir %{_datadir}/libindicator/ +%dir %{_datadir}/libindicator/icons/ + +%files gtk3-devel +%dir %{_includedir}/libindicator3-0.4/ +%dir %{_includedir}/libindicator3-0.4/libindicator/ +%{_includedir}/libindicator3-0.4/libindicator/*.h +%{_libdir}/libindicator3.so +%{_libdir}/pkgconfig/indicator3-0.4.pc + +%changelog +%autochangelog diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index cf6e7b6171..23431b551b 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,4 +1,4 @@ -%global commit 75e00df016445330bfd591c415d5f390e518397e +%global commit 1886bcf85020f140a59bfec5ff61c06710dbecd1 %global ver 1.8.14 Name: tdlib-nightly Version: %ver^%commit diff --git a/anda/others/system76-scheduler/system76-scheduler.spec b/anda/others/system76-scheduler/system76-scheduler.spec index ec0050c063..9015483ab7 100644 --- a/anda/others/system76-scheduler/system76-scheduler.spec +++ b/anda/others/system76-scheduler/system76-scheduler.spec @@ -2,12 +2,12 @@ Name: system76-scheduler Version: 2.0.1 -Release: 1%?dist +Release: 2%?dist Summary: Auto-configure CFS, process priorities for improved DE responsiveness License: MPL-2.0 URL: https://github.com/pop-os/system76-scheduler Source0: %url/archive/refs/tags/%version.tar.gz -BuildRequires: cargo clang just clang-devel pipewire-devel pkg-config +BuildRequires: cargo clang just clang-devel pipewire-devel pkg-config systemd-rpm-macros %description Scheduling service which optimizes Linux's CPU scheduler and automatically @@ -25,14 +25,29 @@ process priority. just execsnoop=$(which execsnoop-bpfcc) build-release %install -just sysconfdir=%buildroot/usr/share install +just rootdir=%buildroot sysconfdir=%_sysconfdir install + + +%post +%systemd_post com.system76.Scheduler.service + + +%preun +%systemd_preun com.system76.Scheduler.service + + +%postun +%systemd_postun_with_restart com.system76.Scheduler.service + %files %doc README.md %license LICENSE -/usr/share/dbus-1/system.d/com.system76.Scheduler.conf -/usr/share/system76-scheduler/config.kdl -/usr/share/system76-scheduler/process-scheduler/pop_os.kdl +%_bindir/system76-scheduler +/etc/dbus-1/system.d/com.system76.Scheduler.conf +/etc/system76-scheduler/config.kdl +/etc/system76-scheduler/process-scheduler/pop_os.kdl +%{_unitdir}/com.system76.Scheduler.service %changelog * Tue May 23 2023 windowsboy111 - 2.0.1-1 diff --git a/anda/others/unity-greeter/unity-greeter.spec b/anda/others/unity-greeter/unity-greeter.spec index 767333de64..f29f35db38 100644 --- a/anda/others/unity-greeter/unity-greeter.spec +++ b/anda/others/unity-greeter/unity-greeter.spec @@ -1,11 +1,13 @@ +%global rn 1 + Name: unity-greeter -Version: 22.04.1 +Version: 23.10.1 Release: %autorelease Summary: Unity Greeter for Lightdm License: GPL-3.0 URL: https://launchpad.net/unity-greeter -Source0: http://archive.ubuntu.com/ubuntu/pool/universe/u/unity-greeter/unity-greeter_%{version}-0ubuntu2.tar.xz +Source0: http://archive.ubuntu.com/ubuntu/pool/universe/u/unity-greeter/unity-greeter_%version-0ubuntu%rn.tar.xz Patch1: 0001-Remove-libido.patch BuildRequires: automake libtool gnome-common diff --git a/anda/others/unity-greeter/update.rhai b/anda/others/unity-greeter/update.rhai index c056f96829..094a83f713 100644 --- a/anda/others/unity-greeter/update.rhai +++ b/anda/others/unity-greeter/update.rhai @@ -1,3 +1,5 @@ let html = get("http://archive.ubuntu.com/ubuntu/pool/universe/u/unity-greeter/?C=N;O=D"); -let v = find("unity-greeter_([\\d.+]+)-0ubuntu2", html, 1); +let v = find("unity-greeter_([\\d.+]+)-0ubuntu(\d\+)", html, 1); +let rn = find("unity-greeter_([\\d.+]+)-0ubuntu(\d\+)", html, 2); rpm.version(v); +rpm.global("rn", rn); diff --git a/anda/rust/gitoxide/rust-gitoxide.spec b/anda/rust/gitoxide/rust-gitoxide.spec index f1b7199b32..c7a1f30e70 100644 --- a/anda/rust/gitoxide/rust-gitoxide.spec +++ b/anda/rust/gitoxide/rust-gitoxide.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 23 +# Generated by rust2rpm 24 %bcond_without check %global crate gitoxide @@ -15,7 +15,7 @@ Source: %{crates_source} BuildRequires: openssl-devel cmake anda-srpm-macros rust-packaging >= 21 %global _description %{expand: -Command-line application for interacting with git repositories.} +A command-line application for interacting with git repositories.} %description %{_description} @@ -32,6 +32,322 @@ Summary: %{summary} %{_bindir}/ein %{_bindir}/gix +%package devel +Summary: %{summary} +BuildArch: noarch + +%description devel %{_description} + +This package contains library source intended for building other packages which +use the "%{crate}" crate. + +%files devel +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%doc %{crate_instdir}/CHANGELOG.md +%doc %{crate_instdir}/README.md +%{crate_instdir}/ + +%package -n %{name}+default-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+default-devel %{_description} + +This package contains library source intended for building other packages which +use the "default" feature of the "%{crate}" crate. + +%files -n %{name}+default-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+cache-efficiency-debug-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+cache-efficiency-debug-devel %{_description} + +This package contains library source intended for building other packages which +use the "cache-efficiency-debug" feature of the "%{crate}" crate. + +%files -n %{name}+cache-efficiency-debug-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+crosstermion-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+crosstermion-devel %{_description} + +This package contains library source intended for building other packages which +use the "crosstermion" feature of the "%{crate}" crate. + +%files -n %{name}+crosstermion-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+document-features-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+document-features-devel %{_description} + +This package contains library source intended for building other packages which +use the "document-features" feature of the "%{crate}" crate. + +%files -n %{name}+document-features-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+fast-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+fast-devel %{_description} + +This package contains library source intended for building other packages which +use the "fast" feature of the "%{crate}" crate. + +%files -n %{name}+fast-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+fast-safe-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+fast-safe-devel %{_description} + +This package contains library source intended for building other packages which +use the "fast-safe" feature of the "%{crate}" crate. + +%files -n %{name}+fast-safe-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+futures-lite-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+futures-lite-devel %{_description} + +This package contains library source intended for building other packages which +use the "futures-lite" feature of the "%{crate}" crate. + +%files -n %{name}+futures-lite-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+gitoxide-core-async-client-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+gitoxide-core-async-client-devel %{_description} + +This package contains library source intended for building other packages which +use the "gitoxide-core-async-client" feature of the "%{crate}" crate. + +%files -n %{name}+gitoxide-core-async-client-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+gitoxide-core-blocking-client-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+gitoxide-core-blocking-client-devel %{_description} + +This package contains library source intended for building other packages which +use the "gitoxide-core-blocking-client" feature of the "%{crate}" crate. + +%files -n %{name}+gitoxide-core-blocking-client-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+gitoxide-core-tools-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+gitoxide-core-tools-devel %{_description} + +This package contains library source intended for building other packages which +use the "gitoxide-core-tools" feature of the "%{crate}" crate. + +%files -n %{name}+gitoxide-core-tools-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+gitoxide-core-tools-query-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+gitoxide-core-tools-query-devel %{_description} + +This package contains library source intended for building other packages which +use the "gitoxide-core-tools-query" feature of the "%{crate}" crate. + +%files -n %{name}+gitoxide-core-tools-query-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+http-client-curl-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+http-client-curl-devel %{_description} + +This package contains library source intended for building other packages which +use the "http-client-curl" feature of the "%{crate}" crate. + +%files -n %{name}+http-client-curl-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+http-client-reqwest-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+http-client-reqwest-devel %{_description} + +This package contains library source intended for building other packages which +use the "http-client-reqwest" feature of the "%{crate}" crate. + +%files -n %{name}+http-client-reqwest-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+is-terminal-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+is-terminal-devel %{_description} + +This package contains library source intended for building other packages which +use the "is-terminal" feature of the "%{crate}" crate. + +%files -n %{name}+is-terminal-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+lean-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+lean-devel %{_description} + +This package contains library source intended for building other packages which +use the "lean" feature of the "%{crate}" crate. + +%files -n %{name}+lean-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+lean-async-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+lean-async-devel %{_description} + +This package contains library source intended for building other packages which +use the "lean-async" feature of the "%{crate}" crate. + +%files -n %{name}+lean-async-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+max-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+max-devel %{_description} + +This package contains library source intended for building other packages which +use the "max" feature of the "%{crate}" crate. + +%files -n %{name}+max-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+max-control-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+max-control-devel %{_description} + +This package contains library source intended for building other packages which +use the "max-control" feature of the "%{crate}" crate. + +%files -n %{name}+max-control-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+max-pure-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+max-pure-devel %{_description} + +This package contains library source intended for building other packages which +use the "max-pure" feature of the "%{crate}" crate. + +%files -n %{name}+max-pure-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+pretty-cli-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+pretty-cli-devel %{_description} + +This package contains library source intended for building other packages which +use the "pretty-cli" feature of the "%{crate}" crate. + +%files -n %{name}+pretty-cli-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+prodash-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+prodash-devel %{_description} + +This package contains library source intended for building other packages which +use the "prodash" feature of the "%{crate}" crate. + +%files -n %{name}+prodash-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+prodash-render-line-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+prodash-render-line-devel %{_description} + +This package contains library source intended for building other packages which +use the "prodash-render-line" feature of the "%{crate}" crate. + +%files -n %{name}+prodash-render-line-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+prodash-render-line-crossterm-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+prodash-render-line-crossterm-devel %{_description} + +This package contains library source intended for building other packages which +use the "prodash-render-line-crossterm" feature of the "%{crate}" crate. + +%files -n %{name}+prodash-render-line-crossterm-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+prodash-render-tui-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+prodash-render-tui-devel %{_description} + +This package contains library source intended for building other packages which +use the "prodash-render-tui" feature of the "%{crate}" crate. + +%files -n %{name}+prodash-render-tui-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+small-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+small-devel %{_description} + +This package contains library source intended for building other packages which +use the "small" feature of the "%{crate}" crate. + +%files -n %{name}+small-devel +%ghost %{crate_instdir}/Cargo.toml + %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep_online diff --git a/anda/themes/fluent-theme/fluent-theme.spec b/anda/themes/fluent-theme/fluent-theme.spec index e3545902b3..7464fbca9f 100644 --- a/anda/themes/fluent-theme/fluent-theme.spec +++ b/anda/themes/fluent-theme/fluent-theme.spec @@ -2,7 +2,7 @@ Name: fluent-theme Version: 20221215 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fluent is a Fluent design theme for GNOME/GTK based desktop environments. License: GPL-3.0 @@ -25,7 +25,8 @@ Fluent is a Fluent design theme for GNOME/GTK based desktop environments. %install mkdir -p %{buildroot}%{_datadir}/themes -./install.sh --tweaks round -d %{buildroot}%{_datadir}/themes +./install.sh -i simple -t all -d %{buildroot}%{_datadir}/themes +./install.sh -i simple -t all --tweaks round float -d %{buildroot}%{_datadir}/themes %files %license COPYING @@ -34,5 +35,8 @@ mkdir -p %{buildroot}%{_datadir}/themes %{_datadir}/themes/Fluent*/ %changelog +* Sun Jun 05 2023 Dipta Biswas - 20221215-2 +- Included both regular and round variant + * Thu Jun 01 2023 Lleyton Gray - 20221215-1 - Initial Package diff --git a/anda/vala/vala-nightly/vala-nightly.spec b/anda/vala/vala-nightly/vala-nightly.spec index bb64f22e33..c034c6b38b 100644 --- a/anda/vala/vala-nightly/vala-nightly.spec +++ b/anda/vala/vala-nightly/vala-nightly.spec @@ -3,7 +3,7 @@ %global priority 90 %global real_name vala -%global commit 0bdb18c1882123af0590dd1ccca4ed92cc3f29a5 +%global commit 94b18c6b0413cf252e41ac2f36073f5e5b1d8ced %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global repo https://gitlab.gnome.org/GNOME/%{real_name}.git