packages: tora/tora.spec, tora/tora-2.1.2-qt47.patch (NEW) - rel 4; fix build

[arekm]

Author: arekm                        Date: Sat Sep 17 20:13:00 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4; fix build

---- Files affected:
packages/tora:
   tora.spec (1.49 -> 1.50) , tora-2.1.2-qt47.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/tora/tora.spec
diff -u packages/tora/tora.spec:1.49 packages/tora/tora.spec:1.50
--- packages/tora/tora.spec:1.49	Sat Sep 17 13:46:19 2011
+++ packages/tora/tora.spec	Sat Sep 17 22:12:55 2011
@@ -8,19 +8,20 @@
 Summary(pl.UTF-8):	Zestaw graficznych narzędzi dla programistów i administratorów baz danych
 Name:		tora
 Version:	2.1.2
-Release:	3
+Release:	4
 License:	GPL v2
 Group:		Applications/Databases/Interfaces
-Source0:	http://dl.sourceforge.net/tora/%{name}-%{version}.tar.gz
+Source0:	http://downloads.sourceforge.net/tora/%{name}-%{version}.tar.gz
 # Source0-md5:	2b49bbe9f4dc83ce33a22e888575ea73
 Source1:	%{name}.desktop
 Patch0:		%{name}-postgresql.patch
 Patch1:		%{name}-gcc.patch
+Patch2:		%{name}-2.1.2-qt47.patch
 URL:		http://tora.sourceforge.net/
 BuildRequires:	QtCore-devel
 BuildRequires:	QtGui-devel
-BuildRequires:	QtSql-devel
 BuildRequires:	QtNetwork-devel
+BuildRequires:	QtSql-devel
 BuildRequires:	QtXml-devel
 BuildRequires:	cppunit-devel
 %{?with_instantclient:BuildRequires:	oracle-instantclient-devel}
@@ -55,6 +56,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 rm -f src/moc_*
 
@@ -111,6 +113,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.50  2011/09/17 20:12:55  arekm
+- rel 4; fix build
+
 Revision 1.49  2011/09/17 11:46:19  arekm
 - release 3
 

================================================================
Index: packages/tora/tora-2.1.2-qt47.patch
diff -u /dev/null packages/tora/tora-2.1.2-qt47.patch:1.1
--- /dev/null	Sat Sep 17 22:13:00 2011
+++ packages/tora/tora-2.1.2-qt47.patch	Sat Sep 17 22:12:55 2011
@@ -0,0 +1,15 @@
+Index: tora-2.1.2/src/tobrowserbasewidget.cpp
+===================================================================
+--- tora-2.1.2.orig/src/tobrowserbasewidget.cpp
++++ tora-2.1.2/src/tobrowserbasewidget.cpp
+@@ -48,8 +48,8 @@
+ 
+ toBrowserBaseWidget::toBrowserBaseWidget(QWidget * parent)
+     : QTabWidget(parent),
+-    m_schema(0),
+-    m_object(0)
++    m_schema(QString()),
++    m_object(QString())
+ {
+     setObjectName("toBrowserBaseWidget");
+ 
================================================================

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