Author: qboosh Date: Sun Oct 10 19:27:44 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- split from unixODBC (pretty complete svn snap, tar not released yet)
---- Files affected:
packages/unixODBC-GUI-Qt:
ODBCDataManagerQ4.desktop (NONE -> 1.1) (NEW),
ODBCManageDataSourcesQ4.desktop (NONE -> 1.1) (NEW), ODBCTestQ4.desktop (NONE
-> 1.1) (NEW), unixODBC-GUI-Qt-qt4.patch (NONE -> 1.1) (NEW),
unixODBC-GUI-Qt.spec (NONE -> 1.1) (NEW), unixODBC.png (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/unixODBC-GUI-Qt/ODBCDataManagerQ4.desktop
diff -u /dev/null packages/unixODBC-GUI-Qt/ODBCDataManagerQ4.desktop:1.1
--- /dev/null Sun Oct 10 21:27:44 2010
+++ packages/unixODBC-GUI-Qt/ODBCDataManagerQ4.desktop Sun Oct 10 21:27:39 2010
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=ODBC Data Manager
+Exec=ODBCDataManagerQ4
+Icon=unixODBC
+Type=Application
+Terminal=false
+Categories=Qt;System;
+# vi: encoding=utf-8
================================================================
Index: packages/unixODBC-GUI-Qt/ODBCManageDataSourcesQ4.desktop
diff -u /dev/null packages/unixODBC-GUI-Qt/ODBCManageDataSourcesQ4.desktop:1.1
--- /dev/null Sun Oct 10 21:27:44 2010
+++ packages/unixODBC-GUI-Qt/ODBCManageDataSourcesQ4.desktop Sun Oct 10
21:27:39 2010
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=ODBC Data Source Administrator
+Exec=ODBCManageDataSourcesQ4
+Icon=unixODBC
+Type=Application
+Terminal=false
+Categories=Qt;System;
+# vi: encoding=utf-8
================================================================
Index: packages/unixODBC-GUI-Qt/ODBCTestQ4.desktop
diff -u /dev/null packages/unixODBC-GUI-Qt/ODBCTestQ4.desktop:1.1
--- /dev/null Sun Oct 10 21:27:44 2010
+++ packages/unixODBC-GUI-Qt/ODBCTestQ4.desktop Sun Oct 10 21:27:39 2010
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=ODBC Test
+Exec=ODBCTestQ4
+Icon=unixODBC
+Type=Application
+Terminal=false
+Categories=Qt;System;
+# vi: encoding=utf-8
================================================================
Index: packages/unixODBC-GUI-Qt/unixODBC-GUI-Qt-qt4.patch
diff -u /dev/null packages/unixODBC-GUI-Qt/unixODBC-GUI-Qt-qt4.patch:1.1
--- /dev/null Sun Oct 10 21:27:44 2010
+++ packages/unixODBC-GUI-Qt/unixODBC-GUI-Qt-qt4.patch Sun Oct 10 21:27:39 2010
@@ -0,0 +1,31 @@
+--- unixODBC-GUI-Qt/qt.m4.orig 2010-10-10 10:52:19.000000000 +0200
++++ unixODBC-GUI-Qt/qt.m4 2010-10-10 15:38:13.647735177 +0200
+@@ -17,7 +17,7 @@
+ qt_dir_include=""
+ qt_dir_lib=""
+ qt_dir_bin=""
+- qt_libs="-lQtGui -lQtCore -lQtAssistantClient -lQtNetwork"
++ qt_libs="-lQtGui -lQtCore -lQtNetwork"
+ MOC=""
+ UIC=""
+
+@@ -116,7 +116,7 @@
+
+ AC_SUBST(MOC)
+ AC_SUBST(UIC)
+- QT_CXXFLAGS="-I$qt_dir_include -I$qt_dir_include/QtCore
-I$qt_dir_include/QtGui -I$qt_dir_include/QtAssistant
-I$qt_dir_include/QtNetwork"
++ QT_CXXFLAGS="-I$qt_dir_include -I$qt_dir_include/QtCore
-I$qt_dir_include/QtGui -I$qt_dir_include/QtNetwork"
+ AC_SUBST(QT_CXXFLAGS)
+ QT_LDFLAGS="-L$qt_dir_lib"
+ AC_SUBST(QT_LDFLAGS)
+--- unixODBC-GUI-Qt/ODBCTestQ4/OdbcHandle.h.orig 2010-10-10
10:52:18.000000000 +0200
++++ unixODBC-GUI-Qt/ODBCTestQ4/OdbcHandle.h 2010-10-10 17:34:56.803734339
+0200
+@@ -106,7 +106,7 @@
+ {
+ public:
+ OdbcHandle( int t, SQLHANDLE h, QList<OdbcHandle*> &list );
+- OdbcHandle( int t, SQLHANDLE h, QString desc = NULL, SQLHANDLE stmt =
SQL_NULL_HANDLE );
++ OdbcHandle( int t, SQLHANDLE h, QString desc = "", SQLHANDLE stmt =
SQL_NULL_HANDLE );
+ OdbcHandle( OdbcHandle &e );
+ ~OdbcHandle();
+ char * toStr( char * str );
================================================================
Index: packages/unixODBC-GUI-Qt/unixODBC-GUI-Qt.spec
diff -u /dev/null packages/unixODBC-GUI-Qt/unixODBC-GUI-Qt.spec:1.1
--- /dev/null Sun Oct 10 21:27:44 2010
+++ packages/unixODBC-GUI-Qt/unixODBC-GUI-Qt.spec Sun Oct 10 21:27:39 2010
@@ -0,0 +1,108 @@
+# $Revision$, $Date$
+Summary: Qt-based GUIs for unixODBC
+Summary(pl.UTF-8): Oparte na Qt graficzne interfejsy dla unixODBC
+Name: unixODBC-GUI-Qt
+Version: 2.3.0
+%define snap r92
+Release: 0.%{snap}.1
+License: LGPL v2+ (libraries), GPL v2+ (applications)
+Group: X11/Applications
+# svn co https://unixodbc-gui-qt.svn.sourceforge.net/svnroot/unixodbc-gui-qt
+Source0: %{name}-%{version}-%{snap}.tar.bz2
+# Source0-md5: 102927d027e15dd7335eff9bed7213cd
+Source1: unixODBC.png
+Source2: ODBCDataManagerQ4.desktop
+Source3: ODBCManageDataSourcesQ4.desktop
+Source4: ODBCTestQ4.desktop
+Patch0: %{name}-qt4.patch
+URL: http://sourceforge.net/projects/unixodbc-gui-qt/
+BuildRequires: QtGui-devel >= 4.0
+BuildRequires: QtNetwork-devel >= 4.0
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: flex
+BuildRequires: libltdl-devel
+BuildRequires: libstdc++-devel
+BuildRequires: libtool >= 1:1.4.2-9
+BuildRequires: qt4-build >= 4.0
+BuildRequires: readline-devel >= 4.2
+BuildRequires: unixODBC-devel >= 2.3.0
+Requires: unixODBC >= 2.3.0
+Suggests: qt4-assisant >= 4.0
+Obsoletes: unixODBC-qt
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+Qt-based GUIs for unixODBC - libodbcinstQ plugin for libodbcinst
+library and applications: DataManager, DataManagerII, ODBCConfig,
+odbctest.
+
+%description -l pl.UTF-8
+Oparte na Qt graficzne interfejsy użytkownika do unixODBC - wtyczka
+libodbcinstQ dla biblioteki libodbcinst oraz aplikacje: DataManager,
+DataManagerII, ODBCConfig, odbctest.
+
+%prep
+%setup -q -n %{name}
+%patch0 -p1
+
+%build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+%configure \
+ --disable-static \
+ --enable-ltdllib \
+ --with-qt-dir-bin=%{_libdir}/qt4/bin \
+ --with-qt-dir-include=/usr/include/qt4 \
+ --with-qt-dir-lib=%{_libdir}
+
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
+
+# libodbcinstQ.so.1 is lt_dlopened
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib{gtrtstQ4,odbcinstQ4}.la
+
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_pixmapsdir}
+# acc. to README ODBCDataManagerQ4 is not done yet
+#install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE3} %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(644,root,root,755)
+%doc AUTHORS COPYING ChangeLog NEWS README
+%attr(755,root,root) %{_bindir}/ODBCCreateDataSourceQ4
+%attr(755,root,root) %{_bindir}/ODBCManageDataSourcesQ4
+%attr(755,root,root) %{_bindir}/ODBCTestQ4
+%attr(755,root,root) %{_libdir}/libgtrtstQ4.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgtrtstQ4.so.1
+%attr(755,root,root) %{_libdir}/libodbcinstQ4.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libodbcinstQ4.so.1
+# for dlopen
+%attr(755,root,root) %{_libdir}/libgtrtstQ4.so
+%attr(755,root,root) %{_libdir}/libodbcinstQ4.so
+%{_pixmapsdir}/unixODBC.png
+%{_desktopdir}/ODBCTestQ4.desktop
+%{_desktopdir}/ODBCManageDataSourcesQ4.desktop
+
+%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
+%changelog
+* %{date} PLD Team <feedb...@pld-linux.org>
+All persons listed below can be reached at <cvs_login>@pld-linux.org
+
+$Log$
+Revision 1.1 2010/10/10 19:27:39 qboosh
+- split from unixODBC (pretty complete svn snap, tar not released yet)
================================================================
Index: packages/unixODBC-GUI-Qt/unixODBC.png
<<Binary file>>
================================================================
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
