rpms/mysql-administrator/devel mysql-administrator-1.1.5-gcc41.patch, NONE, 1.1 mysql-administrator-1.1.5-shellbang.patch, NONE, 1.1 mysql-administrator.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Dennis Gilmore (ausil)
fedora-extras-commits at redhat.com
Thu Jan 12 16:51:29 UTC 2006
Author: ausil
Update of /cvs/extras/rpms/mysql-administrator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23054/devel
Modified Files:
.cvsignore sources
Added Files:
mysql-administrator-1.1.5-gcc41.patch
mysql-administrator-1.1.5-shellbang.patch
mysql-administrator.spec
Log Message:
auto-import mysql-administrator-1.1.5-3 on branch devel from mysql-administrator-1.1.5-3.src.rpm
mysql-administrator-1.1.5-gcc41.patch:
--- NEW FILE mysql-administrator-1.1.5-gcc41.patch ---
diff -Nur mysql-administrator-1.1.5-orig/mysql-administrator/source/linux/MACatalogsPanel.cc mysql-administrator-1.1.5/mysql-administrator/source/linux/MACatalogsPanel.cc
--- mysql-administrator-1.1.5-orig/mysql-administrator/source/linux/MACatalogsPanel.cc 2005-12-06 22:08:02.000000000 -0600
+++ mysql-administrator-1.1.5/mysql-administrator/source/linux/MACatalogsPanel.cc 2006-01-07 23:43:32.000000000 -0600
@@ -67,7 +67,7 @@
}
protected:
- void CellRendererProgress::render_vfunc(const Glib::RefPtr<Gdk::Window>& window,
+ void render_vfunc(const Glib::RefPtr<Gdk::Window>& window,
Gtk::Widget& widget,
const Gdk::Rectangle& bg_area,
const Gdk::Rectangle& cell_area,
diff -Nur mysql-administrator-1.1.5-orig/mysql-administrator/source/linux/MDataInterface.h mysql-administrator-1.1.5/mysql-administrator/source/linux/MDataInterface.h
--- mysql-administrator-1.1.5-orig/mysql-administrator/source/linux/MDataInterface.h 2005-10-07 09:53:54.000000000 -0500
+++ mysql-administrator-1.1.5/mysql-administrator/source/linux/MDataInterface.h 2006-01-07 23:26:39.000000000 -0600
@@ -84,7 +84,7 @@
MYX_SCHEMA_TABLE_STATUS *get_schema_table_status(const Glib::ustring &catalog_name,
const Glib::ustring &schema_name);
- MYX_SCHEMA_ENTITY_STATUS *MDataInterface::get_schema_entity_status(
+ MYX_SCHEMA_ENTITY_STATUS *get_schema_entity_status(
const Glib::ustring &catalog_name,
const Glib::ustring &schema_name);
diff -Nur mysql-administrator-1.1.5-orig/mysql-gui-common/source/linux/MCrontab.h mysql-administrator-1.1.5/mysql-gui-common/source/linux/MCrontab.h
--- mysql-administrator-1.1.5-orig/mysql-gui-common/source/linux/MCrontab.h 2005-03-13 07:16:59.000000000 -0600
+++ mysql-administrator-1.1.5/mysql-gui-common/source/linux/MCrontab.h 2006-01-07 23:21:17.000000000 -0600
@@ -41,7 +41,7 @@
public:
bool find_entry_by_comment(const std::string &comment, Entry &entry);
- bool MCrontab::remove_entry_with_comment(const std::string &comment,
+ bool remove_entry_with_comment(const std::string &comment,
const std::string &command="");
void add_entry(Entry &entry, const std::string &comment);
diff -Nur mysql-administrator-1.1.5-orig/mysql-gui-common/source/linux/MGPreferences.h mysql-administrator-1.1.5/mysql-gui-common/source/linux/MGPreferences.h
--- mysql-administrator-1.1.5-orig/mysql-gui-common/source/linux/MGPreferences.h 2005-03-13 07:16:59.000000000 -0600
+++ mysql-administrator-1.1.5/mysql-gui-common/source/linux/MGPreferences.h 2006-01-07 23:09:05.000000000 -0600
@@ -40,7 +40,7 @@
virtual MYX_APPLICATION_OPTIONS *prepare_options()= 0;
const char *find_value(MYX_OPTION_GROUP *group, const char *name);
- std::list<const char *>MGOptions::find_values(MYX_OPTION_GROUP *group, const char *name);
+ std::list<const char *>find_values(MYX_OPTION_GROUP *group, const char *name);
void add_group(MYX_APPLICATION_OPTIONS *options, const char *name,
const std::list<ValuePair> &values);
mysql-administrator-1.1.5-shellbang.patch:
--- NEW FILE mysql-administrator-1.1.5-shellbang.patch ---
--- mysql-administrator-1.1.5-orig/mysql-administrator/source/linux/mysql-administrator 2005-06-01 08:34:16.000000000 -0500
+++ mysql-administrator-1.1.5/mysql-administrator/source/linux/mysql-administrator 2006-01-11 16:55:53.000000000 -0600
@@ -1,3 +1,4 @@
+#!/bin/sh
PRG="$0"
# need this for relative symlinks
--- NEW FILE mysql-administrator.spec ---
Name: mysql-administrator
Version: 1.1.5
Release: 3%{?dist}
Summary: GUI to manage mysql Databases
Group: Applications/Databases
License: GPL
URL: http://www.mysql.com/products/tools/administrator/index.html
Source0: http://dev.mysql.com/get/Downloads/MySQLAdministrationSuite/mysql-administrator-%{version}.tar.gz
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
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
%description
MySQL Administrator enables developers and DBAs to easily perform
all the command line operations visually including configuring servers,
administering users, and dynamically monitoring database health. Other
common administrative tasks such as monitoring replication status,
backup and restore, and viewing logs can also be performed through the
MySQL Administrator graphical console.
%package -n mysql-gui-common
Summary: Common libraries and 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.
%prep
%setup -q
%if "%{?fedora}" > "4"
%patch0 -p1 -b .gcc41
%endif
%patch1 -p1 -b .shellbang
%build
pushd mysql-gui-common
%configure
make %{?_smp_mflags}
popd
pushd mysql-administrator
%configure
make %{?_smp_mflags}
popd
%install
rm -rf $RPM_BUILD_ROOT
pushd mysql-gui-common
chmod 644 COPYING README
make install DESTDIR=$RPM_BUILD_ROOT
popd
pushd mysql-administrator
chmod 644 COPYING
make install DESTDIR=$RPM_BUILD_ROOT
popd
# 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
sed -i 's/\r//' mysql-administrator/COPYING mysql-gui-common/COPYING mysql-gui-common/README
desktop-file-install --vendor=fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category SystemSetup \
--add-category Application \
--add-category X-Fedora \
--delete-original \
$RPM_BUILD_ROOT%{_datadir}/applications/MySQLAdministrator.desktop
%find_lang mysql-gui-common
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc mysql-administrator/COPYING
%{_bindir}/mabackup
%{_bindir}/mysql-administrator
%{_bindir}/mysql-administrator-bin
%{_datadir}/applications/fedora-MySQLAdministrator.desktop
%{_datadir}/mysql-gui/MySQLIcon_Admin_*.png
%dir %{_datadir}/mysql-gui/administrator
%{_datadir}/mysql-gui/administrator/*
%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
%{_datadir}/mysql-gui/common
%changelog
* 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
- fix lang files and trailing /
* Sat Jan 07 2006 Dennis Gilmore <dennis at ausil.us> - 1.1.5-1
- update to 1.1.5
* Fri Oct 28 2005 Dennis Gilmore <dennis at ausil.us> - 1.1.4-1
- update to 1.1.4 update build requires to gtkmm24-devel
* Wed Sep 28 2005 Dennis Gilmore <dennis at ausil.us> - 1.1.2-1
- Initial Build
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mysql-administrator/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 12 Jan 2006 16:47:24 -0000 1.1
+++ .cvsignore 12 Jan 2006 16:51:29 -0000 1.2
@@ -0,0 +1 @@
+mysql-administrator-1.1.5.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mysql-administrator/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 12 Jan 2006 16:47:24 -0000 1.1
+++ sources 12 Jan 2006 16:51:29 -0000 1.2
@@ -0,0 +1 @@
+f50a3505d50e024e8a775c2cd4a2ecf6 mysql-administrator-1.1.5.tar.gz
More information about the fedora-extras-commits
mailing list