packages: mysql-workbench/mysql-workbench.spec, mysql-workbench/PLD_Linux_(...

Fri May 11 18:34:02 CEST 2012

Author: glen                         Date: Fri May 11 16:34:02 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
,- add pld server type
- update desktop stuff
- drop deprecated gnome-vfs (we use shared mime info)

---- Files affected:
packages/mysql-workbench:
   mysql-workbench.spec (1.41 -> 1.42) , PLD_Linux_(MySQL_Package).xml (NONE -> 1.1)  (NEW), pld-profile.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mysql-workbench/mysql-workbench.spec
diff -u packages/mysql-workbench/mysql-workbench.spec:1.41 packages/mysql-workbench/mysql-workbench.spec:1.42

--- packages/mysql-workbench/mysql-workbench.spec:1.41	Sat Mar 31 10:52:22 2012
+++ packages/mysql-workbench/mysql-workbench.spec	Fri May 11 18:33:56 2012
@@ -8,11 +8,13 @@
 Group:		Applications/Databases
 Source0:	ftp://ftp.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/%{name}-gpl-%{version}-src.tar.gz
 # Source0-md5:	cd2a0cec9dffd5465b6999f5d9c8de78
+Source1:	PLD_Linux_(MySQL_Package).xml
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-python_libs.patch
 Patch2:		%{name}-posix.patch
 Patch3:		automake.patch
 Patch4:		glib.patch
+Patch5:		pld-profile.patch
 URL:		http://wb.mysql.com/
 BuildRequires:	OpenGL-devel
 BuildRequires:	autoconf
@@ -38,9 +40,11 @@
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.566
 BuildRequires:	sqlite3-devel
+Requires:	desktop-file-utils
 Requires:	python-paramiko
 Requires:	python-pexpect
 Requires:	python-sqlite
+Requires:	shared-mime-info
 # Patch2 requires xdg-utils
 Requires:	xdg-utils
 Suggests:	gnome-keyring
@@ -80,6 +84,8 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+cp -p '%{SOURCE1}' res/mysql.profiles
 
 %build
 %{__glib_gettextize}
@@ -91,32 +97,37 @@
 %configure \
 	--enable-readline \
 	CFLAGS="%{rpmcppflags} %{rpmcflags} -Wno-deprecated" \
-	LUA_LIBS="`pkg-config --libs lua51`" \
-	LUA_CFLAGS="`pkg-config --cflags lua51`"
+	LUA_LIBS="$(pkg-config --libs lua51)" \
+	LUA_CFLAGS="$(pkg-config --cflags lua51)"
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-install -d $RPM_BUILD_ROOT%{_pixmapsdir}
-
+# clear mimeinfodata_DATA because don't want deprecated gnome-vfs install
 %{__make} install \
+	doc_DATA= \
+	mimeinfodata_DATA= \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install images/icons/MySQLWorkbench-128.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
-mv -f $RPM_BUILD_ROOT%{_desktopdir}/{MySQLWorkbench,%{name}}.desktop
+install -d $RPM_BUILD_ROOT%{_pixmapsdir}
+cp -p images/icons/MySQLWorkbench-128.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+
+mv $RPM_BUILD_ROOT%{_desktopdir}/{MySQLWorkbench,%{name}}.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%update_desktop_database
+%update_mime_database
+
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog README
 %attr(755,root,root) %{_bindir}/%{name}
 %attr(755,root,root) %{_bindir}/%{name}-bin
 %{_datadir}/%{name}
-%{_datadir}/mime-info/mysql-workbench.mime
 %{_datadir}/mime/packages/mysql-workbench.xml
 %{_libdir}/%{name}
 %{_iconsdir}/hicolor/*x*/apps/mysql-workbench.png
@@ -130,6 +141,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.42  2012/05/11 16:33:56  glen
+,- add pld server type
+- update desktop stuff
+- drop deprecated gnome-vfs (we use shared mime info)
+
 Revision 1.41  2012/03/31 08:52:22  arekm
 - rel 1
 

================================================================
Index: packages/mysql-workbench/PLD_Linux_(MySQL_Package).xml
diff -u /dev/null packages/mysql-workbench/PLD_Linux_(MySQL_Package).xml:1.1
--- /dev/null	Fri May 11 18:34:02 2012
+++ packages/mysql-workbench/PLD_Linux_(MySQL_Package).xml	Fri May 11 18:33:56 2012
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<data>
+    <value type="dict">
+    <value type="string" key="sys.config.path">/etc/mysql/mysqld.conf</value>
+    <value type="string" key="sys.config.section">mysqld</value>
+
+    <value type="string" key="sys.mysqld.start">/sbin/service mysql start</value>
+    <value type="string" key="sys.mysqld.stop">/sbin/service mysql stop</value>
+    <value type="string" key="sys.mysqld.status">ps -C mysqld -o pid=</value>
+    <value type="int" key="sys.usesudo">1</value>
+    <value type="int" key="sys.usesudostatus">0</value>
+    <value type="string" key="sys.sudo">/usr/bin/sudo -p EnterPasswordHere /bin/sh -c</value>
+
+    <value type="string" key="sys.system">Linux</value>
+    <value type="string" key="serverVersion">5.5</value>
+  </value>
+</data>

================================================================
Index: packages/mysql-workbench/pld-profile.patch
diff -u /dev/null packages/mysql-workbench/pld-profile.patch:1.1
--- /dev/null	Fri May 11 18:34:02 2012
+++ packages/mysql-workbench/pld-profile.patch	Fri May 11 18:33:56 2012
@@ -0,0 +1,10 @@
+--- mysql-workbench-gpl-5.2.38-src/res/mysql.profiles/Makefile.am~	2012-02-21 18:53:45.000000000 +0200
++++ mysql-workbench-gpl-5.2.38-src/res/mysql.profiles/Makefile.am	2012-05-11 11:46:32.197808250 +0300
+@@ -9,6 +9,7 @@
+ Linux_(Custom).xml\
+ MacOS_X_(MySQL_Package).xml\
+ OpenSolaris_(MySQL_Package).xml\
++PLD_Linux_(MySQL_Package).xml \
+ RHEL_(MySQL_Package).xml\
+ SLES_(MySQL_Package).xml\
+ Ubuntu_Linux_(MySQL_Package).xml\
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/mysql-workbench/mysql-workbench.spec?r1=1.41&r2=1.42

