leigh123linux pushed to muffin (f21). "update to 2.6.0 release"

[notifications at fedoraproject.org]

From 9feaf635c828eac01f74618dfff318b1541be33b Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux at googlemail.com>
Date: Wed, 20 May 2015 09:06:22 +0100
Subject: update to 2.6.0 release


diff --git a/.gitignore b/.gitignore
index b28408f..7f02fba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
 /muffin-2.4.5.tar.gz
 /muffin-2.5.0.gita25a885.tar.gz
 /muffin-2.5.0.git5e7b945.tar.gz
+/muffin-2.6.0.tar.gz
diff --git a/muffin.spec b/muffin.spec
index 7456bb6..c53dd7c 100644
--- a/muffin.spec
+++ b/muffin.spec
@@ -1,8 +1,8 @@
-%global _internal_version  5e7b945
+#global _internal_version  5e7b945
 
 Name:          muffin
-Version:       2.5.0
-Release:       0.2.git%{_internal_version}%{?dist}
+Version:       2.6.0
+Release:       1%{?dist}
 Summary:       Window and compositing manager based on Clutter
 
 Group:         User Interface/Desktops
@@ -13,8 +13,8 @@ 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
 
 # revert ibus change
 # https://github.com/linuxmint/muffin/commit/19397761a8b57823b236320f8da9a706bbf09d79
@@ -25,7 +25,7 @@ Patch1:        remove_muffin_binary.patch
 BuildRequires: pkgconfig(clutter-1.0) >= 1.7.5
 BuildRequires: pkgconfig(sm)
 BuildRequires: pkgconfig(libcanberra)
-BuildRequires: pkgconfig(cinnamon-desktop) >= 2.5.0
+BuildRequires: pkgconfig(cinnamon-desktop) >= 2.6.0
 BuildRequires: pkgconfig(gnome-doc-utils)
 BuildRequires: pkgconfig(gobject-introspection-1.0)
 BuildRequires: zenity
@@ -58,9 +58,8 @@ 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
 
 %build
@@ -108,6 +107,9 @@ fi
 %{_mandir}/man1/muffin-window-demo.1.*
 
 %changelog
+* Wed May 20 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.6.0-1
+- update to 2.6.0 release
+
 * Tue May 05 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.5.0-0.2.git5e7b945
 - update to git snapshot
 
diff --git a/sources b/sources
index d05c81c..ec89f6c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-815e4ec5b74450b4a38ea1bae7d64e3f  muffin-2.5.0.git5e7b945.tar.gz
+6afbbf814b7e6a6bcc0c863d2ee036b0  muffin-2.6.0.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/muffin.git/commit/?h=f21&id=9feaf635c828eac01f74618dfff318b1541be33b