Author: qboosh Date: Thu Oct 20 10:16:27 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - removed outdated gcc34 patch - updated freetds_buildfix patch (no need to apply it conditionally) - reenabled freetds and firebird
---- Files affected: SPECS: libgda.spec (1.95 -> 1.96) ---- Diffs: ================================================================ Index: SPECS/libgda.spec diff -u SPECS/libgda.spec:1.95 SPECS/libgda.spec:1.96 --- SPECS/libgda.spec:1.95 Wed Oct 19 21:29:52 2005 +++ SPECS/libgda.spec Thu Oct 20 12:16:21 2005 @@ -7,8 +7,8 @@ %bcond_without doc # don't generate html documentation %bcond_without static_libs # don't build static libraries # -%bcond_with firebird # build without firebird plugin -%bcond_with freetds # build without freetds plugin +%bcond_without firebird # build without firebird plugin +%bcond_without freetds # build without freetds plugin %bcond_without ldap # build without ldap plugin %bcond_without mdb # build without MDB plugin %bcond_without mysql # build without MySQL plugin @@ -29,17 +29,16 @@ Group: Applications/Databases Source0: http://ftp.gnome.org/pub/gnome/sources/libgda/1.9/%{name}-%{version}.tar.bz2 # Source0-md5: c943610dc4c9c286bb14d6ce3c6e549b -Patch0: %{name}-gcc34.patch -Patch1: %{name}-freetds_buildfix.patch -Patch2: %{name}-mdb.patch -Patch3: %{name}-include.patch +Patch0: %{name}-freetds_buildfix.patch +Patch1: %{name}-mdb.patch +Patch2: %{name}-include.patch %{?with_firebird:BuildRequires: Firebird-devel} BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1:1.8 BuildRequires: bison BuildRequires: db-devel BuildRequires: flex -%{?with_freetds:BuildRequires: freetds-devel >= 0.62.1} +%{?with_freetds:BuildRequires: freetds-devel >= 0.63} BuildRequires: glib2-devel >= 2.2.0 BuildRequires: gnome-common >= 2.8.0 BuildRequires: gtk-doc >= 1.0 @@ -242,10 +241,8 @@ %prep %setup -q %patch0 -p1 -# needs update (?) -%{?with_freetds:%patch1 -p1} +%patch1 -p1 %patch2 -p1 -%patch3 -p1 %build CXXFLAGS="%{rpmcxxflags} -fno-rtti -fno-exceptions" @@ -390,6 +387,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.96 2005/10/20 10:16:21 qboosh +- removed outdated gcc34 patch +- updated freetds_buildfix patch (no need to apply it conditionally) +- reenabled freetds and firebird + Revision 1.95 2005/10/19 19:29:52 freetz - merged from DEVEL @@ -411,4 +413,4 @@ - do not apply freetds patch --without freetds (note added) Revision 1.91.2.1 2005/07/09 21:08:18 twittner -- up to 1.3.3 (NFY - -freetds_buildfix.patch) \ No newline at end of file +- up to 1.3.3 (NFY - -freetds_buildfix.patch) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/libgda.spec?r1=1.95&r2=1.96&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
