.gitignore

@@ -12,15 +12,3 @@
 /wf-utils-889fdaf.tar.gz
 /wayfire-0.7.3.tar.gz
 /wayfire-0.7.4.tar.gz
-/wayfire-0.7.5.tar.gz
-/wf-utils-25ed62f.tar.gz
-/wayfire-0.8.0.tar.gz
-/wf-utils-15f8e16.tar.gz
-/wayfire-0.8.1.tar.gz
-/wayfire-0.9.0.tar.gz
-/wf-touch-caa1569.tar.gz
-/wf-utils-08553c4.tar.gz
-/wf-touch-b8b844f.tar.gz
-/wayfire-0.10.1.tar.gz
-/wf-touch-093d894.tar.gz
-/wf-utils-3ef27d1.tar.gz

.packit.yaml

@@ -1,27 +0,0 @@
-copy_upstream_release_description: false
-# downstream_package_name: foo # not mandatory
-# upstream_package_name: Foo # not mandatory
-upstream_project_url: https://github.com/WayfireWM/wayfire
-upstream_tag_template: v{version}
-
-jobs:
-  - job: pull_from_upstream
-    trigger: release
-    dist_git_branches:
-      - fedora-rawhide
-      # - fedora-development
-      # - fedora-all
-
-  - job: koji_build
-    trigger: commit
-    allowed_pr_authors: ["packit", "atim"]
-    allowed_committers: ["packit", "atim"]
-    dist_git_branches:
-      - fedora-all
-      # - epel-9
-
-  # - job: bodhi_update
-  #   trigger: commit
-  #   dist_git_branches:
-  #     - fedora-branched
-  #     # - epel-9

sources

@@ -1,3 +1,3 @@
-SHA512 (wayfire-0.10.1.tar.gz) = d28a442f005da63e1bd265a2c7cdbad6713bed0ae293de708cf9aeb466743c73882b2b7f434c044dc16d1f7048b2bafdb7f9a22ad736a7258601f2514ab0f5a4
-SHA512 (wf-touch-093d894.tar.gz) = 4ceb0c454df6d2d2aa77a312b5dba11bb36cf753cb6e9abfc71bd517b68edf5ce8e7bea3f05067dfb8b8fcf61c064a6a8573082c936e997c948b304a3cc61273
-SHA512 (wf-utils-3ef27d1.tar.gz) = da836b21c669a9638d370ca22ad2b605892998008ce9d13ea7c20ca8e1236252ee517af03f69af98ba06ae43b497c978d559787474b05b8f016f1e6737bacbad
+SHA512 (wayfire-0.7.4.tar.gz) = 9e82cb55cdcd34aa355da1e796ca69374d0c1ea11b50397f2119506d755e87b6b120fcec415fba57af66adc89ed62302ef645e91946926764923fd56d1c363aa
+SHA512 (wf-touch-8974eb0.tar.gz) = c57ab4d235b5551766cc33bf7ab773895c730a0ff306e5372284b8492a6a32a1e4d3c60a60a105043e9294e98d314f545a6ce9882bcebfdc50fb2447d0c05500
+SHA512 (wf-utils-889fdaf.tar.gz) = 355694a5a0e7f05918e2e1532787f0dfee2f799f916fce9a8c8f208c1c8fbee7fd3016b79331133a062c51d0eedbd0378e88262480199465df0b4f66419b635b

wayfire.spec

@@ -1,23 +1,20 @@
-%global forgeurl https://github.com/WayfireWM/wayfire
-
 # Git submodules
 #   * wf-utils
-%global commit1 3ef27d1f76b5f3d1f34305bff12b3174e81727c2
+%global commit1 889fdafa7b09fc6ce70313fd3f067cfc8c21a2ac
 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
 
 #   * wf-touch
-%global commit2 093d8943df03cc8a2667990a065513c1bf2b57e0
+%global commit2 8974eb0f6a65464b63dd03b842795cb441fb6403
 %global shortcommit2 %(c=%{commit2}; echo ${c:0:7})
 
 Name:           wayfire
-Version:        0.10.1
-%forgemeta
+Version:        0.7.4
 Release:        %autorelease
-Summary:        A modular and extensible wayland compositor
+Summary:        3D wayland compositor
 
 License:        MIT
-URL:            https://wayfire.org
-Source0:        %{forgesource}
+URL:            https://github.com/WayfireWM/wayfire
+Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 Source1:        https://github.com/WayfireWM/wf-utils/archive/%{commit1}/wf-utils-%{shortcommit1}.tar.gz
 Source2:        https://github.com/WayfireWM/wf-touch/archive/%{commit2}/wf-touch-%{shortcommit2}.tar.gz
 
@@ -25,7 +22,7 @@ BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  inotify-tools-devel
 BuildRequires:  libevdev-devel
-BuildRequires:  meson >= 0.64.0
+BuildRequires:  meson >= 0.53.0
 
 BuildRequires:  cmake(doctest)
 BuildRequires:  cmake(glm)
@@ -37,16 +34,14 @@ BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(libinput) >= 1.7.0
 BuildRequires:  pkgconfig(libjpeg)
 BuildRequires:  pkgconfig(libpng)
-BuildRequires:  pkgconfig(nlohmann_json) >= 3.11.2
 BuildRequires:  pkgconfig(pango)
 BuildRequires:  pkgconfig(pixman-1)
-BuildRequires:  pkgconfig(yyjson)
 BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-cursor)
 BuildRequires:  pkgconfig(wayland-protocols) >= 1.12
 BuildRequires:  pkgconfig(wayland-server)
-BuildRequires:  pkgconfig(wf-config) >= 0.10.0
-BuildRequires:  pkgconfig(wlroots-0.19)
+BuildRequires:  pkgconfig(wf-config) >= 0.7.0
+BuildRequires:  pkgconfig(wlroots) >= 0.15.0
 BuildRequires:  pkgconfig(xkbcommon)
 
 Recommends:     wayfire-config-manager
@@ -56,10 +51,9 @@ Provides:       bundled(wf-touch) = 0.0~git%{commit2}
 Provides:       bundled(wf-utils) = 0.0~git%{commit1}
 
 %description
-Wayfire is a 3D Wayland compositor, inspired by Compiz and based on wlroots.
-
-It aims to create a customizable, extendable and lightweight environment without
-sacrificing its appearance.
+Wayfire is a wayland compositor based on wlroots. It aims to create a
+customizable, extendable and lightweight environment without sacrificing its
+appearance.
 
 
 %package        devel
@@ -71,7 +65,7 @@ Development files for %{name}.
 
 
 %prep
-%forgeautosetup -p1
+%autosetup -p1
 %autosetup -D -T -a1
 %autosetup -D -T -a2
 mv wf-utils-%{commit1}/* subprojects/wf-utils/
@@ -82,17 +76,14 @@ mv wf-touch-%{commit2}/* subprojects/wf-touch/
 %meson                            \
     -Duse_system_wfconfig=enabled \
     -Duse_system_wlroots=enabled  \
-    -Dxwayland=enabled            \
     %{nil}
 %meson_build
 
 
 %install
 %meson_install
-install -D -p -m 0644 %{name}.desktop %{buildroot}%{_datadir}/wayland-sessions/%{name}.desktop
+install -Dpm0644 %{name}.desktop %{buildroot}%{_datadir}/wayland-sessions/%{name}.desktop
 rm -f %{buildroot}%{_libdir}/libwftouch.a
-# Duplicate man file
-rm -f %{buildroot}%{_prefix}/man/%{name}.1
 
 
 %files
@@ -101,18 +92,13 @@ rm -f %{buildroot}%{_prefix}/man/%{name}.1
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
 %{_datadir}/wayland-sessions/*.desktop
-%{_datadir}/xdg-desktop-portal/wayfire-portals.conf
 %{_libdir}/%{name}/
-%{_libdir}/lib%{name}-blur-base.so
 %{_libdir}/libwf-utils.so.0*
-%{_mandir}/man1/*.1*
-
 
 %files devel
-%{_includedir}/%{name}/
-%{_libdir}/lib%{name}-*.a
 %{_libdir}/libwf-utils.so
 %{_libdir}/pkgconfig/*.pc
+%{_includedir}/%{name}/
 
 
 %changelog