$ git diff --patch-with-stat --summary 806e226423b2cd315122c7d4f5c20283d9db3233..a590ebf953ac42a057583c0af15ff17a6f24019c
.abf.yml | 4 +++-
muffin.spec | 30 ++++++++++++++++++++----------
2 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/.abf.yml b/.abf.yml
index eb725de..d8cb830 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,4 @@
-sources:
+removed_sources:
muffin-3.2.2.tar.gz: 729419a828d5fbcdc89dfb934a4461614fd1e611
+sources:
+ muffin-4.0.6.tar.gz: 136994ca9a3c571e5f93957ed0ed40662f17a4e1
diff --git a/muffin.spec b/muffin.spec
index 2ff235b..d23056c 100644
--- a/muffin.spec
+++ b/muffin.spec
@@ -1,10 +1,12 @@
%define major 0
%define libname %mklibname %{name} %{major}
%define devname %mklibname %{name} -d
+%define _disable_rebuild_configure 1
+%define _disable_lto 1
Summary: A small window manager for Cinnamon Desktop
Name: muffin
-Version: 3.2.2
+Version: 4.0.6
Release: 1
License: GPLv2+
Group: Graphical desktop/GNOME
@@ -17,14 +19,13 @@ BuildRequires: gsettings-desktop-schemas-devel
BuildRequires: gnome-common
BuildRequires: gtk-doc
BuildRequires: pkgconfig(cinnamon-desktop)
-BuildRequires: pkgconfig(clutter-1.0)
-BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(gnome-doc-utils)
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(ice)
+BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(libcanberra-gtk)
BuildRequires: pkgconfig(sm)
BuildRequires: pkgconfig(x11)
@@ -32,6 +33,12 @@ BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xinerama)
BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(libstartup-notification-1.0)
+BuildRequires: pkgconfig(xkeyboard-config)
+BuildRequires: pkgconfig(xkbcommon-x11)
+BuildRequires: pkgconfig(xkbfile)
+BuildRequires: pkgconfig(xtst)
+BuildRequires: pkgconfig(libudev)
+BuildRequires: pkgconfig(libinput)
%description
Muffin is a small window manager, using GTK+ and Clutter to do everything.
@@ -58,11 +65,13 @@ This package provides Muffin development files.
%setup -q
%build
-sh autogen.sh
+NOCONFIGURE=1 sh autogen.sh
%configure2_5x \
--enable-compile-warnings=no \
+ --disable-Werror \
--disable-static \
- --disable-scrollkeeper
+ --disable-scrollkeeper \
+ --disable-clutter-doc
%make
@@ -81,7 +90,8 @@ find %{buildroot}%{_libdir} -type f -name "*.la" -delete -print
%dir %{_libdir}/muffin/plugins
%{_libdir}/muffin/plugins/default.so
# -- typelib needs to be changed upstream, once this happens split the package
-%{_libdir}/muffin/Meta-Muffin.0.typelib
+%{_libdir}/muffin/*.typelib
+%{_libdir}/muffin/*.so
%{_datadir}/applications/muffin.desktop
%{_datadir}/muffin/
%{_datadir}/glib-2.0/schemas/org.cinnamon.muffin.gschema.xml
@@ -89,15 +99,15 @@ find %{buildroot}%{_libdir} -type f -name "*.la" -delete -print
%{_mandir}/man1/muffin-theme-viewer.1*
%{_mandir}/man1/muffin-window-demo.1*
%{_mandir}/man1/muffin.1*
+%{_libexecdir}/muffin-restart-helper
%files -n %{libname}
%{_libdir}/libmuffin.so.%{major}*
%files -n %{devname}
%{_includedir}/muffin/
-%{_libdir}/libmuffin.so
-%{_libdir}/muffin/Meta-Muffin.0.gir
-%{_libdir}/pkgconfig/libmuffin.pc
-%{_libdir}/pkgconfig/muffin-plugins.pc
+%{_libdir}/*.so
+%{_libdir}/muffin/*.gir
+%{_libdir}/pkgconfig/*.pc
%{_datadir}/gtk-doc/html/muffin