Compare commits

..

No commits in common. "rawhide" and "f37" have entirely different histories.

4 changed files with 28 additions and 49 deletions

8
.gitignore vendored
View file

@ -16,11 +16,3 @@
/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

View file

@ -1,27 +1,18 @@
upstream_package_name: wayfire
downstream_package_name: wayfire
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: pull_from_upstream
trigger: release
dist_git_branches:
- fedora-rawhide
# - job: bodhi_update
# trigger: commit
# dist_git_branches:
# - fedora-branched
# # - epel-9
- job: koji_build
trigger: commit
allowed_pr_authors: ["atim"]
allowed_committers: ["atim"]
dist_git_branches:
- fedora-all

View file

@ -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.8.0.tar.gz) = 7dd9066ea7e776e40093d71f039893a96e85d36c23da3790fb185baca9d4cd5d07df96fda07fcf95ecc1cc14f7ccf111499dd0515f7f4db6c7eb1467290eaa17
SHA512 (wf-touch-8974eb0.tar.gz) = c57ab4d235b5551766cc33bf7ab773895c730a0ff306e5372284b8492a6a32a1e4d3c60a60a105043e9294e98d314f545a6ce9882bcebfdc50fb2447d0c05500
SHA512 (wf-utils-15f8e16.tar.gz) = fa81d6f7c654cceb73e201eba49d3b7232017dc41f7ded5d62cb4f749a35dbb02b4f3eab90db78750fa5520c487391525af19b49eca45300e440a76b3561adf3

View file

@ -1,20 +1,21 @@
%global forgeurl https://github.com/WayfireWM/wayfire
%global forgeurl https://github.com/WayfireWM/%{name}
# Git submodules
# * wf-utils
%global commit1 3ef27d1f76b5f3d1f34305bff12b3174e81727c2
%global commit1 15f8e16721585ae3eaf278ba71d7064237eb23f5
%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.8.0
Release: %autorelease
Summary: A modular and extensible wayland compositor
%forgemeta
License: MIT
URL: https://wayfire.org
Source0: %{forgesource}
@ -25,7 +26,7 @@ BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: inotify-tools-devel
BuildRequires: libevdev-devel
BuildRequires: meson >= 0.64.0
BuildRequires: meson >= 0.56.0
BuildRequires: cmake(doctest)
BuildRequires: cmake(glm)
@ -37,16 +38,15 @@ BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(libinput) >= 1.7.0
BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(nlohmann_json) >= 3.11.2
BuildRequires: pkgconfig(nlohmann_json)
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.8.0
BuildRequires: pkgconfig(wlroots) >= 0.16.0
BuildRequires: pkgconfig(xkbcommon)
Recommends: wayfire-config-manager
@ -57,9 +57,8 @@ 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.
It aims to create a customizable, extendable and lightweight environment
without sacrificing its appearance.
%package devel
@ -82,7 +81,6 @@ mv wf-touch-%{commit2}/* subprojects/wf-touch/
%meson \
-Duse_system_wfconfig=enabled \
-Duse_system_wlroots=enabled \
-Dxwayland=enabled \
%{nil}
%meson_build
@ -101,7 +99,6 @@ 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*
@ -110,7 +107,6 @@ rm -f %{buildroot}%{_prefix}/man/%{name}.1
%files devel
%{_includedir}/%{name}/
%{_libdir}/lib%{name}-*.a
%{_libdir}/libwf-utils.so
%{_libdir}/pkgconfig/*.pc