summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--tora-2.1.0.patch11
-rw-r--r--tora.spec17
3 files changed, 13 insertions, 19 deletions
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..1e65467
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,4 @@
+SRCDIR := $(shell pwd)
+NAME := $(shell basename $(SRCDIR))
+include ../common/Makefile
+
diff --git a/tora-2.1.0.patch b/tora-2.1.0.patch
deleted file mode 100644
index dac0d74..0000000
--- a/tora-2.1.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/modules/FindOracle.cmake.orig 2009-09-25 16:52:32.000000000 +0200
-+++ cmake/modules/FindOracle.cmake 2009-09-25 16:53:04.000000000 +0200
-@@ -72,7 +72,7 @@
- FIND_PROGRAM(AWK awk)
- FIND_PROGRAM(SQLPLUS sqlplus PATHS ENV ORACLE_HOME NO_DEFAULT_PATH)
- FIND_PROGRAM(SQLPLUS sqlplus)
-- SET (sqlplus_version "${SQLPLUS} -version | ${AWK} '/Release/ {print $3}'")
-+ SET (sqlplus_version "sqlplus -version 2>/dev/null || sqlplus64 -version 2>/dev/null | ${AWK} '/Release/ {print $3}'")
- EXEC_PROGRAM(${sqlplus_version} OUTPUT_VARIABLE sqlplus_out)
- MESSAGE(STATUS "found sqlplus version: ${sqlplus_out}")
-
diff --git a/tora.spec b/tora.spec
index cc58b1d..26735be 100644
--- a/tora.spec
+++ b/tora.spec
@@ -16,15 +16,13 @@
Summary: Toolkit for Oracle
Name: tora
-Version: 2.1.0
+Version: 2.1.2
Release: 1%{?dist}
URL: http://tora.sourceforge.net
Group: Development/Databases
License: GPLv2
-Source: %{name}-%{version}.tar.gz
-
-Patch0: %{name}-2.1.0.patch
+Source: %{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -32,8 +30,10 @@ BuildRequires: desktop-file-utils
BuildRequires: postgresql-devel
BuildRequires: oracle-instantclient-devel = %{oraclever}
BuildRequires: oracle-instantclient-sqlplus = %{oraclever}
-BuildRequires: qt-devel >= 4.3.0 qscintilla-devel
-BuildRequires: perl cmake openssl-devel glib2-devel
+BuildRequires: qt4-devel >= 4.3.0
+BuildRequires: qscintilla-devel >= 2.0.0
+BuildRequires: cmake >= 2.4.0
+BuildRequires: perl openssl-devel glib2-devel
Requires: qt-mysql qt-postgresql
@@ -60,8 +60,6 @@ See the README file
%prep
%setup -q
-%patch0 -p0 -b .orig
-
cat >%{name}.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
@@ -143,6 +141,9 @@ update-desktop-database &> /dev/null || :
%changelog
+* Tue May 10 2010 Remi Collet <RPMS@famillecollet.com> 2.1.2-1
+- update to 2.1.2
+
* Fri Sep 25 2009 Remi Collet <RPMS@famillecollet.com> 2.1.0-1
- Update