SPECS: mysql-gui-tools.spec - cleanups

[qboosh]

Author: qboosh                       Date: Mon Nov  6 19:03:45 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanups

---- Files affected:
SPECS:
   mysql-gui-tools.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/mysql-gui-tools.spec
diff -u SPECS/mysql-gui-tools.spec:1.1 SPECS/mysql-gui-tools.spec:1.2
--- SPECS/mysql-gui-tools.spec:1.1	Fri Oct 13 18:21:52 2006
+++ SPECS/mysql-gui-tools.spec	Mon Nov  6 20:03:40 2006
@@ -33,19 +33,19 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-GUI Tools for MySQL 5.0 is a suite of applications written for developing
-and managing MySQL servers. 
+GUI Tools for MySQL 5.0 is a suite of applications written for
+developing and managing MySQL servers. 
 
 This package contains data files and libraries for MySQL GUI Tools.
-Actual applications are in packages mysql-administrator, mysql-query-browser
-and mysql-workbench.
+Actual applications are in mysql-administrator, mysql-query-browser
+and mysql-workbench packages.
 
 %description -l pl
-GUI Tools dla MySQL-a 5.0 to zestaw aplikacji do rozwijania i zarządzania 
-serwerami MySQL.
+GUI Tools dla MySQL-a 5.0 to zestaw aplikacji do rozwijania i
+zarządzania serwerami MySQL.
 
 Ten pakiet zawiera pliki danych i bibliotek dla MySQL GUI Tools.
-Właściwe aplikacje znajdują się w pakietach mysql-administrator, 
+Właściwe aplikacje znajdują się w pakietach mysql-administrator,
 mysq-query-browser oraz mysql-workbench.
 
 %package -n mysql-administrator
@@ -70,7 +70,7 @@
 interfejsowi i logicznemu usytuowaniu elementów jest bardzo łatwy i
 intuicyjny w obsłudze.
 
-Ten pakiet zawiera MySQL Administrator %{ma_realversion}
+Ten pakiet zawiera MySQL Administrator %{ma_realversion}.
 
 %package -n mysql-query-browser
 Summary:	Query shell for MySQL 5.0
@@ -107,8 +107,8 @@
 to design and create new database schemas, document existing databases
 and even perform complex migrations to MySQL.
 
-MySQL Workbench requires OpenGL and a 3D accelerated graphics card with
-at least 16MB of memory.
+MySQL Workbench requires OpenGL and a 3D accelerated graphics card
+with at least 16MB of memory.
 
 This is MySQL Workbench %{wb_realversion}.
 
@@ -118,8 +118,10 @@
 danych, dokumentowania istniejących baz danych, a nawet wykonywania
 skomplikowanych migracji do MySQL-a.
 
-MySQL Workbench wymaga OpenGL i karty graficznej ze sprzętową akceleracją 
-operacji 3D z minimum 16 MB pamięci.
+MySQL Workbench wymaga OpenGL-a i karty graficznej ze sprzętową
+akceleracją operacji 3D z minimum 16 MB pamięci.
+
+Ten pakiet zawiera MySQL Workbench %{wb_realversion}.
 
 %prep
 %setup -q -n %{name}-%{version}%{_rel}
@@ -185,7 +187,8 @@
 	mysql-query-browser \
 	mysql-workbench
 do
-	make -C $dir -k DESTDIR=$RPM_BUILD_ROOT install
+	%{__make} -C $dir -k install \
+		DESTDIR=$RPM_BUILD_ROOT
 done
 
 %find_lang mysql-administrator
@@ -203,6 +206,7 @@
 %dir %{_datadir}/mysql-gui/common/grt/db
 %dir %{_datadir}/mysql-gui/common/grt/icons
 %dir %{_datadir}/mysql-gui/common/grt/icons/structs
+# FIXME: "*" duplicates all below
 %{_datadir}/mysql-gui/common/*
 %{_datadir}/mysql-gui/common/lua/*.lua
 %{_datadir}/mysql-gui/common/grt/*.xml
@@ -216,27 +220,27 @@
 %attr(755,root,root) %{_bindir}/mysql-administrator
 %attr(755,root,root) %{_bindir}/mysql-administrator-bin
 %dir %{_datadir}/mysql-gui/administrator
-%{_datadir}/mysql-gui/MySQLIcon_Admin*
 %{_datadir}/mysql-gui/administrator/*
-%{_datadir}/applications/MySQLAdministrator.desktop
+%{_datadir}/mysql-gui/MySQLIcon_Admin*
+%{_desktopdir}/MySQLAdministrator.desktop
 
 %files -n mysql-query-browser -f mysql-query-browser.lang
 %defattr(644,root,root,755)
-%dir %{_datadir}/mysql-gui/query-browser
-%{_datadir}/mysql-gui/query-browser/*
 %attr(755,root,root) %{_bindir}/mysql-query-browser
 %attr(755,root,root) %{_bindir}/mysql-query-browser-bin
+%dir %{_datadir}/mysql-gui/query-browser
+%{_datadir}/mysql-gui/query-browser/*
 %{_datadir}/mysql-gui/MySQLIcon_Query*
-%{_datadir}/applications/MySQLQueryBrowser.desktop
+%{_desktopdir}/MySQLQueryBrowser.desktop
 
 %files -n mysql-workbench
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/mysql-workbench
 %attr(755,root,root) %{_bindir}/mysql-workbench-bin
 %dir %{_datadir}/mysql-gui/workbench
-%{_datadir}/mysql-gui/MySQLIcon_Workbench*
 %{_datadir}/mysql-gui/workbench/*
-%{_datadir}/applications/MySQLWorkbench.desktop
+%{_datadir}/mysql-gui/MySQLIcon_Workbench*
+%{_desktopdir}/MySQLWorkbench.desktop
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -244,6 +248,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2006/11/06 19:03:40  qboosh
+- cleanups
+
 Revision 1.1  2006/10/13 16:21:52  pascalek
 - initial revision
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mysql-gui-tools.spec?r1=1.1&r2=1.2&f=u