- merged ac/am/lt rebuild and beagle bcond (but on by default) from AC-branch

- BR: ac,am,lt

Changed files:
    brasero.spec -> 1.4

diff --git a/brasero.spec b/brasero.spec
index 66cfae77765470ce184ce443bbfa03ed6930ffeb..7bdcc8f5f8fce2a8cd4b02ad96cd764a6c285868 100644 (file)
--- a/brasero.spec
+++ b/brasero.spec
@@ -1,15 +1,21 @@
+#
+# Conditinal build:
+%bcond_without beagle          # disable beagle search
+#
 Summary:       Disc burning application for GNOME
 Summary(pl):   Program do wypalania dysków dla GNOME
 Name:          bonfire
 Version:       0.3.1
-Release:       1
+Release:       3
 License:       GPL v2
 Group:         X11/Applications
 Source0:       http://perso.wanadoo.fr/bonfire/%{name}-%{version}.tar.bz2
 # Source0-md5: db94c7ae5ac5c27cf7d66fafc3654f4f
 Patch0:                %{name}-desktop.patch
 URL:           http://perso.wanadoo.fr/bonfire/
-BuildRequires: beagle-devel >= 0.1.0
+BuildRequires: autoconf
+BuildRequires: automake
+%{?with_beagle:BuildRequires:  beagle-devel >= 0.1.0}
 BuildRequires: dbus-glib-devel >= 0.30
 BuildRequires: gdl-devel >= 0.6.0
 BuildRequires: gnome-vfs2-devel >= 2.12.0
@@ -20,6 +26,7 @@ BuildRequires:        hal-devel >= 0.5
 BuildRequires: intltool >= 0.25
 BuildRequires: libgnomeui-devel >= 2.10.0
 BuildRequires: libnotify-devel >= 0.3.0
+BuildRequires: libtool
 BuildRequires: libxml2-devel >= 2.6.0
 BuildRequires: nautilus-cd-burner-devel >= 2.12.0
 BuildRequires: pkgconfig
@@ -41,7 +48,13 @@ GNOME. Jest zaprojektowany by by
 %patch0 -p1
 
 %build
-%configure
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+       %{!?with_beagle:--disable-search}
 %{__make}
 
 %install