rpms/sqliteman/devel sqliteman-1.2.1-qt-4.7.patch, NONE, 1.1 sqliteman.spec, 1.8, 1.9

[terjeros]

Author: terjeros

Update of /cvs/pkgs/rpms/sqliteman/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16966

Modified Files:
	sqliteman.spec 
Added Files:
	sqliteman-1.2.1-qt-4.7.patch 
Log Message:
* Wed Jun 16 2010 Terje Rosten <terje.rosten at ntnu.no> - 1.2.1-3
- Add patch to build with qt-4.7, thanks to Alec Moskvin


sqliteman-1.2.1-qt-4.7.patch:
 database.h |    2 +-
 main.cpp   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE sqliteman-1.2.1-qt-4.7.patch ---
--- Sqliteman/sqliteman/main.cpp	(revision 511)
+++ Sqliteman/sqliteman/main.cpp	(working copy)
@@ -69,7 +69,7 @@ 
 with PreferencesDialog.
 */
 ArgsParser::ArgsParser(int c, char ** v)
-	: argc(c), argv(v), m_locale(""), m_file(0)
+	: argc(c), argv(v), m_locale(""), m_file(QString())
 {
 	QDir d(TRANSLATION_DIR, "*.qm");
 	int i = 1; // 0 is for system default
--- Sqliteman/sqliteman/database.h	(revision 511)
+++ Sqliteman/sqliteman/database.h	(working copy)
@@ -69,7 +69,7 @@ 
 		\param schema a name of the DB schema
 		\retval DbObjects a map with "object name"/"its parent"
 		*/
-		static DbObjects getObjects(const QString type = 0, const QString schema = "main");
+		static DbObjects getObjects(const QString type = QString(), const QString schema = "main");
 
 		/*! \brief Gather "SYS schema" objects.
 		\param schema a string with "attached db" name


Index: sqliteman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqliteman/devel/sqliteman.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sqliteman.spec	27 Jul 2009 04:44:10 -0000	1.8
+++ sqliteman.spec	16 Jun 2010 20:55:22 -0000	1.9
@@ -1,15 +1,16 @@
 Summary:       Manager for sqlite - Sqlite Databases Made Easy
 Name:          sqliteman
 Version:       1.2.1
-Release:       2%{?dist}
+Release:       3%{?dist}
 # src is GPLv2+, icons are LGPLv2+
 License:       GPLv2+ and LGPLv2+
 Group:         Applications/Databases
 URL:           http://www.sqliteman.com/
 Source :       http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch:         sqliteman-1.0.1.desktop.patch
-Requires:      qt4-sqlite
-BuildRequires: cmake qt4-devel >= 4.2.0
+Patch0:        sqliteman-1.0.1.desktop.patch
+Patch1:        sqliteman-1.2.1-qt-4.7.patch
+Requires:      qt-sqlite
+BuildRequires: cmake qt-devel >= 4.2.0
 BuildRequires: desktop-file-utils
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -24,7 +25,8 @@ the applications designed for tasks such
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
 %cmake -DWANT_INTERNAL_QSCINTILLA=1
@@ -68,6 +70,9 @@ fi
 %{_datadir}/%{name}
 
 %changelog
+* Wed Jun 16 2010 Terje Rosten <terje.rosten at ntnu.no> - 1.2.1-3
+- Add patch to build with qt-4.7, thanks to Alec Moskvin
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild