- now xdao is default off

[packages/cdrdao.git] / cdrdao.spec

diff --git a/cdrdao.spec b/cdrdao.spec
index f1c9549b7d3ddaf429857e03f44533ad0f0de642..453297db4ca8a98a419f0e69341b256ac10cbaca 100644 (file)
--- a/cdrdao.spec
+++ b/cdrdao.spec
@@ -1,23 +1,24 @@
 #
 # Conditional build:
-%bcond_without gnome   # without gcdmaster
+%bcond_with    gnome   # without gcdmaster
 #
 Summary:       Tools for burning CDRs in Disk At Once mode
 Summary(pl):   Narzêdzia do wypalania p³yt w trybie Disk At Once
 Summary(pt_BR):        Cdrdao - Escreve CD-Rs de áudio em modo "disk-at-once"
 Name:          cdrdao
-Version:       1.1.8
+Version:       1.1.9
 Release:       1
 License:       GPL v2+
 Group:         Applications/System
 Source0:       http://dl.sourceforge.net/cdrdao/%{name}-%{version}.tar.gz
-# Source0-md5: 10cfd445fa628fb32dacf02e555fdbba
+# Source0-md5: dd7df809fca7db8e212a6522688c166b
 Source1:       %{name}.desktop
 # http://cdrdao.sourceforge.net/drives.html#dt
 Source2:       %{name}.drivers
 Patch0:                %{name}-nolibs.patch
 Patch1:                %{name}-pccts-antlr.patch
-Patch2:                %{name}-gcc34.patch
+Patch2:                %{name}-DESTDIR.patch
+Patch3:                %{name}-mm.patch
 URL:           http://cdrdao.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -71,6 +72,7 @@ niedestruktywne ci
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p0
 
 sed -i -e 's#/usr/src/linux/include##g' scsilib/DEFAULT*/Defaults.linux
 %if %{without gnome}
@@ -86,6 +88,11 @@ sed -i -e 's/^en_xdao=yes$/en_xdao=no/' configure.in
        --with-pcctsbin=%{_bindir} \
        --with-pcctsinc=/usr/lib/pccts/h \
        --with-scglib-inc=/usr/include/schily \
+       %if %{with gnome}
+       --with-xdao \ 
+       %else
+       --without-xdao \
+       %endif
        --with-scglib-lib=/usr/lib 
 
 %{__make}