[muffin] Revert "Update to 1.8.0"

[leigh123linux]

commit f5f6b2b1532f3893b0d913f0c3c9ab881015c269
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Thu May 9 04:57:55 2013 +0100

    Revert "Update to 1.8.0"
    
    This reverts commit 40d6a4e6a65b8ce1715f4376903aca6aba822bf6.

 .gitignore  |    1 -
 muffin.spec |  127 ++++++++++++++++++++++++++++++++++------------------------
 sources     |    2 +-
 3 files changed, 75 insertions(+), 55 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1fa65cc..3a1e5f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,3 @@
 /muffin-1.1.0.tar.gz
 /muffin-1.1.1.tar.gz
 /muffin-1.1.2.tar.gz
-/muffin-1.8.0.tar.gz
diff --git a/muffin.spec b/muffin.spec
index 373d70d..bcfb867 100644
--- a/muffin.spec
+++ b/muffin.spec
@@ -1,29 +1,42 @@
-Name:           muffin
-Version:        1.8.0
-Release:        1%{?dist}
-Summary:        Window and compositing manager based on clutter
-License:        GPLv2+
-URL:            http://github.com/linuxmint/muffin
-#Because cinnamon upstream refuses to host pristine upstream tarballs
-Source0:        http://vicodan.fedorapeople.org/%{name}-%{version}.tar.gz
-
-#Because gnome-common causes configure process to fail.
-Patch0:        muffin_mate_common.patch
-BuildRequires: mate-common
-
-BuildRequires: clutter-gst-devel
-BuildRequires: desktop-file-utils
-BuildRequires: gnome-doc-utils
-BuildRequires: gobject-introspection-devel
-BuildRequires: gsettings-desktop-schemas-devel
-BuildRequires: gtk3-devel
-BuildRequires: gtk-doc
-BuildRequires: libcanberra-devel
-BuildRequires: libSM-devel
-BuildRequires: libX11-devel
-BuildRequires: pangox-compat-devel
-BuildRequires: startup-notification-devel
+%global        _internel_version  ab1d98e
+
+Name:          muffin
+Version:       1.1.2
+Release:       3%{?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
+
+
+BuildRequires: pkgconfig(clutter-1.0) >= 1.7.5
+BuildRequires: pkgconfig(pango)
+BuildRequires: pkgconfig(libstartup-notification-1.0)
+BuildRequires: pkgconfig(gtk+-3.0) >= 3.3.3
+BuildRequires: pkgconfig(gobject-introspection-1.0)
+BuildRequires: pkgconfig(sm)
+BuildRequires: pkgconfig(x11)
+BuildRequires: pkgconfig(xdamage)
+BuildRequires: pkgconfig(xext)
+BuildRequires: pkgconfig(xrandr)
+BuildRequires: pkgconfig(xrender)
+BuildRequires: pkgconfig(xcursor)
+BuildRequires: pkgconfig(xcomposite)
 BuildRequires: zenity
+BuildRequires: gnome-doc-utils
+BuildRequires: desktop-file-utils
+# Bootstrap requirements
+BuildRequires: gtk-doc gnome-common intltool
+BuildRequires: pkgconfig(libcanberra)
+BuildRequires: pkgconfig(gsettings-desktop-schemas)
+
+Requires: control-center-filesystem
+Requires: dbus-x11
+Requires: zenity
 
 %description
 Muffin is a window and compositing manager that displays and manages
@@ -47,20 +60,29 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 Header files and libraries for developing Muffin plugins. Also includes
 utilities for testing Metacity/Muffin themes.
 
-
 %prep
-%setup -q
-%patch0 -p1
-NOCONFIGURE=1 ./autogen.sh
+%setup -q -n linuxmint-%{name}-%{_internel_version}
+NOCONFIGURE=1 autoreconf -fi
 
 %build
-%configure --disable-static          \
-           --disable-scrollkeeper    \
-           --disable-schemas-compile \
-           --with-x
+%configure --disable-static --enable-compile-warnings=minimum
 
-make %{?_smp_mflags} V=1
+sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
+
+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
+    echo "$I was not defined in config.h"
+    grep "$I" config.h
+    exit 1
+  else
+    echo "$I was defined as it should have been"
+    grep "$I" config.h
+  fi
+done
+
+make %{?_smp_mflags} V=1
 
 %install
 make install DESTDIR=%{buildroot}
@@ -84,33 +106,32 @@ fi
 %posttrans
     /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
-
 %files -f %{name}.lang
-%doc README AUTHORS COPYING NEWS HACKING
-%{_mandir}/man1/*
-%{_bindir}/muffin*
-%{_libdir}/libmuffin.so
-%{_libdir}/libmuffin.so.0
-%{_libdir}/libmuffin.so.0.0.0
-%{_libdir}/muffin/Meta-Muffin.0.gir
-%{_libdir}/muffin/Meta-Muffin.0.typelib
+%doc README AUTHORS COPYING NEWS HACKING doc/theme-format.txt
+%doc %{_mandir}/man1/muffin.1.*
+%doc %{_mandir}/man1/muffin-message.1.*
+%{_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}/applications/muffin.desktop
 %{_datadir}/glib-2.0/schemas/org.cinnamon.muffin.gschema.xml
 %{_datadir}/gnome-control-center/keybindings/50-muffin-windows.xml
-%{_datadir}/gnome/wm-properties/muffin-wm.desktop
-%{_datadir}/muffin
 
 %files devel
-%{_includedir}/muffin
-%{_libdir}/muffin/plugins/default.so
-%{_libdir}/pkgconfig/libmuffin.pc
-%{_libdir}/pkgconfig/muffin-plugins.pc
+%{_bindir}/muffin-theme-viewer
+%{_bindir}/muffin-window-demo
+%{_includedir}/muffin/
+%{_libdir}/libmuffin.so
+%{_libdir}/muffin/Meta-3.0.gir
+%{_libdir}/pkgconfig/*
+%doc %{_mandir}/man1/muffin-theme-viewer.1.*
+%doc %{_mandir}/man1/muffin-window-demo.1.*
 
 %changelog
-* Wed May 08 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.8.0-1
-Update to version 1.8.0
-
 * Thu Feb 21 2013 Kalev Lember <kalevlember at gmail.com> - 1.1.2-3
 - Rebuilt for cogl soname bump
 
diff --git a/sources b/sources
index 4d6bc49..2d5ff82 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a3667fa7f9722e0675c06defc136466e  muffin-1.8.0.tar.gz
+0950fa5c00a165c7fed73b0898d072d5  muffin-1.1.2.tar.gz