- updated to 1.1.5, updated destdir patch

- acfix patch with autoconf 2.52 compatibility fix
- xcdrdao has been updated to GTK-- 1.2.5 API, but to gcdmaster
  and is GNOME application now (moved to subpackage - probably NFY)
- gcdmaster-paths patch with hardcoded paths to move gcdmaster to /usr/X11R6

Changed files:
    cdrdao-acfix.patch -> 1.1
    cdrdao-gcdmaster-paths.patch -> 1.1
    cdrdao.spec -> 1.10

3 files changed, 110 insertions, 15 deletions

diff --git a/cdrdao-acfix.patch b/cdrdao-acfix.patch
new file mode 100644
index 0000000..73b11aa
--- /dev/null
+++ b/cdrdao-acfix.patch
@@ -0,0 +1,13 @@
+--- cdrdao-1.1.5/paranoia/configure.in.orig	Fri Nov  2 13:34:48 2001
++++ cdrdao-1.1.5/paranoia/configure.in	Fri Nov  2 13:36:37 2001
+@@ -2,9 +2,7 @@
+ 
+ AC_CANONICAL_HOST
+ 
+-if test -z "$CC"; then
+-	AC_PROG_CC	
+-fi
++AC_PROG_CC	
+ AC_PROG_RANLIB
+ AC_CHECK_PROG(AR,ar,ar)
+ 
diff --git a/cdrdao-gcdmaster-paths.patch b/cdrdao-gcdmaster-paths.patch
new file mode 100644
index 0000000..3b747a8
--- /dev/null
+++ b/cdrdao-gcdmaster-paths.patch
@@ -0,0 +1,42 @@
+--- cdrdao-1.1.5/xdao/Makefile.in.orig	Fri Nov  2 13:37:18 2001
++++ cdrdao-1.1.5/xdao/Makefile.in	Fri Nov  2 13:56:09 2001
+@@ -8,16 +8,16 @@
+ # 
+ # Source and Installation Paths
+ #
+-prefix  =      @prefix@
+-exec_prefix =  @exec_prefix@
++prefix  =      /usr/X11R6
++exec_prefix =  /usr/X11R6
+ srcdir =       @srcdir@
+-datadir  =     @datadir@
++datadir  =     /usr/X11R6/share
+ VPATH =        @srcdir@
+ #
+ # Installation directories for binaries and manual pages
+ #
+-bindir  =      @bindir@
+-mandir  =      @mandir@
++bindir  =      /usr/X11R6/bin
++mandir  =      /usr/X11R6/man
+ man1dir =      $(mandir)/man1
+ #
+ # install program
+@@ -71,7 +71,7 @@
+ 
+ install: all installdirs
+ 	$(INSTALL_PROGRAM) $(PRG) $(DESTDIR)$(bindir)
+-	$(INSTALL_DATA) xcdrdao.man $(DESTDIR)$(man1dir)/xcdrdao.1
++	$(INSTALL_DATA) xcdrdao.man $(DESTDIR)$(man1dir)/gcdmaster.1x
+ 	$(INSTALL_DATA) gcdmaster.png $(DESTDIR)$(PIXMAPS_DIR)/gcdmaster.png
+ 	$(INSTALL_DATA) pixmap_audiocd.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_audiocd.png
+ 	$(INSTALL_DATA) pixmap_copycd.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_copycd.png
+@@ -80,7 +80,7 @@
+ 	$(INSTALL_DATA) pixmap_help.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_help.png
+ 	$(INSTALL_DATA) pixmap_mixedcd.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_mixedcd.png
+ 	$(INSTALL_DATA) pixmap_open.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_open.png
+-	$(INSTALL_DATA) gcdmaster.desktop $(DESTDIR)$(datadir)/gnome/apps/Applications/gcdmaster.desktop
++	$(INSTALL_DATA) gcdmaster.desktop $(DESTDIR)$(datadir)/applnk/Applications/gcdmaster.desktop
+ 
+ installdirs:
+ 	$(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir)
diff --git a/cdrdao.spec b/cdrdao.spec
index 4ede5cf..6784d10 100644
--- a/cdrdao.spec
+++ b/cdrdao.spec
@@ -1,13 +1,12 @@
-# NOTE:		
-#	Currently this package does not contain X interface. This is due to
-#	the fact, that it doesn't compile with current version of gtkmm. I
-#	have asked author if he is going to update this program, but I've got
-#	no answer yet.
+#
+# Conditional build:
+# _without_gnome	- without GNOME frontend (gcdmaster)
+#
 Summary:	Tools for burning CDRs in Disk At Once mode
 Summary(pl):	Narzędzia do wypalania płyt w trybie Disk At Once
 Name:		cdrdao
-Version:	1.1.3
-Release:	2
+Version:	1.1.5
+Release:	1
 License:	GPL
 Group:		Applications/System
 Group(de):	Applikationen/System
@@ -15,16 +14,21 @@ Group(pl):	Aplikacje/System
 Source0:	ftp://ftp.sourceforge.net/pub/sourceforge/cdrdao/%{name}-%{version}.src.tar.gz
 Patch0:		%{name}-destdir.patch
 Patch1:		%{name}-opt.patch
+Patch2:		%{name}-acfix.patch
+Patch3:		%{name}-gcdmaster-paths.patch
 URL:		http://cdrdao.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	libstdc++-devel
 BuildRequires:	libsigc++-devel
 BuildRequires:	pccts-devel
-# Required by frontend.
-#BuildRequires:	gtk+-devel
-#BuildRequires:	gtkmm-devel
+%{!?_without_gnome:BuildRequires:	gtkmm-devel >= 1.2.5}
+%{!?_without_gnome:BuildRequires:	gnome-libs-devel >= 1.2.3}
+%{!?_without_gnome:BuildRequires:	gnomemm-devel >= 1.1.17}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_xprefix	/usr/X11R6
+%define		_xmandir	%{_xprefix}/man
+
 %description
 Cdrdao records audio and data CD-Rs in Disk At Once mode. This mode
 gives much better control over contents of CD.
@@ -33,18 +37,45 @@ gives much better control over contents of CD.
 Cdrdao zapisuje płytki audio i z danymi w trybie Disk At Once. W tym
 trybie masz znacznie większą kontrolę nad zawartością płytki.
 
+%package gcdmaster
+Summary:	GNOME frontend to cdrdao for composing audio CDs
+Summary(pl):	Frontend GNOME do cdrdao do składania płyt CD-Audio
+Group:		X11/Applications
+Group(de):	X11/Applikationen
+Group(pl):	X11/Aplikacje
+Requires:	%{name} = %{version}
+
+%description gcdmaster
+gcdmaster allows the creation of toc-files for cdrdao and can control
+the recording process. Its main application is the composition of
+audio CDs from one or more audio files. It supports PQ-channel
+editing, entry of meta data like ISRC codes/CD-TEXT and non
+destructive cut of the audio data.
+
+%description gcdmaster -l pl
+gcdmaster pozwala na tworzenie plików toc dla cdrdao oraz może
+kontrolować proces nagrywania. Głównym celem jest składanie płyt
+CD-Audio z jednego lub więcej plików z dźwiękiem. Obsługuje edycję
+kanału PQ, wpisy meta-danych takich jak kody ISRC/CD-TEXT oraz
+niedestruktywne cięcie danych audio.
+
 %prep
-%setup  -q
+%setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 (cd paranoia ; autoconf)
-%configure2_13 \
+autoconf
+# false gtkmm-config path can be used to disable building of GNOME frontend
+%configure \
 	--with-pcctsbin=%{_bindir} \
 	--with-pcctsinc=%{_includedir}/pccts \
-	--x-includes=%{_prefix}/X11R6/includes \
-	--with-gtkmm-exec-prefix=/usr
+	%{?_without_gnome:--with-gtkmm-exec-prefix=/}
+
+#	--x-includes=%{_prefix}/X11R6/includes \
 %{__make}
 
 %install
@@ -53,7 +84,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-gzip -9nf CREDITS README* Release*
+gzip -9nf CREDITS README README.PlexDAE Release*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -63,3 +94,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc *.gz
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/*/*
+
+%if %{?_without_gnome:0}%{!?_without_gnome:1}
+%files gcdmaster
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_xbindir}/*
+%{_xmandir}/man1/*
+%{_pixmapsdir}/*
+%{_applnkdir}/Applications/gcdmaster.desktop
+%endif