fix for Vine

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

m/mate-file-manager/mate-file-manager-vl.spec

@@ -1,12 +1,15 @@
 Summary:	The MATE shell and file manager
 Name:		mate-file-manager
 Version:	1.6.2
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 
 Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 
 Patch0:		mate-file-manager-1.2.2-makefile.patch
 
+# for Vine
+Patch2000:	mate-file-manager-vine-settings.patch
+
 License:	GPLv2
 Group:		User Interface/Desktops
 URL:		http://mate-desktop.org/
@@ -65,6 +68,7 @@ This package contains documentation for mate-file-manager.
 %prep
 %setup -q
 %patch0 -p1
+%patch2000 -p1 -b .vine
 
 
 %build
@@ -149,6 +153,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 %changelog
+* Wed Sep 25 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.2-2
+- add Patch2000 (mate-file-manager-vine-settings.patch)
+
 * Sun Sep 22 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.2-1
 - new upstream release
 

m/mate-menus/mate-menus-vl.spec

@@ -1,8 +1,14 @@
 Summary:	MATE menu specifications
 Name:		mate-menus
 Version:	1.6.0
-Release:	2%{?_dist_release}
+Release:	3%{?_dist_release}
 Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
+
+# for Vine 
+Source10:	mate-applications.menu.vine
+Source11:	mate-preferences.menu.vine
+Source12:	mate-settings.menu.vine
+
 License:	GPLv2
 Group:		System Environment/Libraries 
 URL:		http://mate-desktop.org/
@@ -71,6 +77,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 chmod 644 ${RPM_BUILD_ROOT}%{_datadir}/%{name}/examples/mate-menus-ls.py
 
+install -m 0644 %{SOURCE10} ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/menus/mate-applications.menu
+install -m 0644 %{SOURCE11} ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/menus/mate-preferences.menu
+install -m 0644 %{SOURCE12} ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/menus/mate-settings.menu
+
 %find_lang %{name}
 
 
@@ -86,6 +96,7 @@ chmod 644 ${RPM_BUILD_ROOT}%{_datadir}/%{name}/examples/mate-menus-ls.py
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog NEWS README
 %{_sysconfdir}/xdg/menus/mate-applications.menu
+%{_sysconfdir}/xdg/menus/mate-preferences.menu
 %{_sysconfdir}/xdg/menus/mate-settings.menu
 %{_libdir}/libmate-menu.so.*
 %{_libdir}/girepository-1.0/MateMenu-2.0.typelib
@@ -105,6 +116,11 @@ chmod 644 ${RPM_BUILD_ROOT}%{_datadir}/%{name}/examples/mate-menus-ls.py
 
 
 %changelog
+* Wed Sep 25 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.0-3
+- add Source10 (mate-applications.menu.vine)
+- add Source11 (mate-preferences.menu.vine)
+- add Source12 (mate-settings.menu.vine)
+
 * Mon Sep 23 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.0-2
 - add BuildRequires: python-devel
 - create python subpackage

m/mate-panel/mate-panel-vl.spec

@@ -1,10 +1,13 @@
 Summary:	The MATE Panel
 Name:		mate-panel
 Version:	1.6.1
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 
 Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
-Source1:	vine-mate-panel-default-setup.entries
+Source1:	panel-default-layout.mate.vine
+
+# for Vine
+Patch2000:	mate-panel-1.6.1-about-vine.patch
 
 License:	GPLv2
 Group:		User Interface/Desktops
@@ -28,6 +31,7 @@ BuildRequires:	gtk-doc
 BuildRequires:	autoconf
 BuildRequires:	automake
 
+Requires:		vine-menus
 Requires(posttrans,postun):	glib2
 Requires(post,postun):	gtk2
 Requires(post,postun):	desktop-file-utils
@@ -80,8 +84,9 @@ This package contains documentation for mate-panel.
 
 %prep
 %setup -q
+%patch2000 -p1 -b .vine
 
-cp -f %{SOURCE1} mate-panel/panel-default-setup.entries
+cp -f %{SOURCE1} data/panel-default-layout.mate
 
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi)
@@ -158,6 +163,8 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_datadir}/omf/mate-applet-clock
 %{_datadir}/omf/mate-applet-fish
 %{_mandir}/man1/mate-panel.1.gz
+%{_mandir}/man1/mate-desktop-item-edit.1.gz
+%{_mandir}/man1/mate-panel-test-applets.1.gz
 
 %files devel
 %defattr(-,root,root,-)
@@ -172,6 +179,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
 
 %changelog
+* Wed Sep 25 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.1-2
+- change Source1 (panel-default-layout.mate.vine)
+- add Patch2000 (mate-panel-1.6.1-about-vine.patch)
+- add Requires: vine-menus
+
 * Sun Sep 22 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.1-1
 - new upstream release