[muffin] update to latest git snapshot

[leigh123linux]

commit 64c6f2607faef344d57aef4e244e59dd8d92f8d8
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Jul 18 12:35:09 2012 +0100

    update to latest git snapshot
    
    - drop patch
    - remove gconf bits

 .gitignore  |    1 +
 muffin.spec |   50 +++++++++++++++++++++++++-------------------------
 sources     |    2 +-
 3 files changed, 27 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f70a5b9..50d0056 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /muffin-1.0.2.tar.gz
+/muffin-1.0.4.gitfcea2f1.tar.gz
diff --git a/muffin.spec b/muffin.spec
index 965b0b0..21eb04b 100644
--- a/muffin.spec
+++ b/muffin.spec
@@ -1,26 +1,23 @@
-%global        _internel_version  10abba0
+%global        _internel_version  fcea2f1
 
 Name:          muffin
-Version:       1.0.3
-Release:       3%{?dist}
+Version:       1.0.4
+Release:       0.1.git%{_internel_version}%{?dist}
 Summary:       Window and compositing manager based on Clutter
 
 Group:         User Interface/Desktops
 License:       GPLv2+
 URL:           https://github.com/linuxmint/muffin
-# To generate tarball
-# wget https://github.com/linuxmint/muffin/tarball/1.0.3 -O muffin-1.0.3.tar.gz
-Source0:       %{name}-%{version}.tar.gz
+# To generate source
+# wget https://github.com/linuxmint/muffin/tarball/%{_internel_version} -O muffin-%{version}.git%{_internel_version}.tar.gz
+Source0:       http://leigh123linux.fedorapeople.org/pub/muffin/source/muffin-%{version}.git%{_internel_version}.tar.gz
 
-Patch0:        muffin-%{version}_fix_blackborder.patch
 
-
-BuildRequires: clutter-devel >= 1.5.8
+BuildRequires: clutter-devel >= 1.7.5
 BuildRequires: pango-devel
 BuildRequires: startup-notification-devel
-BuildRequires: gtk3-devel >= 2.99.0
+BuildRequires: gtk3-devel >= 3.3.3
 BuildRequires: pkgconfig
-BuildRequires: GConf2-devel
 BuildRequires: gobject-introspection-devel
 BuildRequires: libSM-devel
 BuildRequires: libX11-devel
@@ -36,10 +33,10 @@ BuildRequires: desktop-file-utils
 # Bootstrap requirements
 BuildRequires: gtk-doc gnome-common intltool
 BuildRequires: libcanberra-devel
+BuildRequires: gsettings-desktop-schemas-devel
 
 Requires: control-center-filesystem
 Requires: startup-notification
-Requires: GConf2
 Requires: dbus-x11
 Requires: zenity
 
@@ -68,13 +65,12 @@ utilities for testing Metacity/Muffin themes.
 %prep
 %setup -q -n linuxmint-%{name}-%{_internel_version}
 
-%patch0 -p1
 
 %build
 NOCONFIGURE=1 autoreconf -fi
  %configure --disable-static --enable-compile-warnings=minimum
 
-SHOULD_HAVE_DEFINED="HAVE_SM HAVE_XINERAMA HAVE_XFREE_XINERAMA HAVE_SHAPE HAVE_RANDR HAVE_STARTUP_NOTIFICATION HAVE_COMPOSITE_EXTENSION"
+SHOULD_HAVE_DEFINED="HAVE_SM HAVE_XINERAMA HAVE_XFREE_XINERAMA HAVE_SHAPE HAVE_RANDR HAVE_STARTUP_NOTIFICATION"
 
 for I in $SHOULD_HAVE_DEFINED; do
   if ! grep -q "define $I" config.h; then
@@ -90,9 +86,7 @@ done
 make %{?_smp_mflags} V=1
 
 %install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=%{buildroot}
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 #Remove libtool archives.
 rm -rf %{buildroot}/%{_libdir}/*.la
@@ -102,17 +96,16 @@ rm -rf %{buildroot}/%{_libdir}/*.la
 # Muffin contains a .desktop file so we just need to validate it
 desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
-%pre
-%gconf_schema_prepare muffin
-
-%preun
-%gconf_schema_remove muffin
+%post -p /sbin/ldconfig
 
-%post
+%postun
 /sbin/ldconfig
-%gconf_schema_upgrade muffin
+if [ $1 -eq 0 ]; then
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+fi
 
-%postun -p /sbin/ldconfig
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %files -f %{name}.lang
 %doc README AUTHORS COPYING NEWS HACKING doc/theme-format.txt
@@ -122,10 +115,12 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 %{_bindir}/muffin-message
 %{_datadir}/applications/*.desktop
 %{_datadir}/gnome/wm-properties/muffin-wm.desktop
-%config %{_sysconfdir}/gconf/schemas/muffin.schemas
 %{_datadir}/muffin
 %{_libdir}/lib*.so.*
 %{_libdir}/muffin/
+%{_datadir}/GConf/gsettings/muffin-schemas.convert
+%{_datadir}/glib-2.0/schemas/org.cinnamon.muffin.gschema.xml
+%{_datadir}/gnome-control-center/keybindings/50-muffin-windows.xml
 
 %files devel
 %{_bindir}/muffin-theme-viewer
@@ -137,6 +132,11 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 %doc %{_mandir}/man1/muffin-window-demo.1.gz
 
 %changelog
+* Wed Jul 18 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.0.4-0.1.gitfcea2f1
+- update to latest git snapshot
+- drop patch
+- remove gconf bits
+
 * Mon May 28 2012 leigh scott <leigh123linux at googlemail.com> - 1.0.3-3
 - add patch to fix black border issue
 
diff --git a/sources b/sources
index eb397c6..1c38706 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6d05a24e117e602a5803c90217ec1790  muffin-1.0.3.tar.gz
+d236f3dc9dffebc4e9b3b020669c4116  muffin-1.0.4.gitfcea2f1.tar.gz