rpms/mysql-query-browser/devel mysql-query-browser-1.1.18-gcc41.patch, NONE, 1.1 mysql-query-browser.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Dennis Gilmore (ausil)
fedora-extras-commits at redhat.com
Fri Sep 15 03:26:52 UTC 2006
Author: ausil
Update of /cvs/extras/rpms/mysql-query-browser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17218/devel
Modified Files:
.cvsignore sources
Added Files:
mysql-query-browser-1.1.18-gcc41.patch
mysql-query-browser.spec
Log Message:
auto-import mysql-query-browser-1.1.18-4.fc5 on branch devel from mysql-query-browser-1.1.18-4.fc5.src.rpm
mysql-query-browser-1.1.18-gcc41.patch:
--- NEW FILE mysql-query-browser-1.1.18-gcc41.patch ---
diff -Naur mysql-query-browser-1.1.18-orig/mysql-gui-common/source/linux/MCrontab.h mysql-query-browser-1.1.18/mysql-gui-common/source/linux/MCrontab.h
--- mysql-query-browser-1.1.18-orig/mysql-gui-common/source/linux/MCrontab.h 2005-03-13 07:16:59.000000000 -0600
+++ mysql-query-browser-1.1.18/mysql-gui-common/source/linux/MCrontab.h 2006-04-03 21:55:28.000000000 -0500
@@ -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 -Naur mysql-query-browser-1.1.18-orig/mysql-gui-common/source/linux/MGPreferences.h mysql-query-browser-1.1.18/mysql-gui-common/source/linux/MGPreferences.h
--- mysql-query-browser-1.1.18-orig/mysql-gui-common/source/linux/MGPreferences.h 2005-03-13 07:16:59.000000000 -0600
+++ mysql-query-browser-1.1.18/mysql-gui-common/source/linux/MGPreferences.h 2006-04-03 21:56:03.000000000 -0500
@@ -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);
diff -Naur mysql-query-browser-1.1.18-orig/mysql-query-browser/source/linux/MQBookmarkBrowser.cc mysql-query-browser-1.1.18/mysql-query-browser/source/linux/MQBookmarkBrowser.cc
--- mysql-query-browser-1.1.18-orig/mysql-query-browser/source/linux/MQBookmarkBrowser.cc 2005-10-13 03:22:40.000000000 -0500
+++ mysql-query-browser-1.1.18/mysql-query-browser/source/linux/MQBookmarkBrowser.cc 2006-04-03 21:57:29.000000000 -0500
@@ -257,7 +257,6 @@
{
for (unsigned int i=0; i < _menu.items().size(); i++)
_menu.items()[i].set_sensitive(false);
- _menu.items()[3].set_sensitive(true); // New Folder
}
}
--- NEW FILE mysql-query-browser.spec ---
Name: mysql-query-browser
Version: 1.1.18
Release: 4%{?dist}
Summary: A graphical tool for handling MySQL queries
Group: Applications/Databases
License: GPL
URL: http://dev.mysql.com/doc/query-browser/en/index.html
Source0: http://mysql.mirrors.pair.com/Downloads/MySQLAdministrationSuite/mysql-query-browser-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: mysql-query-browser-1.1.18-gcc41.patch
BuildRequires: gtkmm24-devel pcre-devel mysql-devel gtkhtml3-devel gettext desktop-file-utils
Requires: mysql-gui-common
%description
The MySQL Query Browser is a graphical tool provided by MySQL AB for creating,
executing, and optimizing queries in a graphical environment. Where the MySQL
Administrator is designed to administer a MySQL server, the MySQL Query
Browser is designed to help you query and analyze data stored within your MySQL
database.
%if "%{?fedora}" > "3"
%define gtkhtmlver 3.6
%endif
%if "%{?fedora}" > "4"
%define gtkhtmlver 3.8
%endif
%prep
%setup -q
%patch0 -p1
%build
# mysql-gui-common mostly gets statically linked the dynamic stuff comes from mysql-administrator
pushd mysql-gui-common
%configure
make %{?_smp_mflags}
popd
pushd mysql-query-browser
%configure --with-gtkhtml=libgtkhtml-%{?gtkhtmlver}%{!?gtkhtmlver:3.8}
make %{?_smp_mflags}
popd
%install
rm -rf $RPM_BUILD_ROOT
pushd mysql-query-browser
make install DESTDIR=$RPM_BUILD_ROOT
popd
# mysql use dos files we need to make it a unix file
sed -i 's/\r//' $RPM_BUILD_ROOT%{_datadir}/applications/MySQLQueryBrowser.desktop
sed -i 's/\r//' mysql-query-browser/COPYING
desktop-file-install --vendor=fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category Application \
--add-category Development \
--add-category X-Fedora \
--delete-original \
$RPM_BUILD_ROOT%{_datadir}/applications/MySQLQueryBrowser.desktop
%find_lang mysql-query-browser
%clean
rm -rf $RPM_BUILD_ROOT
%files -f mysql-query-browser.lang
%defattr(-,root,root,-)
%doc mysql-query-browser/COPYING mysql-query-browser/doc
%{_bindir}/*
%{_datadir}/applications/fedora-MySQLQueryBrowser.desktop
%{_datadir}/mysql-gui/query-browser
%{_datadir}/mysql-gui/*.png
%changelog
* Sun May 07 2006 Dennis Gilmore <dennis at ausil.us> - 1.1.18-4
- really fix build requires
* Thu Apr 06 2006 Dennis Gilmore <dennis at ausil.us> - 1.1.18-3
- fix build requires
- fix path to download it seems MySQL AB has prevented the abbility to download
from them. so i chose a mirror that is listed as one of the primary ones
* Tue Apr 04 2006 Dennis Gilmore <dennis at ausil.us> - 1.1.18-2
- fix build for fc4
* Mon Apr 03 2006 Dennis Gilmore <dennis at ausil.us> - 1.1.18-1
- update to 1.1.18 and add patch to work on fc5
* Fri Oct 7 2005 Dennis Gilmore <dennis at ausil.us> 1.1.14-1
- Update to 1.1.14 clean up for Fedora extras
- remove mysql-gui-common using mysql-administrator for it
* Thu May 12 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.1.7-0.iva.1
- Reconstructed for new version
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mysql-query-browser/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 15 Sep 2006 03:22:38 -0000 1.1
+++ .cvsignore 15 Sep 2006 03:26:52 -0000 1.2
@@ -0,0 +1 @@
+mysql-query-browser-1.1.18.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mysql-query-browser/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 15 Sep 2006 03:22:38 -0000 1.1
+++ sources 15 Sep 2006 03:26:52 -0000 1.2
@@ -0,0 +1 @@
+bf9cae997cc6ac833e68dafff580c315 mysql-query-browser-1.1.18.tar.gz
More information about the fedora-extras-commits
mailing list