[packages/muffin] - HAVE_COMPOSITE_EXTENSION is not defined nor used anywhere - updated BRs - new gsettings schemas an

baggins baggins at pld-linux.org
Sun Oct 14 21:11:23 CEST 2012


commit 37002ec7d2b18325a52ea925765a2920e4f98010
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Oct 14 21:10:36 2012 +0200

    - HAVE_COMPOSITE_EXTENSION is not defined nor used anywhere
    - updated BRs
    - new gsettings schemas and xml files need taking care of,
      thus rel 1.1

 muffin.spec | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/muffin.spec b/muffin.spec
index e383970..f2cac94 100644
--- a/muffin.spec
+++ b/muffin.spec
@@ -2,7 +2,7 @@
 Summary:	Window and compositing manager based on Clutter
 Name:		muffin
 Version:	1.1.1
-Release:	1
+Release:	1.1
 License:	GPL v2+
 Group:		X11/Applications
 URL:		https://github.com/linuxmint/muffin
@@ -13,6 +13,7 @@ BuildRequires:	clutter-devel >= 1.5.8
 BuildRequires:	desktop-file-utils
 BuildRequires:	gnome-doc-utils
 BuildRequires:	gobject-introspection-devel
+BuildRequires:	gsettings-desktop-schemas-devel
 BuildRequires:	gtk+3-devel >= 2.99.0
 BuildRequires:	pango-devel
 BuildRequires:	pkgconfig
@@ -74,7 +75,7 @@ includes utilities for testing Metacity/Muffin themes.
 	--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
@@ -108,17 +109,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
+%if 0
 %gconf_schema_install muffin.schemas
 
 %preun
 %gconf_schema_uninstall muffin.schemas
+%endif
 
 %postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README AUTHORS NEWS HACKING doc/theme-format.txt
-%{_sysconfdir}/gconf/schemas/muffin.schemas
 %attr(755,root,root) %{_bindir}/muffin
 %attr(755,root,root) %{_bindir}/muffin-message
 %{_mandir}/man1/muffin.1*
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/muffin.git/commitdiff/37002ec7d2b18325a52ea925765a2920e4f98010



More information about the pld-cvs-commit mailing list