diff --git a/muffin-5.2.0.tar.gz b/muffin-5.6.3.tar.gz similarity index 37% rename from muffin-5.2.0.tar.gz rename to muffin-5.6.3.tar.gz index e4313b5095d68e393258e461de51b49724422e12..de95b5b9684b21cfd95460bb40f8edb2802d572a 100644 Binary files a/muffin-5.2.0.tar.gz and b/muffin-5.6.3.tar.gz differ diff --git a/muffin-adwaita.txt b/muffin-adwaita.txt deleted file mode 100644 index 1ea58c64aa64dbd4e0cfcc829d50b9027e20add0..0000000000000000000000000000000000000000 --- a/muffin-adwaita.txt +++ /dev/null @@ -1 +0,0 @@ -native diff --git a/muffin.spec b/muffin.spec index 3d2f7510a04f66a3507057a5c1e8a8f3e977124b..07d715e4980978757a162743513e831f69419459 100644 --- a/muffin.spec +++ b/muffin.spec @@ -1,34 +1,32 @@ Name: muffin -Version: 5.2.0 +Version: 5.6.3 Release: 1 Summary: Window and compositing manager based on Clutter License: GPLv2+ URL: https://github.com/linuxmint/%{name} Source0: https://github.com/linuxmint/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -Source1: muffin-adwaita.txt ExcludeArch: %{ix86} -BuildRequires: make -BuildRequires: desktop-file-utils +BuildRequires: meson +BuildRequires: mesa-libEGL-devel BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(graphene-gobject-1.0) +BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(libcanberra) -BuildRequires: pkgconfig(cinnamon-desktop) >= 5.2.0 -BuildRequires: pkgconfig(gnome-doc-utils) +BuildRequires: pkgconfig(libudev) +BuildRequires: pkgconfig(libwacom) +BuildRequires: pkgconfig(cinnamon-desktop) >= 5.6.0 BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(xkeyboard-config) BuildRequires: pkgconfig(xkbcommon-x11) BuildRequires: pkgconfig(xtst) BuildRequires: zenity -# Bootstrap requirements -BuildRequires: pkgconfig(gtk-doc) -BuildRequires: gnome-common -BuildRequires: intltool -Requires: dbus-x11 -Requires: zenity +Requires: dbus-x11 +Requires: zenity %description Muffin is a window and compositing manager that displays and manages @@ -43,6 +41,7 @@ management behaviors to meet the needs of the environment. %package devel Summary: Development package for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: mesa-libEGL-devel %description devel Header files and libraries for developing Muffin plugins. Also includes @@ -51,73 +50,51 @@ utilities for testing Metacity/Muffin themes. %prep %autosetup -p1 -NOCONFIGURE=1 ./autogen.sh +#NOCONFIGURE=1 ./autogen.sh %build -%configure --disable-static \ - --enable-startup-notification=yes \ - --disable-silent-rules \ - --enable-gtk-doc \ - --disable-clutter-doc \ - --disable-wayland-egl-platform \ - --disable-wayland-egl-server \ - --disable-kms-egl-platform \ - --disable-wayland \ - --disable-native-backend - -%make_build V=1 +%meson \ + -Dprofiler=false \ +%ifarch %{arm} + -Ddefault_driver=gles2 \ +%else + -Ddefault_driver=gl \ +%endif + -Dremote_desktop=false + +%meson_build %install -%make_install +%meson_install -# Create a dummy themes directory so that cinnamon settings will see -# the Adwaita fallback theme which has been removed from gnome-themes-standard -mkdir -p %{buildroot}/%{_datadir}/themes/Adwaita/metacity-1/ -cp %{SOURCE1} %{buildroot}/%{_datadir}/themes/Adwaita/metacity-1/ +rm -rf %{buildroot}%{_bindir}/ +rm -rf %{buildroot}%{_mandir}/man1/ +rm -rf %{buildroot}%{_datadir}/applications/ -#Remove libtool archives. find %{buildroot} -name '*.la' -exec rm -f {} ';' -desktop-file-install --delete-original \ - --dir %{buildroot}%{_datadir}/applications \ - --add-only-show-in X-Cinnamon \ - %{buildroot}%{_datadir}/applications/muffin.desktop - %find_lang %{name} %ldconfig_scriptlets %files -f %{name}.lang -%doc README AUTHORS NEWS HACKING doc/theme-format.txt +%doc README.md NEWS %license COPYING -%{_bindir}/muffin %{_libdir}/libmuffin.so.* -%{_libdir}/libmuffin-clutter-0.so -%{_libdir}/libmuffin-cogl-0.so -%{_libdir}/libmuffin-cogl-pango-0.so -%{_libdir}/libmuffin-cogl-path-0.so %{_libdir}/muffin/ %{_libexecdir}/muffin-restart-helper %exclude %{_libdir}/muffin/*.gir -%{_datadir}/applications/muffin.desktop -%dir %{_datadir}/muffin/ -%{_datadir}/muffin/theme/ -%{_datadir}/glib-2.0/schemas/org.cinnamon.muffin.gschema.xml -%{_datadir}/themes/Adwaita/metacity-1/ -%{_mandir}/man1/muffin.1.* +%{_datadir}/glib-2.0/schemas/org.cinnamon.muffin.*.xml %files devel -%{_bindir}/muffin-message -%{_bindir}/muffin-theme-viewer -%{_bindir}/muffin-window-demo -%{_datadir}/muffin/icons/ -%{_datadir}/gtk-doc/html/muffin/ %{_includedir}/muffin/ %{_libdir}/libmuffin.so %{_libdir}/muffin/*.gir %{_libdir}/pkgconfig/* -%{_mandir}/man1/muffin-* %changelog +* Mon Jan 02 2023 lin zhang - 5.6.3-1 +- update to 5.6.3 + * Fri May 6 2022 lin zhang - 5.2.0-1 - Initial Packaging