compiz: change BR & R: marco

task-compiz: add compiz-mate
yelp: add R

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9586 ec354946-7b23-47d6-9f5a-488ba84defc7

c/compiz/compiz-vl.spec

@@ -4,13 +4,13 @@
 %define		dialogversion	0.7.18
 %define 	kde_dialogversion 0.0.5
 
-%define		core_plugins	blur clone commands cube dbus decoration fade ini inotify minimize move obs place png regex resize rotate scale screenshot switcher video water wobbly zoom fs
+%define		core_plugins	blur clone commands cube dbus decoration fade ini inotify minimize move obs place png regex resize rotate scale screenshot switcher video water wobbly zoom fs 
 
-%define		gnome_plugins	annotate gconf glib svg gnomecompat
+%define		mate_plugins	annotate glib svg gnomecompat
 
 # List of plugins passed to ./configure.  The order is important
 
-%define		plugins		core,glib,gconf,dbus,png,svg,video,screenshot,decoration,clone,place,fade,minimize,move,resize,switcher,scale,wall
+%define		plugins		core,glib,dbus,png,svg,video,screenshot,decoration,clone,place,fade,minimize,move,resize,switcher,scale,wall
 
 Summary:        OpenGL window and compositing manager
 Summary(ja):    OpenGL ウィンドウ・コンポジットマネージャ
@@ -19,7 +19,7 @@ URL:            http://www.go-compiz.org
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.8.8
-Release:        6%{?_dist_release}
+Release:        7%{?_dist_release}
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -45,8 +45,6 @@ BuildRequires:	libXrender-devel
 BuildRequires:  libXt-devel
 BuildRequires:	libSM-devel
 
-BuildRequires:	GConf2-devel
-BuildRequires:  control-center-devel
 BuildRequires:  dbus-devel
 BuildRequires:  dbus-glib-devel
 BuildRequires:  fuse-devel
@@ -54,7 +52,8 @@ BuildRequires:  gnome-desktop-devel >= 2.30.0
 BuildRequires:  libglade2-devel
 BuildRequires:  librsvg2-devel
 BuildRequires:  libxslt-devel
-BuildRequires:  metacity-devel
+BuildRequires:  marco-devel
+BuildRequires:  mate-control-center-devel
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  intltool >= 0.35
@@ -69,6 +68,8 @@ Conflicts:	control-center < 2.32.1-2
 # Make sure that former beryl users still have bling
 Obsoletes:	beryl-core
 
+Obsoletes:  %{name}-gnome < 0.8.8-7
+
 Source0:        http://releases.compiz.org/%{version}/%{name}-%{version}.tar.bz2
 Source1:	desktop-effects-%{dialogversion}.tar.bz2
 Source2:	kde-desktop-effects-%{kde_dialogversion}.tar.bz2
@@ -102,6 +103,7 @@ Patch2010: compiz-0.8.6-fix-pixmap-size-calculation.patch
 
 # Vine default options
 Patch3000: compiz-0.8.6-vine-default.patch
+Patch3001: compiz-mate.patch
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -131,24 +133,19 @@ and developer docs for the compiz package.
 Install compiz-devel if you want to develop plugins for the compiz
 windows and compositing manager.
 
-%package gnome
+%package mate
-Summary: Compiz gnome integration bits
+Summary: Compiz mate integration bits
-Summary(ja): Compiz gnome integration bits
+Summary(ja): Compiz mate integration bits
 Group: User Interface/Desktops
-Requires: gnome-session
+Requires: mate-session-manager
-Requires: metacity
+Requires: marco
 Requires: libwnck
 Requires: glx-utils
 Requires: %{name} = %{version}
-Requires(pre): GConf2
-Requires(post): GConf2
-Requires(preun): GConf2
-Obsoletes: compiz < 0.5.2-8
-Obsoletes: beryl-gnome
 
-%description gnome
+%description mate
-The compiz-gnome package contains gtk-window-decorator,
+The compiz-mate package contains gtk-window-decorator,
-and other gnome integration related stuff.
+and other mate integration related stuff.
 
 %if %{with kde}
 %package kde
@@ -193,6 +190,7 @@ popd
 
 # vine patch
 %patch3000 -p1 -b .vine-default
+%patch3001 -p1 -b .mate
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -210,18 +208,17 @@ autoreconf -if
 %{?with_kde: --enable-kde4 }			\
 %{!?with_kde: --disable-kde4 }			\
 	--disable-kde				\
-	--enable-gconf 				\
+	--disable-gconf 			\
 	--enable-dbus 				\
-	--enable-place 				\
 	--enable-librsvg 			\
 	--enable-gtk 				\
-	--enable-metacity 			\
+	--enable-marco	 			\
-	--enable-gnome				\
+	--enable-mate				\
 	--with-default-plugins=%{plugins}	\
 	--enable-gnome-keybindings	     
 
 
-make LIBTOOL=/usr/bin/libtool %{?_smp_mflags} imagedir=%{_datadir}/pixmaps
+make LIBTOOL=/usr/bin/libtool %{?_smp_mflags} imagedir=%{_datadir}/pixmaps 
 
 # desktop-effects
 cd ../desktop-effects-%{dialogversion}
@@ -230,9 +227,7 @@ cd ../desktop-effects-%{dialogversion}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make LIBTOOL=/usr/bin/libtool DESTDIR=$RPM_BUILD_ROOT install || exit 1
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 echo INSTALLING DESKTOP EFFECTS
 pushd ../desktop-effects-%{dialogversion}
@@ -287,62 +282,35 @@ find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
 %find_lang desktop-effects
 
 cat compiz.lang > core-files.txt
-cat desktop-effects.lang > gnome-files.txt
+cat desktop-effects.lang > mate-files.txt
 
 for f in %{core_plugins}; do
   echo %{_libdir}/compiz/lib$f.so
   echo %{_datadir}/compiz/$f.xml
 done >> core-files.txt
 
-for f in %{gnome_plugins}; do
+for f in %{mate_plugins}; do
   echo %{_libdir}/compiz/lib$f.so
   echo %{_datadir}/compiz/$f.xml
-done >> gnome-files.txt
+done >> mate-files.txt
+
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/compiz.desktop
+rm -f $RPM_BUILD_ROOT%{_datadir}/compiz/gconf.xml
 
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-%post gnome
+%post mate
 update-desktop-database -q %{_datadir}/applications
-
-export GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source`
-for f in %{core_plugins} %{gnome_plugins} core; do
-  echo %{_sysconfdir}/gconf/schemas/compiz-${f}.schemas; done \
-  | xargs gconftool-2 --makefile-install-rule >& /dev/null || :
-
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gwd.schemas >& /dev/null || :
-
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
 	/usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
-
+%postun mate
-%pre gnome
+update-desktop-database -q %{_datadir}/applications
-if [ "$1" -gt 1 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  for f in %{core_plugins} %{gnome_plugins} core; do
-    echo %{_sysconfdir}/gconf/schemas/compiz-${f}.schemas; done \
-    | xargs gconftool-2 --makefile-uninstall-rule >& /dev/null || :
-
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gwd.schemas >& /dev/null || :
-fi
-
-
-%preun gnome
-if [ "$1" -eq 0 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  for f in %{core_plugins} %{gnome_plugins} core; do
-    echo %{_sysconfdir}/gconf/schemas/compiz-${f}.schemas; done \
-    | xargs gconftool-2 --makefile-uninstall-rule >& /dev/null || :
-
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gwd.schemas >& /dev/null || :
-fi
-
-
-%postun gnome
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
 	/usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
@@ -371,13 +339,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/compiz/*.png
 %{_datadir}/compiz/core.xml
 
-
+%files mate -f mate-files.txt
-%files gnome -f gnome-files.txt
 %defattr(-, root, root)
-#%{_bindir}/compiz-gtk
 %{_bindir}/gtk-window-decorator
 %{_bindir}/desktop-effects
-#%{_datadir}/applications/compiz-gtk.desktop
+%{_libdir}/window-manager-settings/libcompiz.so
 %{_datadir}/compiz/desktop-effects.glade
 %{_datadir}/icons/hicolor/16x16/apps/desktop-effects.png
 %{_datadir}/icons/hicolor/24x24/apps/desktop-effects.png
@@ -385,9 +351,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/36x36/apps/desktop-effects.png
 %{_datadir}/icons/hicolor/48x48/apps/desktop-effects.png
 %{_datadir}/icons/hicolor/96x96/apps/desktop-effects.png
-#%{_datadir}/xsessions/compiz-gnome.desktop
+%{_datadir}/mate/wm-properties/compiz-wm.desktop
-#%{_datadir}/gnome-session/sessions/compiz-gnome.session
+%{_datadir}/mate-control-center/keybindings/50-compiz-desktop-key.xml
-%{_sysconfdir}/gconf/schemas/*.schemas
+%{_datadir}/mate-control-center/keybindings/50-compiz-key.xml
 
 %if %{with kde}
 %files kde
@@ -405,14 +371,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/compiz.pc
 %{_libdir}/pkgconfig/libdecoration.pc
 %{_libdir}/pkgconfig/compiz-cube.pc
-%{_libdir}/pkgconfig/compiz-gconf.pc
 %{_libdir}/pkgconfig/compiz-scale.pc
-%{_datadir}/compiz/schemas.xslt
 %{_includedir}/compiz
 %{_libdir}/libdecoration.so
 
 
 %changelog
+* Sun Jun 07 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.8-7
+- add Patch3001 (compiz-mate.patch)
+- add BuildRequires: marco-devel, mate-control-center-devel
+- remove BuildRequires: GConf2-devel, control-center-devel, metacity-devel
+- create %%{name}-mate subpackage
+- remove %%{name}-gnome subpackage
+
 * Sun Sep 14 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.8-6
 - rebuild with VineSeed environment
 

t/task-compiz/task-compiz-vl.spec

@@ -2,7 +2,7 @@ Summary: Virtual package for Compiz
 Summary(ja): Compiz バーチャルパッケージ
 Name: task-compiz
 Version: 0.8.8
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: GPL
 Group: User Interface/Desktops
 
@@ -15,13 +15,11 @@ BuildArchitectures: noarch
 Requires: compiz = %{version}
 #Requires: compiz-bcop = %{version}
 Requires: compiz-bcop = %{version}
-Requires: compiz-gnome = %{version}
+Requires: compiz-mate = %{version}
 Requires: compiz-plugins = %{version}
 Requires: compiz-plugins-extra = %{version}
 Requires: compiz-plugins-extra-gnome = %{version}
 Requires: compiz-plugins-gnome = %{version}
-#Requires: compizconfig-backend-gconf = %{version}
-Requires: compizconfig-backend-gconf = %{version}
 #Requires: compizconfig-python = %{version}
 Requires: compizconfig-python = 0.8.4
 #Requires: libcompizconfig = %{version}
@@ -57,6 +55,10 @@ This is a virtual package for Compiz development files.
 %files devel
 
 %changelog
+* Sun Aug 28 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.8-1
+- add compiz-mate
+- remove compiz-gnome, compizconfig-backend-gconf
+
 * Sun Aug 28 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.8.8-1
 - fix package version
 
@@ -66,6 +68,6 @@ This is a virtual package for Compiz development files.
 * Thu Jun 25 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 0.8.2-2
 - remove emerald
 
-* Mon May 10 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 0.8.2-1
+* Sun May 10 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 0.8.2-1
 - initial build for Vine Linux
 

y/yelp/yelp-vl.spec

@@ -9,7 +9,7 @@ Summary: A system documentation reader from the Gnome project.
 Summary(ja): GNOME プロジェクトのシステムドキュメントリーダ
 Name: yelp
 Version: 3.16.1
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 
 URL: http://live.gnome.org/Yelp
 Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.16/%{name}-%{version}.tar.xz
@@ -22,6 +22,7 @@ Requires: gtk3 >= %{gtk3_version}
 Requires: gnome-user-docs
 Requires: nkf
 Requires: yelp-xsl
+Requires: gnome-settings-daemon
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk3-devel >= %{gtk3_version}
@@ -160,6 +161,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 %changelog
+* Sat Jun 06 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.16.1-2
+- add Requires: gnome-settings-daemon
+
 * Sat May 16 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.16.1-1
 - new upstream release