[muffin] rebase for muffin next

Tue Jul 23 17:05:49 UTC 2013

commit d2e3f25592ea3b031c58c5d65afde6f86aa63864
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Jul 23 18:05:37 2013 +0100

    rebase for muffin next

 .gitignore                 |    1 +
 muffin.spec                |   33 +++++++------
 remove-wm-properties.patch |  112 ++++++++++++++++++++++++++++++++++++++++++++
 sources                    |    2 +-
 workspace-name_error.patch |   21 --------
 5 files changed, 133 insertions(+), 36 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index c5eebe6..fd6ffdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /muffin-1.8.0.tar.gz
 /muffin-1.8.1.tar.gz
 /muffin-1.8.2.tar.gz
+/muffin-1.8.3.git9611aa2.tar.gz
diff --git a/muffin.spec b/muffin.spec
index f6b49ad..d811ca2 100644
--- a/muffin.spec
+++ b/muffin.spec
@@ -1,19 +1,22 @@
+%global _internal_version  9611aa2
+
 Name:          muffin
-Version:       1.8.2
-Release:       2%{?dist}
+Version:       1.8.3
+Release:       0.1.git%{_internal_version}%{?dist}
 Summary:       Window and compositing manager based on Clutter
 
 Group:         User Interface/Desktops
 License:       GPLv2+
 URL:           https://github.com/linuxmint/muffin
-# 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}.tar.gz
+#Because linuxmint upstream refuses to host pristine upstream tarballs
+# To generate tarball
+# 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
 
-# https://github.com/linuxmint/muffin/pull/81
-Patch0:        alt-tab.patch
-# https://github.com/linuxmint/muffin/pull/98
-Patch1:        workspace-name_error.patch
+# https://github.com/linuxmint/muffin/pull/111
+Patch0:        remove-wm-properties.patch
 
 
 BuildRequires: pkgconfig(clutter-1.0) >= 1.7.5
@@ -37,7 +40,6 @@ BuildRequires: gtk-doc gnome-common intltool
 BuildRequires: pkgconfig(libcanberra)
 BuildRequires: pkgconfig(gsettings-desktop-schemas)
 
-Requires: control-center-filesystem
 Requires: dbus-x11
 Requires: zenity
 
@@ -64,9 +66,11 @@ Header files and libraries for developing Muffin plugins. Also includes
 utilities for testing Metacity/Muffin themes.
 
 %prep
-%setup -q
+%setup -q -n linuxmint-muffin-%{_internal_version}
 %patch0 -p1
-%patch1 -p1
+sed -i -e 's@{ACLOCAL_FLAGS}@{ACLOCAL_FLAGS} -I m4 at g' Makefile.am
+echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in
+
 NOCONFIGURE=1 ./autogen.sh
 
 %build
@@ -118,13 +122,11 @@ fi
 %{_bindir}/muffin
 %{_bindir}/muffin-message
 %{_datadir}/applications/*.desktop
-%{_datadir}/gnome/wm-properties/muffin-wm.desktop
 %{_datadir}/muffin/
 %{_libdir}/libmuffin.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
@@ -136,6 +138,9 @@ fi
 %doc %{_mandir}/man1/muffin-window-demo.1.*
 
 %changelog
+* Tue Jul 23 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.8.3-0.1.git%{_internel_version}
+- rebase for muffin next
+
 * Fri Jun 14 2013 leigh scott <leigh123linux at googlemail.com> - 1.8.2-2
 - patch to fix bzr 957421
 
diff --git a/remove-wm-properties.patch b/remove-wm-properties.patch
new file mode 100644
index 0000000..b2bc021
--- /dev/null
+++ b/remove-wm-properties.patch
@@ -0,0 +1,112 @@
+diff --git a/debian/muffin.install b/debian/muffin.install
+index 3b71ab4..ca2c3ea 100644
+--- a/debian/muffin.install
++++ b/debian/muffin.install
+@@ -1,4 +1,4 @@
+ usr/bin
+ usr/lib/muffin/plugins
+ usr/share/applications
+-usr/share/gnome
++
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index 1f566a8..7a4a759 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -17,7 +17,6 @@ src/core/window.c
+ src/core/window-props.c
+ src/core/xprops.c
+ src/muffin.desktop.in
+-src/muffin-wm.desktop.in
+ src/org.cinnamon.muffin.gschema.xml.in
+ src/tools/muffin-message.c
+ src/ui/frames.c
+diff --git a/src/Makefile.am b/src/Makefile.am
+index b108800..0af2cb4 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -264,11 +264,6 @@ desktopfiles_in_files=muffin.desktop.in
+ desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop)
+ desktopfiles_DATA = $(desktopfiles_files)
+ 
+-wmpropertiesdir=$(datadir)/gnome/wm-properties
+-wmproperties_in_files=muffin-wm.desktop.in
+-wmproperties_files=$(wmproperties_in_files:.desktop.in=.desktop)
+-wmproperties_DATA = $(wmproperties_files)
+-
+ gsettings_SCHEMAS = org.cinnamon.muffin.gschema.xml
+ @INTLTOOL_XML_NOMERGE_RULE@
+ @GSETTINGS_RULES@
+@@ -285,7 +280,6 @@ BUILT_SOURCES = inlinepixbufs.h
+ CLEANFILES =					\
+ 	inlinepixbufs.h				\
+ 	muffin.desktop				\
+-	muffin-wm.desktop			\
+ 	org.cinnamon.muffin.gschema.xml		\
+ 	$(xml_DATA)				\
+ 	$(muffin_built_sources)			\
+@@ -300,10 +294,8 @@ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libmuffin.pc muffin-plugins.pc
+ 
+ EXTRA_DIST=$(desktopfiles_files) 	\
+-	$(wmproperties_files)		\
+ 	$(IMAGES) 			\
+ 	$(desktopfiles_in_files)	\
+-	$(wmproperties_in_files)	\
+ 	$(xml_in_files)			\
+ 	org.cinnamon.muffin.gschema.xml.in \
+ 	muffin-schemas.convert \
+diff --git a/src/muffin-wm.desktop.desktop b/src/muffin-wm.desktop.desktop
+deleted file mode 100644
+index 2c3a7e7..0000000
+--- a/src/muffin-wm.desktop.desktop
++++ /dev/null
+@@ -1,23 +0,0 @@
+-
+-[Desktop Entry]
+-Type=Application
+-Name=Muffin
+-Exec=muffin
+-# name of loadable control center module
+-X-GNOME-WMSettingsModule=metacity
+-# name we put on the WM spec check window
+-X-GNOME-WMName=Muffin
+-# back compat only 
+-X-GnomeWMSettingsLibrary=metacity
+-X-GNOME-Bugzilla-Bugzilla=GNOME
+-X-GNOME-Bugzilla-Product=muffin
+-X-GNOME-Bugzilla-Component=general
+-X-GNOME-Autostart-Phase=WindowManager
+-X-GNOME-Provides=windowmanager
+-X-GNOME-Autostart-Notify=true
+-
+-Name[en_US]=muffin-wm.desktop
+-
+-[Window Manager]
+-SessionManaged=true
+-
+diff --git a/src/muffin-wm.desktop.in b/src/muffin-wm.desktop.in
+deleted file mode 100644
+index 950a61a..0000000
+--- a/src/muffin-wm.desktop.in
++++ /dev/null
+@@ -1,20 +0,0 @@
+-[Desktop Entry]
+-Type=Application
+-_Name=Muffin
+-Exec=muffin
+-# name of loadable control center module
+-X-GNOME-WMSettingsModule=metacity
+-# name we put on the WM spec check window
+-X-GNOME-WMName=Muffin
+-# back compat only 
+-X-GnomeWMSettingsLibrary=metacity
+-X-GNOME-Bugzilla-Bugzilla=GNOME
+-X-GNOME-Bugzilla-Product=muffin
+-X-GNOME-Bugzilla-Component=general
+-X-GNOME-Autostart-Phase=WindowManager
+-X-GNOME-Provides=windowmanager
+-X-GNOME-Autostart-Notify=true
+-
+-[Window Manager]
+-SessionManaged=true
+-
diff --git a/sources b/sources
index 1a7cfa5..0fda158 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b68735a1e2b9fe0971d024d4e66b864a  muffin-1.8.2.tar.gz
+dc362c686982d7204eb7e82d4ccf9c16  muffin-1.8.3.git9611aa2.tar.gz
