[unixODBC-gui-qt] Initial commit of unixODBC-gui-qt
Jan Horak
hhorak at fedoraproject.org
Fri Jan 6 14:41:49 UTC 2012
commit 89d63d2c211977aa99810f60c9b326fa19299a24
Author: Honza Horák <hhorak at redhat.com>
Date: Fri Jan 6 15:41:25 2012 +0100
Initial commit of unixODBC-gui-qt
.gitignore | 1 +
ODBCCreateDataSourceQ4.desktop | 9 +++
ODBCManageDataSourcesQ4.desktop | 9 +++
ODBCTestQ4.desktop | 9 +++
sources | 1 +
unixODBC-gui-qt-qstring.patch | 36 +++++++++++
unixODBC-gui-qt-so-version-bump.patch | 39 ++++++++++++
unixODBC-gui-qt.spec | 111 +++++++++++++++++++++++++++++++++
8 files changed, 215 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..f6674fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/unixODBC-gui-qt-20120105svn98.tar.bz2
diff --git a/ODBCCreateDataSourceQ4.desktop b/ODBCCreateDataSourceQ4.desktop
new file mode 100644
index 0000000..7acb188
--- /dev/null
+++ b/ODBCCreateDataSourceQ4.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=ODBC Data Source Wizard
+Comment=ODBC Data Source Wizard Tool
+Exec=ODBCCreateDataSourceQ4
+Icon=ODBCCreateDataSourceQ4
+Type=Application
+Encoding=UTF-8
+Terminal=false
+Categories=Settings;X-Red-Hat-Extra;
diff --git a/ODBCManageDataSourcesQ4.desktop b/ODBCManageDataSourcesQ4.desktop
new file mode 100644
index 0000000..194d5f6
--- /dev/null
+++ b/ODBCManageDataSourcesQ4.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=ODBC Data Source Administrator
+Comment=ODBC Data Source Administration Tool
+Exec=ODBCManageDataSourcesQ4
+Icon=ODBCManageDataSourcesQ4
+Type=Application
+Encoding=UTF-8
+Terminal=false
+Categories=Settings;X-Red-Hat-Extra;
diff --git a/ODBCTestQ4.desktop b/ODBCTestQ4.desktop
new file mode 100644
index 0000000..dbd52b1
--- /dev/null
+++ b/ODBCTestQ4.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=ODBC Test
+Comment=ODBC Test Tool
+Exec=ODBCTestQ4
+Icon=ODBCTestQ4
+Type=Application
+Encoding=UTF-8
+Terminal=false
+Categories=Settings;X-Red-Hat-Extra;
diff --git a/sources b/sources
index e69de29..9df9a4a 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+8d755cd181090c37374cc13a84911fc5 unixODBC-gui-qt-20120105svn98.tar.bz2
diff --git a/unixODBC-gui-qt-qstring.patch b/unixODBC-gui-qt-qstring.patch
new file mode 100644
index 0000000..9e20a75
--- /dev/null
+++ b/unixODBC-gui-qt-qstring.patch
@@ -0,0 +1,36 @@
+diff -up unixodbc-gui-qt/ODBCTestQ4/conn.cpp.debug unixodbc-gui-qt/ODBCTestQ4/conn.cpp
+--- unixodbc-gui-qt/ODBCTestQ4/conn.cpp.debug 2009-01-16 04:56:09.000000000 +0100
++++ unixodbc-gui-qt/ODBCTestQ4/conn.cpp 2011-12-08 14:01:34.797508045 +0100
+@@ -3113,9 +3113,9 @@ void dFullConnect::Ok()
+ */
+ if ( !hand )
+ {
+- pOdbcTest->listHandle.append( new OdbcHandle( SQL_HANDLE_ENV, henv ));
++ pOdbcTest->listHandle.append( new OdbcHandle( SQL_HANDLE_ENV, henv, "" ));
+ }
+- pOdbcTest->listHandle.append( new OdbcHandle( SQL_HANDLE_DBC, hdbc ));
++ pOdbcTest->listHandle.append( new OdbcHandle( SQL_HANDLE_DBC, hdbc, "" ));
+ pOdbcTest->listHandle.append( new OdbcHandle( SQL_HANDLE_STMT, hstmt, pOdbcTest->listHandle ));
+
+ pOdbcTest->out_win->append( "Full Connect Succeeded\n" );
+@@ -4058,7 +4058,7 @@ void dAllocConnect::Ok()
+ txt.sprintf( " *phdbc: %p", hdbc );
+ pOdbcTest->out_win->append( txt );
+
+- pOdbcTest->listHandle.append( new OdbcHandle( SQL_HANDLE_DBC, hdbc ) );
++ pOdbcTest->listHandle.append( new OdbcHandle( SQL_HANDLE_DBC, hdbc, "" ) );
+ }
+
+ pOdbcTest->out_win->append( "" );
+diff -up unixodbc-gui-qt/ODBCTestQ4/DlgEnvAllocEnv.cpp.debug unixodbc-gui-qt/ODBCTestQ4/DlgEnvAllocEnv.cpp
+--- unixodbc-gui-qt/ODBCTestQ4/DlgEnvAllocEnv.cpp.debug 2010-02-27 09:18:46.000000000 +0100
++++ unixodbc-gui-qt/ODBCTestQ4/DlgEnvAllocEnv.cpp 2011-12-08 14:01:34.807508043 +0100
+@@ -63,7 +63,7 @@ void DlgEnvAllocEnv::slotDone()
+ txt.sprintf( " *phenv: %p", henv );
+ pOdbcTest->out_win->append( txt );
+
+- pOdbcTest->listHandle.append( new OdbcHandle( SQL_HANDLE_ENV, henv ) );
++ pOdbcTest->listHandle.append( new OdbcHandle( SQL_HANDLE_ENV, henv, "" ) );
+ }
+
+ pOdbcTest->out_win->append( "" );
diff --git a/unixODBC-gui-qt-so-version-bump.patch b/unixODBC-gui-qt-so-version-bump.patch
new file mode 100644
index 0000000..20e5a91
--- /dev/null
+++ b/unixODBC-gui-qt-so-version-bump.patch
@@ -0,0 +1,39 @@
+diff -up unixODBC-gui-qt-2.3.0/configure.in.so-version-bump unixODBC-gui-qt-2.3.0/configure.in
+--- unixODBC-gui-qt-2.3.0/configure.in.so-version-bump 2010-02-24 20:33:29.000000000 +0100
++++ unixODBC-gui-qt-2.3.0/configure.in 2011-12-09 13:47:03.598677232 +0100
+@@ -447,8 +447,8 @@ AC_FUNC_ALLOCA
+ AC_FUNC_VPRINTF
+ AC_CHECK_FUNCS( putenv socket strdup strstr setenv setlocale strchr )
+
+-dnl LIB_VERSION="1:0:1"
++LIB_VERSION="2:0:0"
+-dnl AC_SUBST(LIB_VERSION)
++AC_SUBST(LIB_VERSION)
+
+ dnl We use the following version format to make some qmake friendly code happy...
+ CFLAGS="$CFLAGS -DV_MAJOUR=1 -DV_MINOR=0 -DV_RELEASE=1"
+diff -up unixODBC-gui-qt-2.3.0/gtrtstQ4/Makefile.am.so-version-bump unixODBC-gui-qt-2.3.0/gtrtstQ4/Makefile.am
+--- unixODBC-gui-qt-2.3.0/gtrtstQ4/Makefile.am.so-version-bump 2011-12-09 13:49:45.601666155 +0100
++++ unixODBC-gui-qt-2.3.0/gtrtstQ4/Makefile.am 2011-12-09 13:49:55.390665547 +0100
+@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libgtrtstQ4.la
+
+ libgtrtstQ4_la_LDFLAGS = \
+ -no-undefined \
+- -version-info 2:1:1 \
++ -version-info $(LIB_VERSION) \
+ -export-dynamic \
+ -export-symbols @srcdir@/gtrtstQ4.exp \
+ -module
+diff -up unixODBC-gui-qt-2.3.0/odbcinstQ4/Makefile.am.so-version-bump unixODBC-gui-qt-2.3.0/odbcinstQ4/Makefile.am
+--- unixODBC-gui-qt-2.3.0/odbcinstQ4/Makefile.am.so-version-bump 2011-12-09 13:48:48.241670075 +0100
++++ unixODBC-gui-qt-2.3.0/odbcinstQ4/Makefile.am 2011-12-09 13:48:59.920669283 +0100
+@@ -2,7 +2,8 @@ lib_LTLIBRARIES = libodbcinstQ4.la
+
+ libodbcinstQ4_la_LDFLAGS = \
+ -no-undefined \
+- -version-info 2:1:1 \
++ -version-info $(LIB_VERSION) \
++ -avoid-version \
+ -export-dynamic \
+ -export-symbols @srcdir@/odbcinstQ4.exp \
+ -module
diff --git a/unixODBC-gui-qt.spec b/unixODBC-gui-qt.spec
new file mode 100644
index 0000000..85fc7a3
--- /dev/null
+++ b/unixODBC-gui-qt.spec
@@ -0,0 +1,111 @@
+%global svn 98
+%global checkout 20120105svn%{svn}
+
+Summary: Several GUI (Qt) programs and plug-ins for unixODBC
+Name: unixODBC-gui-qt
+# There has not been a formal upstream release yet and we're not
+# sure about the first formal release version, so using 0
+Version: 0
+Release: 0.3.%{checkout}%{?dist}
+Group: Applications/Databases
+URL: http://sourceforge.net/projects/unixodbc-gui-qt/
+# Programs are GPL, libraries are LGPL
+License: GPLv3 and LGPLv3
+# Source code is available only in SVN by upstream, so using own
+# tarball created from the last commit. SVN repository can be found at
+# https://unixodbc-gui-qt.svn.sourceforge.net/svnroot/unixodbc-gui-qt
+Source: %{name}-%{checkout}.tar.bz2
+Source1: ODBCCreateDataSourceQ4.desktop
+Source2: ODBCManageDataSourcesQ4.desktop
+Source3: ODBCTestQ4.desktop
+
+Patch1: unixODBC-gui-qt-qstring.patch
+# We'd like to have the same soname version as former unixODBC-kde had
+Patch2: unixODBC-gui-qt-so-version-bump.patch
+
+Requires: unixODBC
+BuildRequires: qt4-devel qt-assistant-adp-devel
+BuildRequires: libtool libtool-ltdl-devel
+BuildRequires: unixODBC-devel
+BuildRequires: desktop-file-utils
+# Since unixODBC-2.3.0 does not contain GUI tools anymore, we can say
+# unixODBC-gui-qt obsoletes all versions of unixODBC-kde bellow 2.3.0
+Provides: unixODBC-kde = 2.3.0-1
+Obsoletes: unixODBC-kde < 2.3.0-1
+
+%description
+unixODBC-gui-qt provides several GUI (Qt) programs and plug-ins.
+ * administrator (program)
+ * create data source wizard (program)
+ * test (program)
+ * installer (plug-in)
+ * auto test (plug-in)
+
+%prep
+%setup -q -n %{name}
+%patch1 -p1 -b .qstring
+%patch2 -p1 -b .so-version-bump
+
+%build
+# pick up qt path
+export PATH="%{_qt4_bindir}:$PATH"
+
+make -f Makefile.svn
+
+%configure \
+ --disable-static \
+ --enable-ltdllib \
+ --with-gnu-ld \
+ --with-qt-dir-lib="%{_qt4_libdir}" \
+ --with-qt-dir-bin="%{_qt4_bindir}"
+
+make %{?_smp_mflags}
+
+%install
+# pick up qt path
+export PATH="%{_qt4_bindir}:$PATH"
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+
+make DESTDIR=$RPM_BUILD_ROOT install
+
+# install *.desktop files
+desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
+desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
+desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE3}
+
+# install icons used for applications in *.desktop files
+install -p -m 644 ODBCDataManagerQ4/ODBC64.xpm \
+ $RPM_BUILD_ROOT%{_datadir}/pixmaps/ODBCCreateDataSourceQ4.xpm
+install -p -m 644 odbcinstQ4/ODBCManageDataSources64.xpm \
+ $RPM_BUILD_ROOT%{_datadir}/pixmaps/ODBCManageDataSourcesQ4.xpm
+install -p -m 644 ODBCTestQ4/ODBCTestQ4-48.xpm \
+ $RPM_BUILD_ROOT%{_datadir}/pixmaps/ODBCTestQ4.xpm
+
+# remove unpackaged files from the buildroot
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
+%files
+%doc AUTHORS COPYING ChangeLog NEWS doc GPL.txt LGPL.txt
+%{_bindir}/ODBCCreateDataSourceQ4
+%{_bindir}/ODBCManageDataSourcesQ4
+%{_bindir}/ODBCTestQ4
+%{_datadir}/applications/*.desktop
+%{_datadir}/pixmaps/*
+%{_libdir}/libgtrtstQ*so*
+%{_libdir}/libodbcinstQ*so*
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%changelog
+* Thu Jan 05 2012 Honza Horak <hhorak at redhat.com> - 0-0.3.20120105svn98
+- fixed issues found by Package Review process (see #767622)
+
+* Thu Dec 15 2011 Honza Horak <hhorak at redhat.com> - 0-0.2.20111208svn95
+- add Provides: unixODBC-kde to indicate unixODBC-gui-qt fills the gap after
+ GUI utils are no longer part of unixODBC
+
+* Tue Dec 13 2011 Honza Horak <hhorak at redhat.com> - 0-0.1.20111208svn95
+- initial build from svn commit 95 after detachment from unixODBC project
More information about the scm-commits
mailing list