[packages/mysql-workbench: 3/5] fix sshtunnel connections

glen glen at pld-linux.org
Mon May 26 10:50:40 CEST 2014


commit ce88812f410adb72c85299ce8c9c03907dd78a5e
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon May 26 11:22:52 2014 +0300

    fix sshtunnel connections

 mysql-workbench.spec | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)
---
diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index b2dc9bd..8a1651f 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -14,7 +14,7 @@ Summary:	Extensible modeling tool for MySQL
 Summary(pl.UTF-8):	Narzędzie do modelowania baz danych dla MySQL-a
 Name:		mysql-workbench
 Version:	6.1.6
-Release:	0.1
+Release:	0.4
 License:	GPL v2
 Group:		Applications/Databases
 Source0:	http://cdn.mysql.com/Downloads/MySQLGUITools/%{name}-community-%{version}-nodocs-src.tar.gz
@@ -54,7 +54,7 @@ BuildRequires:	pkgconfig
 BuildRequires:	python-devel >= 1:2.6
 BuildRequires:	readline-devel
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.566
+BuildRequires:	rpmbuild(macros) >= 1.658
 BuildRequires:	sqlite3-devel
 BuildRequires:	swig
 BuildRequires:	tinyxml-devel
@@ -125,8 +125,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %py_comp $RPM_BUILD_ROOT%{_libdir}/%{name}
 %py_comp $RPM_BUILD_ROOT%{_datadir}/%{name}
-# cleaning .py breaks ssh connections
-%py_postclean %{_libdir}/%{name} %{_datadir}/%{name}
+# cleaning sshtunnel.py breaks ssh connections
+%py_postclean -x sshtunnel.py %{_libdir}/%{name} %{_datadir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -142,11 +142,23 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/%{name}-bin
 %attr(755,root,root) %{_bindir}/wbcopytables
 
-%{_datadir}/%{name}
-%{_datadir}/mime/packages/mysql-workbench.xml
-%{_iconsdir}/hicolor/*x*/apps/mysql-workbench.png
-%{_iconsdir}/hicolor/*x*/mimetypes/*.png
-%{_desktopdir}/%{name}.desktop
+%dir %{_datadir}/%{name}
+%attr(755,root,root) %{_datadir}/%{name}/sshtunnel.py
+%{_datadir}/%{name}/*.glade
+%{_datadir}/%{name}/*.py.txt
+%{_datadir}/%{name}/*.py[co]
+%{_datadir}/%{name}/*.rc
+%{_datadir}/%{name}/*.vbs
+%{_datadir}/%{name}/data
+%{_datadir}/%{name}/extras
+%{_datadir}/%{name}/grt
+%{_datadir}/%{name}/images
+%{_datadir}/%{name}/libraries
+%{_datadir}/%{name}/modules
+%{_datadir}/%{name}/mysql.profiles
+%{_datadir}/%{name}/script_templates
+%{_datadir}/%{name}/snippets
+%{_datadir}/%{name}/sys
 
 %dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/*.so
@@ -155,3 +167,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/%{name}/modules/*.so
 %dir %{_libdir}/%{name}/plugins
 %attr(755,root,root) %{_libdir}/%{name}/plugins/*.so
+
+# desktop stuff
+%{_datadir}/mime/packages/mysql-workbench.xml
+%{_iconsdir}/hicolor/*x*/apps/mysql-workbench.png
+%{_iconsdir}/hicolor/*x*/mimetypes/*.png
+%{_desktopdir}/%{name}.desktop
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mysql-workbench.git/commitdiff/95c846d83c7b58ba3e5ccae63819499984a2b052



More information about the pld-cvs-commit mailing list