rpms/mysql-administrator/FC-4 mysql-administrator-gsprintf.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 mysql-administrator.spec, 1.1, 1.2 sources, 1.2, 1.3
Dennis Gilmore (ausil)
fedora-extras-commits at redhat.com
Mon Jan 16 22:30:51 UTC 2006
Author: ausil
Update of /cvs/extras/rpms/mysql-administrator/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14267
Modified Files:
.cvsignore mysql-administrator.spec sources
Added Files:
mysql-administrator-gsprintf.patch
Log Message:
add patch and update to 1.1.6
mysql-administrator-gsprintf.patch:
--- NEW FILE mysql-administrator-gsprintf.patch ---
--- mysql-administrator/library/source/myx_backup.c.orig 2005-10-25 23:08:07.000000000 +0200
+++ mysql-administrator/library/source/myx_backup.c 2005-12-17 16:13:37.000000000 +0100
@@ -771,15 +772,15 @@
int mode_entry_count = 0;
if (status->options & MYX_B_ANSI_QUOTES)
{
+ strcat(sql_mode_cmd, "ANSI_QUOTES");
mode_entry_count++;
- g_sprintf(sql_mode_cmd, "%sANSI_QUOTES", sql_mode_cmd);
};
if (status->options & MYX_B_COMPATIBILITY_MODE)
{
- g_sprintf(sql_mode_cmd, "%s%sMYSQL323", sql_mode_cmd, (mode_entry_count > 0) ? "," : "");
+ strcat(sql_mode_cmd, (mode_entry_count > 0 ? ",MYSQL323" : "MYSQL323"));
mode_entry_count++;
};
- g_sprintf(sql_mode_cmd, "%s' */", sql_mode_cmd);
+ strcat(sql_mode_cmd, "' */");
if (write_sql_file_header(status, error))
return -1;
@@ -2448,10 +2450,10 @@
SAFE_IO(fprintf(status->sql_file, "/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;\n"));
if (status->options & MYX_B_ANSI_QUOTES)
- g_sprintf(Buffer, "%s,ANSI_QUOTES", Buffer);
+ strcat(Buffer, ",ANSI_QUOTES");
if (status->options & MYX_B_COMPATIBILITY_MODE)
- g_sprintf(Buffer, "%s,MYSQL323", Buffer);
- g_sprintf(Buffer, "%s' */;\n\n\n", Buffer);
+ strcat(Buffer, ",MYSQL323");
+ strcat(Buffer, "' */;\n\n\n");
SAFE_IO(fprintf(status->sql_file, Buffer));
return 0;
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mysql-administrator/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 12 Jan 2006 16:51:29 -0000 1.2
+++ .cvsignore 16 Jan 2006 22:30:50 -0000 1.3
@@ -1 +1 @@
-mysql-administrator-1.1.5.tar.gz
+mysql-administrator-1.1.6.tar.gz
Index: mysql-administrator.spec
===================================================================
RCS file: /cvs/extras/rpms/mysql-administrator/FC-4/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:30:50 -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
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mysql-administrator/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 12 Jan 2006 16:51:29 -0000 1.2
+++ sources 16 Jan 2006 22:30:50 -0000 1.3
@@ -1 +1 @@
-f50a3505d50e024e8a775c2cd4a2ecf6 mysql-administrator-1.1.5.tar.gz
+77c1c5a7b6f750b84873799bc9694ea5 mysql-administrator-1.1.6.tar.gz
More information about the fedora-extras-commits
mailing list