[libgda] Build without scrollkeeper support

Kalev Lember kalev at fedoraproject.org
Mon Oct 22 21:24:15 UTC 2012


commit d58c56ee045702bc19abe6193efbbc1a15e90a12
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Mon Oct 22 23:14:15 2012 +0200

    Build without scrollkeeper support
    
    ... like the rest of the GNOME packages are built nowadays.

 libgda.spec |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/libgda.spec b/libgda.spec
index c4cc909..4c44c64 100644
--- a/libgda.spec
+++ b/libgda.spec
@@ -29,7 +29,7 @@ BuildRequires:    sqlite-devel >= 3.6.11
 BuildRequires:    libgcrypt-devel
 BuildRequires:    gobject-introspection-devel >= 0.6.5
 BuildRequires:    libxml2-devel readline-devel json-glib-devel
-BuildRequires:    gtk-doc scrollkeeper intltool gettext flex bison perl(XML::Parser)
+BuildRequires:    gtk-doc intltool gettext flex bison perl(XML::Parser)
 BuildRequires:    libsoup-devel
 BuildRequires:    gnome-doc-utils
 BuildRequires:    openssl-devel
@@ -185,6 +185,7 @@ export LD_LIBRARY_PATH=/usr/lib/jvm/java/jre/lib/%{archinstall}/server:$LD_LIBRA
 # vala support has not been tested yet so it is not enabled yet
 # G-I-R is disabled since it's broken
 %configure --disable-static --enable-vala=no \
+           --disable-scrollkeeper \
            --with-libsoup  --with-gnome-keyring \
            --with-ui --with-gtksourceview \
            --with-goocanvas --with-graphviz \
@@ -206,18 +207,9 @@ rm %{buildroot}/%{_sysconfdir}/%{name}-%{apiver}/sales_test.db
 
 %post -p /sbin/ldconfig
 %post ui -p /sbin/ldconfig
-%post devel
-if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
-%post ui-devel
-if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
-
 
 %postun -p /sbin/ldconfig
 %postun ui -p /sbin/ldconfig
-%postun devel
-if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
-%postun ui-devel
-if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
 
 
 %files -f libgda-5.0.lang
@@ -329,6 +321,7 @@ if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
 %changelog
 * Mon Oct 22 2012 Kalev Lember <kalevlember at gmail.com> - 1:5.1.1-2
 - Add back the epoch
+- Build without scrollkeeper support
 
 * Sun Oct 21 2012 Haïkel Guémar <hguemar at fedoraproject.org> - 5.1.1-1
 - upstream 5.1.1 based on libgda5 review (RHBZ #788569)


More information about the scm-commits mailing list