[libgda/epel7] There's no goocanvas or mdbtools on el7

Lubomir Rintel lkundrak at fedoraproject.org
Wed Dec 31 09:53:19 UTC 2014


commit 70c49d2e6f8507689848a7f55ab7fdf5a2a0f9fa
Author: Lubomir Rintel <lkundrak at v3.sk>
Date:   Wed Dec 31 10:53:17 2014 +0100

    There's no goocanvas or mdbtools on el7

 libgda.spec |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)
---
diff --git a/libgda.spec b/libgda.spec
index 11bf210..3982a3b 100644
--- a/libgda.spec
+++ b/libgda.spec
@@ -2,7 +2,11 @@
 %bcond_without ldap
 %bcond_without mysql
 %bcond_without postgres
+%if 0%{?rhel}
+%bcond_with mdb
+%else
 %bcond_without mdb
+%endif
 %bcond_without java
 
 %global apiver  5.0
@@ -11,7 +15,7 @@
 Name:           libgda
 Epoch:          1
 Version:        5.1.2
-Release:        2%{?dist}
+Release:        2%{?dist}.1
 Summary:        Library for writing gnome database programs
 
 License:        LGPLv2+
@@ -25,7 +29,9 @@ BuildRequires:    pkgconfig >= 0.8
 BuildRequires:    glib2-devel >= 2.28.0
 BuildRequires:    gtk3-devel >= 3.0.0
 BuildRequires:    gtksourceview3-devel
+%if 0%{?rhel} == 0
 BuildRequires:    goocanvas2-devel
+%endif
 BuildRequires:    graphviz-devel >= 2.26.0
 BuildRequires:    iso-codes >= 3.15
 BuildRequires:    libxslt-devel >= 1.0.9
@@ -42,7 +48,9 @@ BuildRequires:    libgnome-keyring-devel
 %{!?_without_ldap:BuildRequires:    openldap-devel}
 %{!?_without_mysql:BuildRequires:    mysql-devel}
 %{!?_without_postgres:BuildRequires:    postgresql-devel}
-%{!?_without_mdb:BuildRequires:    mdbtools-devel}
+%if %with mdb
+BuildRequires:    mdbtools-devel
+%endif
 %{!?_without_java:BuildRequires:    java-devel >= 1:1.6.0}
 
 %description
@@ -156,7 +164,7 @@ Requires:       %{name}%{?isa} = %{epoch}:%{version}-%{release}
 This %{name}-postgres includes the %{name} PostgreSQL provider.
 %endif
 
-%if 0%{with_mdb}
+%if %with mdb
 %package mdb
 Summary:        Mdb provider for %{name}
 Group:          System Environment/Libraries
@@ -230,7 +238,7 @@ export LD_LIBRARY_PATH=/usr/lib/jvm/java/jre/lib/%{archinstall}/server:$LD_LIBRA
            --disable-scrollkeeper \
            --with-libsoup  --with-gnome-keyring \
            --with-ui --with-gtksourceview \
-           --with-goocanvas --with-graphviz \
+           --with-graphviz \
            --enable-gda-gi \
            --enable-gdaui-gi \
            --enable-system-sqlite=yes \
@@ -374,7 +382,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/%{name}-%{apiver}/postgres_specs*.xml
 %endif
 
-%if 0%{with_mdb}
+%if %with mdb
 %files mdb
 %{_libdir}/libgda-%{apiver}/providers/libgda-mdb.so
 %{_datadir}/%{name}-%{apiver}/mdb_specs*.xml
@@ -388,6 +396,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
 %changelog
+* Wed Dec 31 2014 Lubomir Rintel <lkundrak at v3.sk> - 1:5.1.2-2.1
+- There's no goocanvas or mdbtools on el7
+
 * Tue Mar 26 2013 Kalev Lember <kalevlember at gmail.com> - 1:5.1.2-2
 - Rebuilt for gtksourceview3 soname bump
 


More information about the scm-commits mailing list