move BR: GConf2-devel to gnome bcond

[packages/cdrdao.git] / cdrdao.spec

diff --git a/cdrdao.spec b/cdrdao.spec
index 5e2211d2bf6e6749f5239f40eb564c7a0c4b5e20..5567060f9a002eaf8d750d243c8f5a3570eeb3a6 100644 (file)
--- a/cdrdao.spec
+++ b/cdrdao.spec
@@ -8,20 +8,20 @@ Summary:      Tools for burning CDRs in Disk At Once mode
 Summary(pl.UTF-8):     Narzędzia do wypalania płyt w trybie Disk At Once
 Summary(pt_BR.UTF-8):  Cdrdao - Escreve CD-Rs de áudio em modo "disk-at-once"
 Name:          cdrdao
-Version:       1.2.3
-Release:       3
+Version:       1.2.4
+Release:       1
 License:       GPL v2+
 Group:         Applications/System
-Source0:       http://dl.sourceforge.net/cdrdao/%{name}-%{version}.tar.bz2
-# Source0-md5: 8d15ba6280bb7ba2f4d6be31d28b3c0c
+Source0:       https://downloads.sourceforge.net/cdrdao/%{name}-%{version}.tar.bz2
+# Source0-md5: 2ada887d1b30b440867b8df0d3023cf7
 Source1:       %{name}.desktop
 # http://cdrdao.sourceforge.net/drives.html#dt
 Source2:       %{name}.drivers
 Patch0:                %{name}-nolibs.patch
 Patch1:                %{name}-pccts-antlr.patch
 Patch2:                %{name}-gcc4.patch
-Patch3:                %{name}-glibc.patch
 URL:           http://cdrdao.sourceforge.net/
+%{?with_gnome:BuildRequires:   GConf2-devel}
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: cdrtools-devel >= 3:2.01a25
@@ -84,14 +84,16 @@ niedestruktywne cięcie danych audio.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
-sed -i -e 's#/usr/src/linux/include##g' scsilib/DEFAULT*/Defaults.linux
-%if !%{with gnome}
-sed -i -e 's/^en_xdao=yes$/en_xdao=no/' configure.ac
+%{__sed} -i -e 's#/usr/src/linux/include##g' scsilib/DEFAULT*/Defaults.linux
+%if %{without gnome}
+%{__sed} -i \
+       -e 's/^en_gcdmaster=yes$/en_gcdmaster=no/' \
+       -e 's/^AM_GCONF_SOURCE_2$/#AM_GCONF_SOURCE_2/' \
+       configure.ac
 %endif
 
-install %{SOURCE1} xdao/gcdmaster.desktop
+install %{SOURCE1} gcdmaster/gcdmaster.desktop
 
 %build
 %{__aclocal}
@@ -104,7 +106,7 @@ PKG_CONFIG=%{_bindir}/pkg-config \
        --with-pcctsinc=%{_libdir}/pccts/h \
        --with-scglib-inc=%{_includedir}/schily \
        --with-scglib-lib=%{_libdir} \
-       --with%{!?with_gnome:out}-xdao \
+       --with%{!?with_gnome:out}-gcdmaster \
        --with%{!?with_mp3:out}-mp3-support \
        --with%{!?with_ogg:out}-ogg-support