rpms/mysql-administrator/devel mysql-administrator.spec,1.1,1.2

[Dennis Gilmore (ausil)]

Author: ausil

Update of /cvs/extras/rpms/mysql-administrator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13853

Modified Files:
	mysql-administrator.spec 
Log Message:
updated to 1.1.6



Index: mysql-administrator.spec
===================================================================
RCS file: /cvs/extras/rpms/mysql-administrator/devel/mysql-administrator.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mysql-administrator.spec	12 Jan 2006 16:51:29 -0000	1.1
+++ mysql-administrator.spec	16 Jan 2006 22:03:20 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           mysql-administrator
-Version:        1.1.5
-Release:        3%{?dist}
+Version:        1.1.6
+Release:        1%{?dist}
 Summary:        GUI to manage mysql Databases
 
 Group:          Applications/Databases
@@ -10,10 +10,12 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		mysql-administrator-1.1.5-gcc41.patch
 Patch1:		mysql-administrator-1.1.5-shellbang.patch
+#Patch2 from bugzilla https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=177849
+Patch2:		mysql-administrator-gsprintf.patch
 
 BuildRequires:  libglade2-devel, gtkmm24-devel >= 2.6 , pcre-devel, mysql-devel >= 4.0
 BuildRequires:  openssl-devel, gtkhtml3-devel, desktop-file-utils
-Requires:       mysql >= 4.0, gtkmm24, mysql-gui-common
+Requires:       mysql >= 4.0, mysql-gui-common
 
 %description
 MySQL Administrator enables developers and DBAs to easily perform 
@@ -24,14 +26,12 @@
 MySQL Administrator graphical console.
 
 %package     -n mysql-gui-common
-Summary:        Common libraries and data shared among the MySQL GUI Suites
+Summary:        Common data shared among the MySQL GUI Suites
 Group:          System Environment/Libraries
 
 %description -n mysql-gui-common
-This package contains several common libraries and data shared among the MySQL
-GUI Suites in all platforms.
-
-
+This package contains  glade files images and translations used by mysql tools
+at runtime
 
 %prep
 %setup -q
@@ -39,6 +39,7 @@
 %patch0 -p1 -b .gcc41
 %endif
 %patch1 -p1 -b .shellbang
+%patch2 -p0 -b .gsprintf
 
 %build
 pushd  mysql-gui-common
@@ -46,7 +47,6 @@
 make %{?_smp_mflags}
 popd
 
-
 pushd mysql-administrator
 %configure
 make %{?_smp_mflags}
@@ -64,6 +64,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mysql-gui/doc/administrator
+cp -r mysql-administrator/doc/* $RPM_BUILD_ROOT/%{_datadir}/mysql-gui/doc/administrator
 # MySQL  use dos new line characters  that desktop file install doesnt like
 # MySQL  also use dos new line endings in there documantation files rpmlint didint like them
 sed -i 's/\r//' $RPM_BUILD_ROOT%{_datadir}/applications/MySQLAdministrator.desktop
@@ -71,20 +73,21 @@
 
 desktop-file-install --vendor=fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category SystemSetup \
+  --add-category System \
   --add-category Application \
   --add-category X-Fedora \
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applications/MySQLAdministrator.desktop
 
 %find_lang mysql-gui-common
+%find_lang mysql-administrator
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f mysql-administrator.lang
 %defattr(-,root,root,-)
 %doc mysql-administrator/COPYING 
 %{_bindir}/mabackup
@@ -94,15 +97,21 @@
 %{_datadir}/mysql-gui/MySQLIcon_Admin_*.png
 %dir %{_datadir}/mysql-gui/administrator
 %{_datadir}/mysql-gui/administrator/*
+%{_datadir}/mysql-gui/doc/*
 
 
 %files -n mysql-gui-common -f mysql-gui-common.lang
 %defattr(-,root,root,-)
 %doc mysql-gui-common/COPYING mysql-gui-common/README
 %dir %{_datadir}/mysql-gui
+%dir %{_datadir}/mysql-gui/doc
 %{_datadir}/mysql-gui/common
 
 %changelog
+* Thu Jan 12 2006 Dennis Gilmore <dennis at ausil.us> - 1.1.6-1
+- update to 1.1.6 make mysql-gui-common description more appropriate
+- Fix Help,  apply patch for backup failure bugzilla #177849
+- add new lang files
 * Thu Jan 12 2006 Dennis Gilmore <dennis at ausil.us> - 1.1.5-3
 - apply gcc4.1 patch only on fc5 
 * Wed Jan 11 2006 Dennis Gilmore <dennis at ausil.us> - 1.1.5-2