From 9fe7efc017d95874166fc05dd1f037d26decfe1b Mon Sep 17 00:00:00 2001 From: leigh123linux Date: May 07 2016 08:54:58 +0000 Subject: make adwaita show in cinnamon-settings theme (Joseph Wang) --- diff --git a/muffin-adwaita.txt b/muffin-adwaita.txt new file mode 100644 index 0000000..1ea58c6 --- /dev/null +++ b/muffin-adwaita.txt @@ -0,0 +1 @@ +native diff --git a/muffin.spec b/muffin.spec index 6f95479..f626311 100644 --- a/muffin.spec +++ b/muffin.spec @@ -2,7 +2,7 @@ Name: muffin Version: 3.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Window and compositing manager based on Clutter Group: User Interface/Desktops @@ -15,6 +15,7 @@ URL: https://github.com/linuxmint/muffin # wget https://github.com/linuxmint/muffin/tarball/%%{_internal_version} -O muffin-%%{version}.git%%{_internal_version}.tar.gz #Source0: http://leigh123linux.fedorapeople.org/pub/muffin/source/muffin-%%{version}.git%%{_internal_version}.tar.gz Source0: http://leigh123linux.fedorapeople.org/pub/muffin/source/muffin-%{version}.tar.gz +Source1: muffin-adwaita.txt # revert ibus change # https://github.com/linuxmint/muffin/commit/19397761a8b57823b236320f8da9a706bbf09d79 @@ -74,6 +75,11 @@ make %{?_smp_mflags} V=1 %install %{make_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 + #Remove libtool archives. rm -rf %{buildroot}/%{_libdir}/*.la @@ -98,6 +104,7 @@ fi %dir %{_datadir}/muffin/ %{_datadir}/muffin/theme/ %{_datadir}/glib-2.0/schemas/org.cinnamon.muffin.gschema.xml +%{_datadir}/themes/Adwaita/metacity-1/ %files devel %{_bindir}/muffin-theme-viewer @@ -110,6 +117,9 @@ fi %{_mandir}/man1/muffin-* %changelog +* Sat May 07 2016 leigh - 3.0.0-3 +- make adwaita show in cinnamon-settings theme (Joseph Wang) + * Fri May 06 2016 Leigh Scott - 3.0.0-2 - fix cinnamon crash