[packages/cdrdao] move BR: GConf2-devel to gnome bcond

atler atler at pld-linux.org
Thu Jul 22 19:13:08 CEST 2021


commit 50bd1ec0689061aa1fa710e84ead3dcecab1dae3
Author: Jan Palus <atler at pld-linux.org>
Date:   Thu Jul 22 19:04:45 2021 +0200

    move BR: GConf2-devel to gnome bcond

 cdrdao.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/cdrdao.spec b/cdrdao.spec
index 852d84c..5567060 100644
--- a/cdrdao.spec
+++ b/cdrdao.spec
@@ -21,7 +21,7 @@ Patch0:		%{name}-nolibs.patch
 Patch1:		%{name}-pccts-antlr.patch
 Patch2:		%{name}-gcc4.patch
 URL:		http://cdrdao.sourceforge.net/
-BuildRequires:	GConf2-devel
+%{?with_gnome:BuildRequires:	GConf2-devel}
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	cdrtools-devel >= 3:2.01a25
@@ -86,8 +86,11 @@ niedestruktywne cięcie danych audio.
 %patch2 -p1
 
 %{__sed} -i -e 's#/usr/src/linux/include##g' scsilib/DEFAULT*/Defaults.linux
-%if !%{with gnome}
-%{__sed} -i -e 's/^en_gcdmaster=yes$/en_gcdmaster=no/' configure.ac
+%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} gcdmaster/gcdmaster.desktop
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cdrdao.git/commitdiff/50bd1ec0689061aa1fa710e84ead3dcecab1dae3



More information about the pld-cvs-commit mailing list