packages: tora/tora.spec, tora/tora-gcc4.patch (NEW), tora/tora-postgresql....

Fri Sep 4 14:17:37 CEST 2009

Author: baggins                      Date: Fri Sep  4 12:17:37 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.0.0
- removed outdated patches

---- Files affected:
packages/tora:
   tora.spec (1.39 -> 1.40) , tora-gcc4.patch (NONE -> 1.1)  (NEW), tora-postgresql.patch (NONE -> 1.1)  (NEW), tora-cpp.patch (1.1 -> NONE)  (REMOVED), tora-no-maximize.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/tora/tora.spec
diff -u packages/tora/tora.spec:1.39 packages/tora/tora.spec:1.40

--- packages/tora/tora.spec:1.39	Mon Feb 12 23:09:18 2007
+++ packages/tora/tora.spec	Fri Sep  4 14:17:32 2009
@@ -6,23 +6,28 @@
 Summary:	A graphical toolkit for database developers and administrators
 Summary(pl.UTF-8):	Zestaw graficznych narzędzi dla programistów i administratorów baz danych
 Name:		tora
-Version:	1.3.21
-Release:	0.4
+Version:	2.0.0
+Release:	0.1
 License:	GPL v2
 Group:		Applications/Databases/Interfaces
 Source0:	http://dl.sourceforge.net/tora/%{name}-%{version}.tar.gz
-# Source0-md5:	10e3c9944ffaca50de046e2c3e02eee4
+# Source0-md5:	e90e0d3dbec98e89e9c292d603318003
 Source1:	%{name}.desktop
-Patch0:		%{name}-no-maximize.patch
-Patch1:		%{name}-cpp.patch
+Patch0:		%{name}-gcc4.patch
+Patch1:		%{name}-postgresql.patch
 URL:		http://tora.sourceforge.net/
-BuildRequires:	kdelibs-devel
 BuildRequires:	pcre-devel
-BuildRequires:	qscintilla-devel
-BuildRequires:	qt-devel
+BuildRequires:	postgresql-devel
+BuildRequires:	qscintilla2-devel
+BuildRequires:	qt-devel >= 4.3.0
 BuildRequires:	qt-linguist
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%if %{with oracle}
+# ORACLE_HOME is required for oracle
+%define _preserve_env %_preserve_env_base ORACLE_HOME
+%endif
+
 %description
 TOra features a schema browser, SQL worksheet, PL/SQL editor and
 debugger, storage manager, rollback segment monitor, instance manager,
@@ -41,11 +46,16 @@
 %patch0 -p1
 %patch1 -p1
 
+rm -f src/moc_*
+
 %build
+%{__libtoolize}
+%{__aclocal} -I config/m4
+%{__autoconf}
+%{__automake}
 %configure \
-	--libdir=%{_libdir}/%{name} \
-	--enable-plugin \
-	%{?with_oracle:--with-oracle}%{!?with_oracle:--without-oracle}
+	--libdir=%{_datadir}/%{name} \
+	%{!?with_oracle:--without-oracle}
 
 %{__make}
 
@@ -57,13 +67,8 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-install icons/tora.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
-
-cp -a help $RPM_BUILD_ROOT%{_libdir}/%{name}
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/help/images/{.xvpics,.cvsignore}
-
-install *.qm $RPM_BUILD_ROOT%{_libdir}/%{name}
-install templates/*.tpl $RPM_BUILD_ROOT%{_libdir}/%{name}
+install src/icons/tora.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
+cp -a src/templates $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -72,14 +77,10 @@
 %defattr(644,root,root,755)
 %doc BUGS NEWS README TODO
 %attr(755,root,root) %{_bindir}/*
-%dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libdir}/%{name}/lib*.so
-%{_libdir}/%{name}/lib*.la
-# Needed?
-%{_libdir}/%{name}/lib*.a
-%{_libdir}/%{name}/help
-%{_libdir}/%{name}/*.tpl
-%{_libdir}/%{name}/*.qm
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/help
+%{_datadir}/%{name}/templates
+%{_datadir}/%{name}/*.qm
 %{_desktopdir}/*.desktop
 %{_pixmapsdir}/*
 
@@ -89,6 +90,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.40  2009/09/04 12:17:32  baggins
+- updated to 2.0.0
+- removed outdated patches
+
 Revision 1.39  2007/02/12 22:09:18  glen
 - tabs in preamble
 

================================================================
Index: packages/tora/tora-gcc4.patch
diff -u /dev/null packages/tora/tora-gcc4.patch:1.1
--- /dev/null	Fri Sep  4 14:17:37 2009
+++ packages/tora/tora-gcc4.patch	Fri Sep  4 14:17:32 2009
@@ -0,0 +1,44 @@
+diff -x 'moc_*' -ur tora-2.0.0/src/todebug.cpp tora-2.0.0-gcc/src/todebug.cpp
+--- tora-2.0.0/src/todebug.cpp	2008-09-14 23:54:40.000000000 +0200
++++ tora-2.0.0-gcc/src/todebug.cpp	2009-09-04 13:08:05.743468734 +0200
+@@ -79,6 +79,7 @@
+ #include <QMessageBox>
+ #include <QButtonGroup>
+ #include <QTreeView>
++#include <cstdio>
+ 
+ #include "icons/addwatch.xpm"
+ #include "icons/changewatch.xpm"
+diff -x 'moc_*' -ur tora-2.0.0/src/tomodeleditor.cpp tora-2.0.0-gcc/src/tomodeleditor.cpp
+--- tora-2.0.0/src/tomodeleditor.cpp	2008-09-22 02:34:08.000000000 +0200
++++ tora-2.0.0-gcc/src/tomodeleditor.cpp	2009-09-04 13:06:45.023161704 +0200
+@@ -58,6 +58,7 @@
+ #include <QDesktopWidget>
+ #include <QSettings>
+ #include <QAbstractItemModel>
++#include <cstdio>
+ 
+ #include "icons/commit.xpm"
+ #include "icons/copy.xpm"
+diff -x 'moc_*' -ur tora-2.0.0/src/toqvalue.cpp tora-2.0.0-gcc/src/toqvalue.cpp
+--- tora-2.0.0/src/toqvalue.cpp	2008-09-14 23:54:40.000000000 +0200
++++ tora-2.0.0-gcc/src/toqvalue.cpp	2009-09-04 13:05:45.063279462 +0200
+@@ -46,6 +46,7 @@
+ 
+ #include <QVariant>
+ #include <QApplication>
++#include <cstdio>
+ 
+ static int NumberFormat;
+ static int NumberDecimals;
+diff -x 'moc_*' -ur tora-2.0.0/src/toresultview.cpp tora-2.0.0-gcc/src/toresultview.cpp
+--- tora-2.0.0/src/toresultview.cpp	2008-09-14 23:54:40.000000000 +0200
++++ tora-2.0.0-gcc/src/toresultview.cpp	2009-09-04 13:07:33.740202733 +0200
+@@ -75,6 +75,7 @@
+ #include <QAction>
+ #include <QMimeData>
+ #include <QColorGroup>
++#include <cstdio>
+ 
+ static int MaxColDisp;
+ static bool Gridlines;

================================================================
Index: packages/tora/tora-postgresql.patch
diff -u /dev/null packages/tora/tora-postgresql.patch:1.1
--- /dev/null	Fri Sep  4 14:17:37 2009
+++ packages/tora/tora-postgresql.patch	Fri Sep  4 14:17:32 2009
@@ -0,0 +1,45 @@
+diff -ur tora-2.0.0-gcc/config/m4/postgresql.m4 tora-2.0.0/config/m4/postgresql.m4
+--- tora-2.0.0-gcc/config/m4/postgresql.m4	2008-11-03 21:32:20.000000000 +0100
++++ tora-2.0.0/config/m4/postgresql.m4	2009-09-04 13:40:05.626436760 +0200
+@@ -6,7 +6,7 @@
+   AC_CHECK_DECL([PQcancel],
+                 [ac_pg_cancel=yes],
+                 [ac_pg_cancel=no],
+-                [#include <postgresql/libpq-fe.h>])
++                [#include <libpq-fe.h>])
+ 
+   if test $ac_pg_cancel = yes; then
+     AC_DEFINE([LIBPQ_DECL_CANCEL], 1, [Define if libpg-fe.h declares PQcancel.])
+diff -ur tora-2.0.0-gcc/configure.ac tora-2.0.0/configure.ac
+--- tora-2.0.0-gcc/configure.ac	2008-09-14 23:54:41.000000000 +0200
++++ tora-2.0.0/configure.ac	2009-09-04 13:37:15.446425066 +0200
+@@ -28,7 +28,7 @@
+ fi
+ # Checks for header files.
+ # AC_HEADER_STDC
+-AC_CHECK_HEADERS(unistd.h sys/param.h sys/time.h time.h sys/mkdev.h sys/sysmacros.h string.h memory.h fcntl.h dirent.h sys/ndir.h ndir.h alloca.h locale.h utime.h postgresql/libpq-fe.h)
++AC_CHECK_HEADERS(unistd.h sys/param.h sys/time.h time.h sys/mkdev.h sys/sysmacros.h string.h memory.h fcntl.h dirent.h sys/ndir.h ndir.h alloca.h locale.h utime.h libpq-fe.h)
+ AC_HEADER_MAJOR
+ AC_FUNC_ALLOCA
+ AC_FUNC_MALLOC
+diff -ur tora-2.0.0-gcc/src/toqsqlconnection.cpp tora-2.0.0/src/toqsqlconnection.cpp
+--- tora-2.0.0-gcc/src/toqsqlconnection.cpp	2008-09-14 23:54:40.000000000 +0200
++++ tora-2.0.0/src/toqsqlconnection.cpp	2009-09-04 13:39:41.136783352 +0200
+@@ -67,7 +67,7 @@
+ #include <QGridLayout>
+ #include <QString>
+ 
+-#ifdef HAVE_POSTGRESQL_LIBPQ_FE_H
++#ifdef HAVE_LIBPQ_FE_H
+ #ifdef CMAKE_BUILD
+   // There is different location of pgsql includes sometimes
+   // E.g. /usr/include/pgsql on suse etc. Cmake hadles it
+@@ -75,7 +75,7 @@
+   #include <libpq-fe.h>
+ #else
+   // This is for autotools
+-  #include <postgresql/libpq-fe.h>
++  #include <libpq-fe.h>
+ #endif
+ #endif
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tora/tora.spec?r1=1.39&r2=1.40&f=u

