Author: baggins Date: Fri Sep 10 23:52:38 2010 GMT Module: packages Tag: HEAD ---- Log message: - 2.1.2 - allow building with oracle-instantclient - updated BR
---- Files affected: packages/tora: tora.spec (1.46 -> 1.47) ---- Diffs: ================================================================ Index: packages/tora/tora.spec diff -u packages/tora/tora.spec:1.46 packages/tora/tora.spec:1.47 --- packages/tora/tora.spec:1.46 Mon Jan 4 15:41:20 2010 +++ packages/tora/tora.spec Sat Sep 11 01:52:33 2010 @@ -2,25 +2,34 @@ # # Conditional build: %bcond_with oracle # build with oracle support +%bcond_with instantclient # build oracle support with oracle-instantclient # 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: 2.1.1 +Version: 2.1.2 Release: 1 License: GPL v2 Group: Applications/Databases/Interfaces Source0: http://dl.sourceforge.net/tora/%{name}-%{version}.tar.gz -# Source0-md5: 6a25c8f62a70f368f16126103d54be7d +# Source0-md5: 2b49bbe9f4dc83ce33a22e888575ea73 Source1: %{name}.desktop Patch0: %{name}-postgresql.patch +Patch1: %{name}-gcc.patch URL: http://tora.sourceforge.net/ +BuildRequires: QtCore-devel +BuildRequires: QtGui-devel +BuildRequires: QtSql-devel +BuildRequires: QtNetwork-devel +BuildRequires: QtXml-devel BuildRequires: cppunit-devel +%{?with_instantclient:BuildRequires: oracle-instantclient-devel} BuildRequires: pcre-devel BuildRequires: postgresql-devel BuildRequires: qscintilla2-devel -BuildRequires: qt-devel >= 4.3.0 -BuildRequires: qt-linguist +BuildRequires: qt4-build +BuildRequires: qt4-linguist +BuildRequires: xorg-lib-libICE-devel Suggests: QtSql-pgsql BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -45,6 +54,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 rm -f src/moc_* @@ -55,7 +65,17 @@ %{__automake} %configure \ --libdir=%{_datadir}/%{name} \ - %{!?with_oracle:--without-oracle} + --with-qt-libraries=%{_libdir} \ +%if %{with oracle} + %if %{with instantclient} + --with-instant-client \ + --with-oracle-includes=%{_includedir}/oracle/client \ + --with-oracle-libraries=%{_libdir} \ + %endif + --with-oracle +%else + --without-oracle +%endif %{__make} @@ -91,6 +111,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.47 2010/09/10 23:52:33 baggins +- 2.1.2 +- allow building with oracle-instantclient +- updated BR + Revision 1.46 2010/01/04 14:41:20 zawadaa - Suggests QtSql-pgsql - to use with Postgresql ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tora/tora.spec?r1=1.46&r2=1.47&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
