diff --git a/.github/workflows/copr_build.yml b/.github/workflows/copr_build.yml index 0159c14..3114bf5 100644 --- a/.github/workflows/copr_build.yml +++ b/.github/workflows/copr_build.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - pkgname: [ scenefx-0.1, scenefx-0.2, scenefx ] + pkgname: [ scenefx-0.2, scenefx-0.3, scenefx ] name: Build RPM ${{matrix.pkgname}} container: fedora:latest runs-on: ubuntu-latest diff --git a/.github/workflows/copr_upload.yml b/.github/workflows/copr_upload.yml index 472617b..66dcf11 100644 --- a/.github/workflows/copr_upload.yml +++ b/.github/workflows/copr_upload.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - pkgname: [ scenefx-0.1, scenefx-0.2, scenefx, swayfx ] + pkgname: [ scenefx-0.2, scenefx-0.3, scenefx, swayfx ] name: Upload ${{matrix.pkgname}} runs-on: ubuntu-latest steps: diff --git a/COPR/scenefx-0.1/scenefx-0.1.rpkg.spec b/COPR/scenefx-0.3/scenefx-0.3.rpkg.spec similarity index 66% rename from COPR/scenefx-0.1/scenefx-0.1.rpkg.spec rename to COPR/scenefx-0.3/scenefx-0.3.rpkg.spec index e18ca5d..3196801 100644 --- a/COPR/scenefx-0.1/scenefx-0.1.rpkg.spec +++ b/COPR/scenefx-0.3/scenefx-0.3.rpkg.spec @@ -1,18 +1,19 @@ # vim: syntax=spec -### CHANGE THESE VARIABLES BEFORE RELEASE: -# Change to current SceneFX tag! -%global tag 0.1 -# Version of the .so library -%global abi_ver 1 - -Name: scenefx-%{tag} -Version: %{tag} +# Excludes the micro version, like "0.4" +%global tag 0.3 +# Includes the micro version, like "0.4.1" +%global tag_full 0.3 +# The Source0 tar file name +%global tar_name scenefx-%{tag_full} + +Name: scenefx-%{tag_full} +Version: %{tag_full} Release: 1%{?dist} Summary: A drop-in replacement for the wlroots scene API that allows wayland compositors to render surfaces with eye-candy effects License: MIT URL: https://github.com/wlrfx/scenefx -Source0: %{url}/archive/refs/tags/%{tag}.tar.gz +Source0: %{url}/archive/refs/tags/%{tag_full}.tar.gz BuildRequires: gcc @@ -20,17 +21,17 @@ BuildRequires: glslang BuildRequires: gnupg2 BuildRequires: meson >= 0.59.0 -BuildRequires: (pkgconfig(wlroots) >= 0.17.0 with pkgconfig(wlroots) < 0.18) +BuildRequires: pkgconfig(wlroots-0.18) BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(gbm) >= 17.1.0 BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(hwdata) -BuildRequires: pkgconfig(libdrm) >= 2.4.114 +BuildRequires: pkgconfig(libdrm) >= 2.4.122 BuildRequires: pkgconfig(pixman-1) >= 0.42.0 BuildRequires: pkgconfig(wayland-client) -BuildRequires: pkgconfig(wayland-protocols) >= 1.32 +BuildRequires: pkgconfig(wayland-protocols) >= 1.35 BuildRequires: pkgconfig(wayland-scanner) -BuildRequires: pkgconfig(wayland-server) >= 1.22 +BuildRequires: pkgconfig(wayland-server) >= 1.23 %description %{summary} @@ -49,7 +50,7 @@ Development files for %{name}. %prep -%autosetup -N -n %{name} +%autosetup -N -n %{tar_name} %build MESON_OPTIONS=( @@ -73,13 +74,13 @@ MESON_OPTIONS=( %files %license LICENSE %doc README.md -%{_libdir}/libscenefx.so.%{abi_ver}{,.*} +%{_libdir}/libscenefx-%{tag}.so %files devel -%{_includedir}/scenefx -%{_libdir}/libscenefx.so -%{_libdir}/pkgconfig/scenefx.pc +%{_includedir}/scenefx-%{tag}/scenefx +%{_libdir}/libscenefx-%{tag}.so +%{_libdir}/pkgconfig/scenefx-%{tag}.pc # Changelog will be empty until you make first annotated Git tag. diff --git a/COPR/scenefx/scenefx.rpkg.spec b/COPR/scenefx/scenefx.rpkg.spec index 45610c9..7e6f3b8 100644 --- a/COPR/scenefx/scenefx.rpkg.spec +++ b/COPR/scenefx/scenefx.rpkg.spec @@ -1,32 +1,37 @@ # vim: syntax=spec -%global tag 0.3 +# Excludes the micro version, like "0.4" +%global tag 0.4 +# Includes the micro version, like "0.4.1" +%global tag_full 0.4.1 +# The Source0 tar file name +%global tar_name scenefx-%{tag_full} Name: scenefx -Version: %{tag} -Release: 4%{?dist} +Version: %{tag_full} +Release: 1%{?dist} Summary: A drop-in replacement for the wlroots scene API that allows wayland compositors to render surfaces with eye-candy effects License: MIT URL: https://github.com/wlrfx/scenefx -Source0: %{url}/archive/refs/tags/%{tag}.tar.gz +Source0: %{url}/archive/refs/tags/%{tag_full}.tar.gz BuildRequires: gcc BuildRequires: glslang BuildRequires: gnupg2 -BuildRequires: meson >= 0.59.0 +BuildRequires: meson >= 1.3 -BuildRequires: pkgconfig(wlroots-0.18) +BuildRequires: pkgconfig(wlroots-0.19) BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(gbm) >= 17.1.0 BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(hwdata) BuildRequires: pkgconfig(libdrm) >= 2.4.122 -BuildRequires: pkgconfig(pixman-1) >= 0.42.0 +BuildRequires: pkgconfig(pixman-1) >= 0.43.0 BuildRequires: pkgconfig(wayland-client) -BuildRequires: pkgconfig(wayland-protocols) >= 1.35 +BuildRequires: pkgconfig(wayland-protocols) >= 1.41 BuildRequires: pkgconfig(wayland-scanner) -BuildRequires: pkgconfig(wayland-server) >= 1.23 +BuildRequires: pkgconfig(wayland-server) >= 1.23.1 %description %{summary} @@ -45,7 +50,7 @@ Development files for %{name}. %prep -%autosetup -N +%autosetup -N -n %{tar_name} %build MESON_OPTIONS=( diff --git a/COPR/swayfx/swayfx.rpkg.spec b/COPR/swayfx/swayfx.rpkg.spec index 7d78622..24fb86d 100644 --- a/COPR/swayfx/swayfx.rpkg.spec +++ b/COPR/swayfx/swayfx.rpkg.spec @@ -2,13 +2,13 @@ ### CHANGE THESE VARIABLES BEFORE RELEASE: # Change to current Sway base version! -%global SwayBaseVersion 1.10.1 +%global sway_base_version 1.11 # Change to current SwayFX tag! -%global tag 0.5.1 +%global tag 0.5.2 Name: swayfx Version: %{tag} -Release: 4%{?dist} +Release: 1%{?dist} Summary: SwayFX: Sway, but with eye candy! License: MIT URL: https://github.com/WillPower3309/swayfx @@ -23,7 +23,7 @@ Source101: sway-portals.conf BuildRequires: gcc-c++ BuildRequires: gnupg2 -BuildRequires: meson >= 0.60.0 +BuildRequires: meson >= 1.3 BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(glesv2) @@ -40,10 +40,10 @@ BuildRequires: pkgconfig(pixman-1) BuildRequires: pkgconfig(scdoc) BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) -BuildRequires: pkgconfig(wayland-server) >= 1.21.0 -BuildRequires: pkgconfig(wayland-protocols) >= 1.24 -BuildRequires: pkgconfig(scenefx-0.3) -BuildRequires: pkgconfig(wlroots-0.18) +BuildRequires: pkgconfig(wayland-server) >= 1.23.1 +BuildRequires: pkgconfig(wayland-protocols) >= 1.41 +BuildRequires: pkgconfig(scenefx-0.4) +BuildRequires: pkgconfig(wlroots-0.19) BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcb-icccm) BuildRequires: pkgconfig(xkbcommon) >= 1.5.0 @@ -55,7 +55,7 @@ Suggests: %{name}-config-upstream Conflicts: sway -Provides: sway = %{SwayBaseVersion} +Provides: sway = %{sway_base_version} %description SwayFX: Sway, but with eye candy!