rpms/mdbtools/devel gmdb2.desktop, NONE, 1.1 mdbtools-0.6-crashes.patch, NONE, 1.1 mdbtools.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Wed Aug 15 20:56:18 UTC 2007
Author: jwrdegoede
Update of /cvs/extras/rpms/mdbtools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23014/devel
Modified Files:
.cvsignore sources
Added Files:
gmdb2.desktop mdbtools-0.6-crashes.patch mdbtools.spec
Log Message:
initial mdbtools import
--- NEW FILE gmdb2.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=MDB database explorer
Comment=Explorer your MDB database files
Icon=gnome-day.png
Exec=gmdb2
Terminal=false
Type=Application
Categories=Development;
mdbtools-0.6-crashes.patch:
--- NEW FILE mdbtools-0.6-crashes.patch ---
diff -up mdbtools-0.6pre1/src/gmdb2/gladefiles/gmdb.glade.crash mdbtools-0.6pre1/src/gmdb2/gladefiles/gmdb.glade
--- mdbtools-0.6pre1/src/gmdb2/gladefiles/gmdb.glade.crash 2007-08-14 23:23:17.000000000 +0200
+++ mdbtools-0.6pre1/src/gmdb2/gladefiles/gmdb.glade 2007-08-14 23:23:17.000000000 +0200
@@ -67,7 +67,7 @@
</child>
<child>
- <widget class="GtkImageMenuItem" id="close1">
+ <widget class="GtkImageMenuItem" id="close_menu">
<property name="visible">True</property>
<property name="stock_item">GNOMEUIINFO_MENU_CLOSE_ITEM</property>
<signal name="activate" handler="gmdb_file_close_cb" last_modification_time="Fri, 20 Dec 2002 16:43:24 GMT"/>
@@ -327,8 +327,9 @@
</child>
<child>
- <widget class="GtkToolButton" id="button7">
+ <widget class="GtkToolButton" id="close_button">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="tooltip" translatable="yes">Close database file</property>
<property name="stock-id">gtk-close</property>
<signal name="clicked" handler="gmdb_file_close_cb"/>
@@ -440,6 +441,7 @@
<child>
<widget class="GtkButton" id="table_definition">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Definition</property>
<property name="use_underline">True</property>
@@ -456,6 +458,7 @@
<child>
<widget class="GtkButton" id="table_data">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Data</property>
<property name="use_underline">True</property>
@@ -472,6 +475,7 @@
<child>
<widget class="GtkButton" id="table_export">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Export</property>
<property name="use_underline">True</property>
diff -up mdbtools-0.6pre1/src/gmdb2/main2.c.crash mdbtools-0.6pre1/src/gmdb2/main2.c
--- mdbtools-0.6pre1/src/gmdb2/main2.c.crash 2007-08-14 23:23:17.000000000 +0200
+++ mdbtools-0.6pre1/src/gmdb2/main2.c 2007-08-14 23:25:23.000000000 +0200
@@ -170,7 +170,7 @@ gmdb_load_icons(GladeXML *xml)
}
int main(int argc, char *argv[])
{
-GtkWidget *gmdb;
+GtkWidget *gmdb, *w;
GnomeProgram *program;
#ifdef SQL
@@ -195,6 +195,13 @@ GnomeProgram *program;
/* load the interface */
mainwin_xml = glade_xml_new(GMDB_GLADEDIR "gmdb.glade", NULL, NULL);
+ /* greyout the some File Menu entries, doing this in the glade file
+ doesn't work for menu entries, it probably gets overriden by the
+ stock_item option. */
+ w = glade_xml_get_widget (mainwin_xml, "info_menu");
+ gtk_widget_set_sensitive (w, FALSE);
+ w = glade_xml_get_widget (mainwin_xml, "close_menu");
+ gtk_widget_set_sensitive (w, FALSE);
/* connect the signals in the interface */
glade_xml_signal_autoconnect(mainwin_xml);
diff -up mdbtools-0.6pre1/src/gmdb2/file.c~ mdbtools-0.6pre1/src/gmdb2/file.c
--- mdbtools-0.6pre1/src/gmdb2/file.c~ 2007-08-14 23:31:37.000000000 +0200
+++ mdbtools-0.6pre1/src/gmdb2/file.c 2007-08-14 23:31:37.000000000 +0200
@@ -29,7 +29,7 @@ MdbHandle *mdb;
extern int main_show_debug;
extern GladeXML *mainwin_xml;
-#define MAX_ACTIONITEMS 7
+#define MAX_ACTIONITEMS 9
#define MAX_ICONVIEWS 6
typedef struct {
GtkWidget* actionitems[MAX_ACTIONITEMS];
@@ -157,7 +157,7 @@ gmdb_file_init (void) {
GtkWidget* w;
GtkListStore* store;
int i;
- gchar* ainames[] = { "sql_menu", "debug_menu", "schema_menu", "info_menu", "sql_button", "schema_button", "info_button" };
+ gchar* ainames[] = { "sql_menu", "debug_menu", "schema_menu", "info_menu", "close_menu", "sql_button", "schema_button", "info_button", "close_button" };
gchar* swnames[] = { "sw_form", "sw_macro", "sw_module", "sw_query", "sw_report", "sw_table" };
if (gmdbwidgets) {
--- NEW FILE mdbtools.spec ---
%define prever pre1
Name: mdbtools
Version: 0.6
Release: 0.3.cvs20051109%{?dist}
Summary: Access data stored in Microsoft Access databases
Group: Applications/Databases
License: GPLv2+
URL: http://mdbtools.sourceforge.net/
Source0 http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{prever}.tar.gz
Source1: gmdb2.desktop
Patch0: mdbtools-0.6pre1-cvs20051109.patch.gz
Patch1: ftp://ftp.nluug.nl/pub/os/Linux/distr/debian/pool/main/m/mdbtools/mdbtools_0.5.99.0.6pre1.0.20051109-4.diff.gz
Patch2: mdbtools-0.6-crashes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: unixODBC-devel libgnomeui-devel readline-devel
BuildRequires: bison flex desktop-file-utils
Requires: %{name}-libs = %{version}-%{release}
%description
MDB Tools is a suite of programs for accessing data stored in Microsoft
Access databases.
%package libs
Summary: Library for accessing data stored in Microsoft Access databases
Group: System Environment/Libraries
License: LGPLv2+
%description libs
This package contains the MDB Tools library, which can be used by applications
to access data stored in Microsoft Access databases.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
License: LGPLv2+
Requires: %{name}-libs = %{version}-%{release}, glib2-devel, pkgconfig
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%package gui
Summary: Graphical interface for MDB Tools
Group: Applications/Databases
License: GPLv2+
Requires: %{name}-libs = %{version}-%{release}
%description gui
The mdbtools-gui package contains the gmdb2 graphical user interface
for MDB Tools
%prep
%setup -q -n %{name}-%{version}%{prever}
%patch0 -p1
%patch1 -p1
pushd debian/patches
for i in *; do
echo $i
case "$i" in
015-allsyms.patch|038-removals.patch|045-aboutdialog.patch|056-libmdb-data.patch)
patch -d ../.. -p0 < $i
;;
*)
patch -d ../.. -p1 < $i
esac
done
popd
%patch2 -p1 -z .crash
chmod -x COPYING.LIB
%build
%configure --disable-static --enable-sql --with-unixodbc="%{_prefix}"
# Don't use rpath!
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR="$RPM_BUILD_ROOT"
rm $RPM_BUILD_ROOT%{_libdir}/libmdb*.la
# remove some headers which should not be installed / exported
rm $RPM_BUILD_ROOT%{_includedir}/{connectparams.h,gmdb.h,mdbodbc.h}
rm $RPM_BUILD_ROOT%{_includedir}/{mdbprivate.h,mdbver.h}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
%clean
rm -rf $RPM_BUILD_ROOT
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/mdb-*
%{_mandir}/man1/mdb-*.1.gz
%files libs
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING.LIB NEWS README TODO doc/faq.html
%{_libdir}/libmdb*.so.*
%files devel
%defattr(-,root,root,-)
%doc HACKING
%{_libdir}/libmdb*.so
%{_libdir}/pkgconfig/libmdb*.pc
%{_includedir}/mdb*.h
%files gui
%defattr(-,root,root,-)
%{_bindir}/gmdb2
%{_datadir}/gmdb
%{_datadir}/gnome/help/gmdb
%{_datadir}/applications/fedora-gmdb2.desktop
%changelog
* Tue Aug 14 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.6-0.3.cvs20051109
- Stop gmdb from crashing when selecting close without a file being open
(bz 251419)
- Change release field from 0.x.pre1 to 0.x.cvs20051109, as that more acurately
reflects our upstream base (bz 251419)
* Mon Aug 13 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.6-0.2.pre1
- Stop gmdb from crashing when selecting file->properties without having a file
loaded (bz 251419)
- Don't install headers used to build tools (install only those of libmdb)
- Add glib2-devel to the -devel Requires
* Mon Aug 13 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.6-0.1.pre1
- There were lots of compile warnings, looking for a fix I found that upstream
is dead, but that Debian has sort of continued as upstream based on the
0.6pre1 release; Switching to Debian "upstream" release 0.6pre1 (20051109-4)
* Wed Aug 8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.5-1
- Initial Fedora package (based on specfile by Dag Wieers, thanks!)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mdbtools/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 15 Aug 2007 18:47:01 -0000 1.1
+++ .cvsignore 15 Aug 2007 20:55:46 -0000 1.2
@@ -0,0 +1,3 @@
+mdbtools-0.6pre1-cvs20051109.patch.gz
+mdbtools-0.6pre1.tar.gz
+mdbtools_0.5.99.0.6pre1.0.20051109-4.diff.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mdbtools/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 15 Aug 2007 18:47:01 -0000 1.1
+++ sources 15 Aug 2007 20:55:46 -0000 1.2
@@ -0,0 +1,3 @@
+8e603377e9a50c62957243db935c70d6 mdbtools-0.6pre1-cvs20051109.patch.gz
+246e8f38b2a1af1bcff60ee0da59300b mdbtools-0.6pre1.tar.gz
+bcbcf53bfab1a00d428f534e87bce4b6 mdbtools_0.5.99.0.6pre1.0.20051109-4.diff.gz
More information about the fedora-extras-commits
mailing list