[muffin] update to 2.4.0

[leigh123linux]

commit 26492dd72823682013e61bb6f51cdc40dfad64b7
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Oct 31 00:07:34 2014 +0000

    update to 2.4.0

 .gitignore     |    1 +
 automake.patch |   20 --------------------
 muffin.spec    |   18 ++++++++++--------
 sources        |    2 +-
 4 files changed, 12 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6190bf9..019ed72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
 /muffin-2.2.6.tar.gz
 /muffin-2.4.0.gita9a68ed.tar.gz
 /muffin-2.4.0.gitd9f4fcd.tar.gz
+/muffin-2.4.0.tar.gz
diff --git a/muffin.spec b/muffin.spec
index b63e058..35fb547 100644
--- a/muffin.spec
+++ b/muffin.spec
@@ -1,8 +1,8 @@
-%global _internal_version  d9f4fcd
+#global _internal_version  d9f4fcd
 
 Name:          muffin
 Version:       2.4.0
-Release:       0.2.git%{_internal_version}%{?dist}
+Release:       1%{?dist}
 Summary:       Window and compositing manager based on Clutter
 
 Group:         User Interface/Desktops
@@ -13,15 +13,14 @@ URL:           https://github.com/linuxmint/muffin
 # wget https://github.com/linuxmint/muffin/archive/%%{version}.tar.gz -O muffin-%%{version}.tar.gz
 # for git
 # 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
+#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
 
-Patch0:        automake.patch
 # revert ibus change
 # https://github.com/linuxmint/muffin/commit/19397761a8b57823b236320f8da9a706bbf09d79
 # to fix https://bugzilla.redhat.com/show_bug.cgi?id=1082118
-Patch1:        revert_ibus.patch
-Patch2:        remove_muffin_binary.patch
+Patch0:        revert_ibus.patch
+Patch1:        remove_muffin_binary.patch
 
 BuildRequires: pkgconfig(clutter-1.0) >= 1.7.5
 BuildRequires: pkgconfig(sm)
@@ -61,7 +60,7 @@ Header files and libraries for developing Muffin plugins. Also includes
 utilities for testing Metacity/Muffin themes.
 
 %prep
-%autosetup -p1 -n linuxmint-%{name}-%{_internal_version}
+%autosetup -p1
 
 echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac
 NOCONFIGURE=1 ./autogen.sh
@@ -110,6 +109,9 @@ fi
 %{_mandir}/man1/muffin-window-demo.1.*
 
 %changelog
+* Fri Oct 31 2014 Leigh Scott <leigh123linux at googlemail.com> - 2.4.0-1
+- update to 2.4.0
+
 * Thu Oct 02 2014 Leigh Scott <leigh123linux at googlemail.com> - 2.4.0-0.2.gitd9f4fcd
 - update to latest git
 
diff --git a/sources b/sources
index 41f3e4b..f5d39a4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-429901f4b4a0f2fea3bb242d752571a4  muffin-2.4.0.gitd9f4fcd.tar.gz
+f471a73e395b49a01316c78e127357b8  muffin-2.4.0.tar.gz