From 9fc7eea440795b902dd0eca56d050d219a6009a1 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 06:53:16 +0000 Subject: [PATCH 01/33] Initialize branch F-11 for xcdroast --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From cc9bf2c062f1d291724538b41ed974970e866e69 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 07:39:24 +0000 Subject: [PATCH 02/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index bf69c4f..18d93e5 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.2.%{?alphatag}%{?dist} +Release: 0.3.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ Group: Applications/Multimedia @@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/* %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 1:0.98-0.3.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Feb 26 2009 Fedora Release Engineering - 1:0.98-0.2.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 59d11b1bb34e9fbfbe9276fa4cc96b3101db7737 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:40:54 +0000 Subject: [PATCH 03/33] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e5054d0..0d59a9d 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xcdroast -# $Id: Makefile,v 1.1 2004/09/09 14:31:46 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 19:31:27 notting Exp $ NAME := xcdroast SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From a41e7275d0f7e9020c6342ff00e4ee6e725a81a9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:29:40 +0000 Subject: [PATCH 04/33] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e5054d0..0d59a9d 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xcdroast -# $Id: Makefile,v 1.1 2004/09/09 14:31:46 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 19:31:27 notting Exp $ NAME := xcdroast SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From aec7aa7cea0a4877ba1badd104b22ee7eaf6d6db Mon Sep 17 00:00:00 2001 From: Roman Rakus Date: Fri, 19 Mar 2010 16:04:33 +0000 Subject: [PATCH 05/33] Fixes for Merge review #226550 --- xcdroast.desktop | 2 +- xcdroast.spec | 111 +++++++++++++++++++++-------------------------- 2 files changed, 51 insertions(+), 62 deletions(-) diff --git a/xcdroast.desktop b/xcdroast.desktop index d6d396d..4868c11 100644 --- a/xcdroast.desktop +++ b/xcdroast.desktop @@ -4,4 +4,4 @@ Name=CD Writer Type=Application Exec=/usr/bin/xcdroast Comment=CD creation tool -Icon=/usr/lib/xcdroast-0.98/icons/xcdricon.png +Icon=/usr/lib/xcdroast/icons/xcdricon.png diff --git a/xcdroast.spec b/xcdroast.spec index 18d93e5..e7b7e38 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -1,41 +1,27 @@ -%define alphatag alpha16 +%global alphatag alpha16 Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.3.%{?alphatag}%{?dist} +Release: 0.4.%{?alphatag}%{?dist} Epoch: 1 -License: LGPLv2+ +License: LGPLv2+ and GPLv2+ Group: Applications/Multimedia -Source: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}%{alphatag}.tar.gz +URL: http://www.xcdroast.org/ +Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}%{alphatag}.tar.gz Source1: xcdroast.desktop Patch1: xcdroast-0.98alpha15-linebuffer.patch Patch2: xcdroast-0.98alpha15-nowarn.patch Patch3: xcdroast-0.98alpha15-scan.patch +Patch4: xcdroast-0.98alpha15-13_cdrecord_to_wodim.patch +Patch5: xcdroast-0.98alpha15-14_atapi_to_oldatapi.patch +Patch6: xcdroast-0.98alpha15-15_no_readcd_version.patch +Patch7: xcdroast-0.98alpha15-prodvd.patch +Patch8: xcdroast-0.98alpha15-nogtk1.patch -#Patch11: xcdroast-0.98alpha15-01_upstream_configure.patch -#Patch12: xcdroast-0.98alpha15-02_upstream_gtk2locale.patch -#Patch13: xcdroast-0.98alpha15-03_upstream_64bit_gsize.patch -#Patch14: xcdroast-0.98alpha15-04_upstream_read_eagain.patch -#Patch15: xcdroast-0.98alpha15-05_upstream_wav.patch -#Patch16: xcdroast-0.98alpha15-06_man.patch -#Patch17: xcdroast-0.98alpha15-07_case_cmp.patch -#Patch18: xcdroast-0.98alpha15-08_desktop.patch -#Patch19: xcdroast-0.98alpha15-09_share_dir.patch -#Patch20: xcdroast-0.98alpha15-10_cddbtool.patch -#Patch21: xcdroast-0.98alpha15-11_mkisofs_options.patch -#Patch22: xcdroast-0.98alpha15-12_cdrecord_versions.patch -Patch23: xcdroast-0.98alpha15-13_cdrecord_to_wodim.patch -Patch24: xcdroast-0.98alpha15-14_atapi_to_oldatapi.patch -Patch25: xcdroast-0.98alpha15-15_no_readcd_version.patch - -Patch30: xcdroast-0.98alpha15-prodvd.patch -#Patch31: xcdroast-0.98alpha15-frozen_gui.patch -Patch32: xcdroast-0.98alpha15-nogtk1.patch - -Url: http://www.xcdroast.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: cdrecord >= 2.0, mkisofs >= 2.0 +Requires: cdrecord >= 2.0 +Requires: mkisofs >= 2.0 Requires(hint): cdda2wav >= 2.0 BuildRequires: gtk2-devel >= 2.0.6 BuildRequires: desktop-file-utils >= 0.2.92 @@ -47,50 +33,51 @@ automatic SCSI and IDE hardware setup, support for mastering of new ISO9660 data CDs, support for production of new audio CDs, fast copying of CDs without hard disk buffering, and a logfile option. +%package doc +Summary: Manual for xcdroast +Group: Documentation + +%description doc +This package contains the manual for xcdroast + %prep %setup -q -n %{name}-%{version}%{alphatag} %patch1 -p1 -b .linebuffer %patch2 -p1 -b .nowarn %patch3 -p1 -b .scan +%patch4 -p1 -b .p23 +%patch5 -p0 -b .p24 +%patch6 -p1 -b .p25 +%patch7 -p1 -b .cdrkit +%patch8 -p1 -b .nogtk1 -#%patch11 -p1 -b .p11 -#%patch12 -p1 -b .p12 -#%patch13 -p1 -b .p13 -#%patch14 -p1 -b .p14 -#%patch15 -p1 -b .p15 -#%patch16 -p1 -b .p16 -#%patch17 -p1 -b .p17 -#%patch18 -p1 -b .p18 -#%patch19 -p1 -b .p19 -#%patch20 -p1 -b .p20 -#%patch21 -p0 -b .p21 -#%patch22 -p1 -b .p22 -%patch23 -p1 -b .p23 -%patch24 -p0 -b .p24 -%patch25 -p1 -b .p25 - -%patch30 -p1 -b .cdrkit -#%patch31 -p1 -b .frozen -%patch32 -p1 -b .nogtk1 - +# Fix char sets +for file in doc/TRANSLATION.HOWTO ChangeLog; do + iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \ + touch -r $file $file.new && \ + mv $file.new $file +done %build -export CFLAGS="$RPM_OPT_FLAGS -g" -%configure --enable-gtk2 --disable-nonrootmode +%configure --enable-gtk2 --disable-nonrootmode \ + --with-xcdroast-libdir-prefix=%{_libdir}/%{name} make %{?_smp_mflags} +# Change desktop file to the current libdir +sed 's|/usr/lib|%{_libdir}|' %{SOURCE1} > %{name}.desktop + + %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/{etc/{X11/applnk/Multimedia,pam.d,security/console.apps},usr/sbin} -#make install PREFIX=/usr DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor xcdroast \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Red-Hat-Base \ --add-category System \ - %{SOURCE1} + --add-category DiscBurning \ + %{name}.desktop %find_lang %name @@ -99,17 +86,19 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) -%doc ChangeLog doc/DOCUMENTATION doc/FAQ doc/README* doc/TRANSLATION.HOWTO -%dir /usr/lib/%{name}-%{version} -%dir /usr/lib/%{name}-%{version}/bin -%dir /usr/lib/%{name}-%{version}/icons -%dir /usr/lib/%{name}-%{version}/sound -%{_mandir}/man?/%{name}* -/usr/bin/* -/usr/lib/%{name}-%{version}/*/* -%{_datadir}/applications/* - +%doc AUTHORS COPYING ChangeLog README doc/DOCUMENTATION doc/FAQ doc/README* doc/TRANSLATION.HOWTO +%{_mandir}/man1/xcdroast.1.* +%{_bindir}/xcdroast +%{_libdir}/xcdroast/ +%{_datadir}/applications/%{name}.desktop + +%files doc +%doc doc/manual/* + %changelog +* Fri Mar 19 2010 Roman Rakus - 1:0.98-0.4.alpha16 +- Fixes for Merge review #226550 + * Mon Jul 27 2009 Fedora Release Engineering - 1:0.98-0.3.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From dc487e98e6f504615f683d73a5caa0c06d4aab21 Mon Sep 17 00:00:00 2001 From: Roman Rakus Date: Mon, 22 Mar 2010 10:56:54 +0000 Subject: [PATCH 06/33] Corrected license --- xcdroast.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index e7b7e38..0183c56 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -4,7 +4,7 @@ Name: xcdroast Version: 0.98 Release: 0.4.%{?alphatag}%{?dist} Epoch: 1 -License: LGPLv2+ and GPLv2+ +License: LGPLv2+ and GPLv2 Group: Applications/Multimedia URL: http://www.xcdroast.org/ Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}%{alphatag}.tar.gz From af9dcc4f3e9e38347a150e1de50afbadfecc7f01 Mon Sep 17 00:00:00 2001 From: Roman Rakus Date: Tue, 23 Mar 2010 09:16:15 +0000 Subject: [PATCH 07/33] Corrected Source0 URL --- xcdroast.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xcdroast.spec b/xcdroast.spec index 0183c56..7c66d72 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,12 +2,12 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.4.%{?alphatag}%{?dist} +Release: 0.5.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia URL: http://www.xcdroast.org/ -Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}%{alphatag}.tar.gz +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{alphatag}.tar.gz Source1: xcdroast.desktop Patch1: xcdroast-0.98alpha15-linebuffer.patch Patch2: xcdroast-0.98alpha15-nowarn.patch @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Tue Mar 23 2010 Roman Rakus - 1:0.98-0.5.alpha16 +- Corrected Source0 URL + * Fri Mar 19 2010 Roman Rakus - 1:0.98-0.4.alpha16 - Fixes for Merge review #226550 From 4945e98fc67994e76392b515ad854b4904ca1e5a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:34:39 +0000 Subject: [PATCH 08/33] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 0d59a9d..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xcdroast -# $Id: Makefile,v 1.2 2007/10/15 19:31:27 notting Exp $ -NAME := xcdroast -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 10a64177bf78f6ab52f7e12b205c6510ee930e43 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:34:43 +0000 Subject: [PATCH 09/33] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 0d59a9d..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xcdroast -# $Id: Makefile,v 1.2 2007/10/15 19:31:27 notting Exp $ -NAME := xcdroast -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11 From 3d3a9b1d896273974f52eaa3a32c016fa82e9f7c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 21:44:36 -0600 Subject: [PATCH 10/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index 7c66d72..0194ca9 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.5.%{?alphatag}%{?dist} +Release: 0.6.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Mon Feb 07 2011 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Tue Mar 23 2010 Roman Rakus - 1:0.98-0.5.alpha16 - Corrected Source0 URL From 982a8cb66e81999e112a967b080098f1babfd5f7 Mon Sep 17 00:00:00 2001 From: Roman Rakus Date: Fri, 24 Jun 2011 15:37:34 +0200 Subject: [PATCH 11/33] Fix build fail (#716081) Signed-off-by: Roman Rakus --- xcdroast.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xcdroast.spec b/xcdroast.spec index 0194ca9..3904eb2 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.6.%{?alphatag}%{?dist} +Release: 0.7.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -22,7 +22,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: cdrecord >= 2.0 Requires: mkisofs >= 2.0 -Requires(hint): cdda2wav >= 2.0 +Requires: cdda2wav >= 2.0 BuildRequires: gtk2-devel >= 2.0.6 BuildRequires: desktop-file-utils >= 0.2.92 @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Fri Jun 24 2011 Roman Rakus - 1:0.98-0.7.alpha16 +- Fix build fail (#716081) + * Mon Feb 07 2011 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 7e937ea6d5463f536876776b0b39c62f0a3727b6 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 6 Dec 2011 01:32:24 -0500 Subject: [PATCH 12/33] Rebuild for new libpng --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index 3904eb2..ed8d633 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.7.%{?alphatag}%{?dist} +Release: 0.8.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Tue Dec 06 2011 Adam Jackson - 1:0.98-0.8.alpha16 +- Rebuild for new libpng + * Fri Jun 24 2011 Roman Rakus - 1:0.98-0.7.alpha16 - Fix build fail (#716081) From 32884a866cd332d74185a068131d926b6130a01f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 02:39:40 -0600 Subject: [PATCH 13/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index ed8d633..b95d68d 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.8.%{?alphatag}%{?dist} +Release: 0.9.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 1:0.98-0.9.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Dec 06 2011 Adam Jackson - 1:0.98-0.8.alpha16 - Rebuild for new libpng From 84909bb4c2ba36bfcf6336838e6ba64083245933 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 23:37:07 -0500 Subject: [PATCH 14/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index b95d68d..2014d60 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.9.%{?alphatag}%{?dist} +Release: 0.10.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 1:0.98-0.10.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 14 2012 Fedora Release Engineering - 1:0.98-0.9.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 35c6c508fba5be6400d3f67b07af0ea52f49590e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 21:29:21 -0600 Subject: [PATCH 15/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index 2014d60..a2e6809 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.10.%{?alphatag}%{?dist} +Release: 0.11.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 1:0.98-0.11.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Jul 22 2012 Fedora Release Engineering - 1:0.98-0.10.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 5e21faea840afcba8b40b42bd82906be85ae92cc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 02:41:17 -0500 Subject: [PATCH 16/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index a2e6809..68c234a 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.11.%{?alphatag}%{?dist} +Release: 0.12.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1:0.98-0.12.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Feb 15 2013 Fedora Release Engineering - 1:0.98-0.11.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 392a6b98b922c1859319150128cd097ef62fc71b Mon Sep 17 00:00:00 2001 From: Tomas Smetana Date: Fri, 21 Feb 2014 13:07:12 +0100 Subject: [PATCH 17/33] fix #926752: aarch64 support - fix #1037391: fails to build with "-Werror=format-security" --- xcdroast-0.98alpha16-wformat.patch | 12 ++++++++++++ xcdroast.spec | 10 +++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 xcdroast-0.98alpha16-wformat.patch diff --git a/xcdroast-0.98alpha16-wformat.patch b/xcdroast-0.98alpha16-wformat.patch new file mode 100644 index 0000000..e0b2e1e --- /dev/null +++ b/xcdroast-0.98alpha16-wformat.patch @@ -0,0 +1,12 @@ +diff -up xcdroast-0.98alpha16/src/setup.c.wformat xcdroast-0.98alpha16/src/setup.c +--- xcdroast-0.98alpha16/src/setup.c.wformat 2014-02-21 13:04:20.813356229 +0100 ++++ xcdroast-0.98alpha16/src/setup.c 2014-02-21 13:04:33.893300539 +0100 +@@ -4477,7 +4477,7 @@ gchar tmp[MAXLINE]; + if (!textonly) { + show_dialog(ICO_ERROR,tmp, T_OK, NULL, NULL, 0); + } else { +- g_warning(tmp); ++ g_warning("%s", tmp); + } + } + } diff --git a/xcdroast.spec b/xcdroast.spec index 68c234a..b0d3c98 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.12.%{?alphatag}%{?dist} +Release: 0.13.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -17,6 +17,7 @@ Patch5: xcdroast-0.98alpha15-14_atapi_to_oldatapi.patch Patch6: xcdroast-0.98alpha15-15_no_readcd_version.patch Patch7: xcdroast-0.98alpha15-prodvd.patch Patch8: xcdroast-0.98alpha15-nogtk1.patch +Patch9: xcdroast-0.98alpha16-wformat.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -50,6 +51,7 @@ This package contains the manual for xcdroast %patch6 -p1 -b .p25 %patch7 -p1 -b .cdrkit %patch8 -p1 -b .nogtk1 +%patch9 -p1 -b .wformat # Fix char sets for file in doc/TRANSLATION.HOWTO ChangeLog; do @@ -59,6 +61,8 @@ for file in doc/TRANSLATION.HOWTO ChangeLog; do done %build +export CFLAGS="$RPM_OPT_FLAGS -Werror=format-security" +autoreconf -ivf %configure --enable-gtk2 --disable-nonrootmode \ --with-xcdroast-libdir-prefix=%{_libdir}/%{name} make %{?_smp_mflags} @@ -96,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Fri Feb 21 2014 Tomas Smetana - 1:0.98-0.13.alpha16 +- fix #926752: aarch64 support +- fix #1037391: fails to build with "-Werror=format-security" + * Sun Aug 04 2013 Fedora Release Engineering - 1:0.98-0.12.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From a4775913991ffae882812bef67b0b3c3269f2ccf Mon Sep 17 00:00:00 2001 From: Tomas Smetana Date: Fri, 21 Feb 2014 13:41:58 +0100 Subject: [PATCH 18/33] Require autoconf and automake for build --- xcdroast.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index b0d3c98..d0ed6f9 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.13.%{?alphatag}%{?dist} +Release: 0.14.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -26,6 +26,7 @@ Requires: mkisofs >= 2.0 Requires: cdda2wav >= 2.0 BuildRequires: gtk2-devel >= 2.0.6 BuildRequires: desktop-file-utils >= 0.2.92 +BuildRequires: autoconf automake %description X-CD-Roast provides a GUI interface for commands like cdrecord and @@ -100,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Fri Feb 21 2014 Tomas Smetana - 1:0.98-0.14.alpha16 +- Require autoconf and automake for build + * Fri Feb 21 2014 Tomas Smetana - 1:0.98-0.13.alpha16 - fix #926752: aarch64 support - fix #1037391: fails to build with "-Werror=format-security" From 21c27ea38bd8afafc64292877c0537e2cdb3f231 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 00:20:00 -0500 Subject: [PATCH 19/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index d0ed6f9..6455822 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.14.%{?alphatag}%{?dist} +Release: 0.15.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 1:0.98-0.15.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri Feb 21 2014 Tomas Smetana - 1:0.98-0.14.alpha16 - Require autoconf and automake for build From aa13c4e3c4963436c3960648d44c4fb28afa2fb7 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 09:23:11 +0000 Subject: [PATCH 20/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index 6455822..38586b5 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.15.%{?alphatag}%{?dist} +Release: 0.16.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 1:0.98-0.16.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 1:0.98-0.15.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 0f74716c54594827a838e75c45db7f548ba239e7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 03:47:18 +0000 Subject: [PATCH 21/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index 38586b5..d40c6f6 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.16.%{?alphatag}%{?dist} +Release: 0.17.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 1:0.98-0.17.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Aug 18 2014 Fedora Release Engineering - 1:0.98-0.16.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 06ee1905e4f1733e755ff49f07d158a0aa99f431 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:19:02 +0000 Subject: [PATCH 22/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index d40c6f6..0b4e79a 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.17.%{?alphatag}%{?dist} +Release: 0.18.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 1:0.98-0.18.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 1:0.98-0.17.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 3682996dc714427519ba9caa3db790e9020ada56 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:41:40 +0000 Subject: [PATCH 23/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index 0b4e79a..ed9d06e 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.18.%{?alphatag}%{?dist} +Release: 0.19.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1:0.98-0.19.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Feb 05 2016 Fedora Release Engineering - 1:0.98-0.18.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From a63f70005ae8b7c128fb9231bf722d4a1bbb04d8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:55:54 +0000 Subject: [PATCH 24/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index ed9d06e..b0f5deb 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.19.%{?alphatag}%{?dist} +Release: 0.20.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1:0.98-0.20.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 1:0.98-0.19.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 8e2c79013a1c8372d5bd4a5c7221c70818b923f8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:30:46 +0000 Subject: [PATCH 25/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index b0f5deb..7d29b45 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.20.%{?alphatag}%{?dist} +Release: 0.21.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1:0.98-0.21.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1:0.98-0.20.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 4f781b7171b1a2c1043f756cddce58670cac775a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 21:24:03 +0000 Subject: [PATCH 26/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index 7d29b45..22ffd79 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.21.%{?alphatag}%{?dist} +Release: 0.22.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1:0.98-0.22.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 1:0.98-0.21.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 15f57604f683fede37911d1ac373f80bb0fcbd5e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 00:50:21 +0100 Subject: [PATCH 27/33] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- xcdroast.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index 22ffd79..e99c27c 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -19,7 +19,6 @@ Patch7: xcdroast-0.98alpha15-prodvd.patch Patch8: xcdroast-0.98alpha15-nogtk1.patch Patch9: xcdroast-0.98alpha16-wformat.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: cdrecord >= 2.0 Requires: mkisofs >= 2.0 From 5f97d4b856bab90ae02856c6c71dc7ca9dfbeb1c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 09:00:18 +0100 Subject: [PATCH 28/33] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- xcdroast.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/xcdroast.spec b/xcdroast.spec index e99c27c..c36c567 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -85,9 +85,6 @@ desktop-file-install --vendor xcdroast \ %find_lang %name -%clean -rm -rf $RPM_BUILD_ROOT - %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README doc/DOCUMENTATION doc/FAQ doc/README* doc/TRANSLATION.HOWTO From a08a7d006652152c4b97f90f017661864e970af5 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 9 Jul 2018 17:07:39 +0100 Subject: [PATCH 29/33] Cleanup spec, update requires, use %%licensee --- xcdroast.spec | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/xcdroast.spec b/xcdroast.spec index c36c567..21b994d 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,11 +2,11 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.22.%{?alphatag}%{?dist} +Release: 0.23.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 -Group: Applications/Multimedia URL: http://www.xcdroast.org/ + Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{alphatag}.tar.gz Source1: xcdroast.desktop Patch1: xcdroast-0.98alpha15-linebuffer.patch @@ -20,9 +20,9 @@ Patch8: xcdroast-0.98alpha15-nogtk1.patch Patch9: xcdroast-0.98alpha16-wformat.patch -Requires: cdrecord >= 2.0 -Requires: mkisofs >= 2.0 -Requires: cdda2wav >= 2.0 +Requires: wodim +Requires: genisoimage +Requires: icedax BuildRequires: gtk2-devel >= 2.0.6 BuildRequires: desktop-file-utils >= 0.2.92 BuildRequires: autoconf automake @@ -36,7 +36,6 @@ copying of CDs without hard disk buffering, and a logfile option. %package doc Summary: Manual for xcdroast -Group: Documentation %description doc This package contains the manual for xcdroast @@ -72,7 +71,6 @@ sed 's|/usr/lib|%{_libdir}|' %{SOURCE1} > %{name}.desktop %install -rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/{etc/{X11/applnk/Multimedia,pam.d,security/console.apps},usr/sbin} make install DESTDIR=$RPM_BUILD_ROOT @@ -86,8 +84,8 @@ desktop-file-install --vendor xcdroast \ %find_lang %name %files -f %{name}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog README doc/DOCUMENTATION doc/FAQ doc/README* doc/TRANSLATION.HOWTO +%license COPYING +%doc AUTHORS ChangeLog README doc/DOCUMENTATION doc/FAQ doc/README* doc/TRANSLATION.HOWTO %{_mandir}/man1/xcdroast.1.* %{_bindir}/xcdroast %{_libdir}/xcdroast/ @@ -97,6 +95,9 @@ desktop-file-install --vendor xcdroast \ %doc doc/manual/* %changelog +* Mon Jul 9 2018 Peter Robinson 1:0.98-0.23.alpha16 +- Cleanup spec, update requires, use %%licensee + * Fri Feb 09 2018 Fedora Release Engineering - 1:0.98-0.22.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From a865f3a68346b1549bc2edd765eaff014810f11b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:08:44 +0000 Subject: [PATCH 30/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index 21b994d..b9e0851 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.23.%{?alphatag}%{?dist} +Release: 0.24.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 URL: http://www.xcdroast.org/ @@ -95,6 +95,9 @@ desktop-file-install --vendor xcdroast \ %doc doc/manual/* %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1:0.98-0.24.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Jul 9 2018 Peter Robinson 1:0.98-0.23.alpha16 - Cleanup spec, update requires, use %%licensee From 0095bdc0320af4ffafd0ddd242e5274a6701c425 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 24 Jul 2018 16:31:56 +0200 Subject: [PATCH 31/33] Add missing BuildRequires on gcc configure: error: no acceptable C compiler found in $PATH References: https://bugzilla.redhat.com/show_bug.cgi?id=1606726 Signed-off-by: Igor Gnatenko --- xcdroast.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xcdroast.spec b/xcdroast.spec index b9e0851..f2b13cb 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -23,6 +23,7 @@ Patch9: xcdroast-0.98alpha16-wformat.patch Requires: wodim Requires: genisoimage Requires: icedax +BuildRequires: gcc BuildRequires: gtk2-devel >= 2.0.6 BuildRequires: desktop-file-utils >= 0.2.92 BuildRequires: autoconf automake From 9f31116c6eba29cbf5952bfcb628c35f1619e46e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:10:51 +0000 Subject: [PATCH 32/33] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index f2b13cb..b525821 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.24.%{?alphatag}%{?dist} +Release: 0.25.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 URL: http://www.xcdroast.org/ @@ -96,6 +96,9 @@ desktop-file-install --vendor xcdroast \ %doc doc/manual/* %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 1:0.98-0.25.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 1:0.98-0.24.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From e07cef299530f5f37049794a0e2fcf3e26a5eea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 15 Apr 2019 10:46:41 +0200 Subject: [PATCH 33/33] Orphaned for 6+ weeks --- .gitignore | 1 - dead.package | 1 + sources | 1 - ...ast-0.98alpha15-13_cdrecord_to_wodim.patch | 203 --------- ...ast-0.98alpha15-14_atapi_to_oldatapi.patch | 17 - ...ast-0.98alpha15-15_no_readcd_version.patch | 22 - xcdroast-0.98alpha15-linebuffer.patch | 29 -- xcdroast-0.98alpha15-nogtk1.patch | 31 -- xcdroast-0.98alpha15-nowarn.patch | 22 - xcdroast-0.98alpha15-prodvd.patch | 397 ---------------- xcdroast-0.98alpha15-scan.patch | 50 -- xcdroast-0.98alpha16-wformat.patch | 12 - xcdroast.desktop | 7 - xcdroast.spec | 430 ------------------ 14 files changed, 1 insertion(+), 1222 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 xcdroast-0.98alpha15-13_cdrecord_to_wodim.patch delete mode 100644 xcdroast-0.98alpha15-14_atapi_to_oldatapi.patch delete mode 100644 xcdroast-0.98alpha15-15_no_readcd_version.patch delete mode 100644 xcdroast-0.98alpha15-linebuffer.patch delete mode 100644 xcdroast-0.98alpha15-nogtk1.patch delete mode 100644 xcdroast-0.98alpha15-nowarn.patch delete mode 100644 xcdroast-0.98alpha15-prodvd.patch delete mode 100644 xcdroast-0.98alpha15-scan.patch delete mode 100644 xcdroast-0.98alpha16-wformat.patch delete mode 100644 xcdroast.desktop delete mode 100644 xcdroast.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 00faaa8..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -xcdroast-0.98alpha16.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index cd024b4..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -bc3d335a30f292067eaaf1ea03ebaf17 xcdroast-0.98alpha16.tar.gz diff --git a/xcdroast-0.98alpha15-13_cdrecord_to_wodim.patch b/xcdroast-0.98alpha15-13_cdrecord_to_wodim.patch deleted file mode 100644 index 5da1318..0000000 --- a/xcdroast-0.98alpha15-13_cdrecord_to_wodim.patch +++ /dev/null @@ -1,203 +0,0 @@ -diff -up xcdroast-0.98alpha16/src/menus.c.p23 xcdroast-0.98alpha16/src/menus.c ---- xcdroast-0.98alpha16/src/menus.c.p23 2008-08-20 17:41:28.000000000 +0200 -+++ xcdroast-0.98alpha16/src/menus.c 2009-02-09 16:55:07.000000000 +0100 -@@ -2701,7 +2701,7 @@ static const gchar *blanktrans[] = BLANK - gtk_container_set_border_width (GTK_CONTAINER (box1), 5); - gtk_container_add(GTK_CONTAINER(dialog),box1); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - f1 = gtk_frame_new(_("Blank CD-RW")); - } else { - f1 = gtk_frame_new(_("Blank CD/DVD+-RW")); -@@ -2811,7 +2811,7 @@ static const gchar *blanktrans[] = BLANK - gtk_box_pack_start(GTK_BOX(box1),box3,FALSE,TRUE,5); - gtk_widget_show(box3); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - button1 = gtk_button_new_with_label(_("Blank CD-RW")); - } else { - button1 = gtk_button_new_with_label(_("Blank CD/DVD+-RW")); -diff -up xcdroast-0.98alpha16/src/xcdrdata.h.p23 xcdroast-0.98alpha16/src/xcdrdata.h ---- xcdroast-0.98alpha16/src/xcdrdata.h.p23 2008-08-20 17:57:53.000000000 +0200 -+++ xcdroast-0.98alpha16/src/xcdrdata.h 2009-02-09 16:55:07.000000000 +0100 -@@ -60,7 +60,9 @@ typedef struct setup_data { - gboolean root_option_change_imagedirs; - gboolean root_option_change_logoptions; - -+#ifndef CDRECORDDVD_IS_FREE - gchar *ProDVDkey; -+#endif - geometry_t mainwindow; - geometry_t burnwindow; - -@@ -120,7 +122,7 @@ typedef struct writer_driver { - } writer_driver_t; - - typedef struct current_set { -- gint isProDVD; -+ gint isDVD; - gint support_ontheflyaudio; - gint writer_devnr; - gint reader_devnr; -diff -up xcdroast-0.98alpha16/src/create.c.p23 xcdroast-0.98alpha16/src/create.c ---- xcdroast-0.98alpha16/src/create.c.p23 2008-08-20 17:57:53.000000000 +0200 -+++ xcdroast-0.98alpha16/src/create.c 2009-02-09 16:55:07.000000000 +0100 -@@ -6792,7 +6792,7 @@ gint sel, btn; - fill_session_available(); - /* force recalc of session size if dvd */ - /* so he will get the multisession warning */ -- if (curset.cdrtype >= 1000 && ( curset.isProDVD & 1 ) && curset.multisession == 1) { -+ if (curset.cdrtype >= 1000 && ( curset.isDVD & 1 ) && curset.multisession == 1) { - set_sessionsize_unknown(); - } - break; -diff -up xcdroast-0.98alpha16/src/xcdroast.h.p23 xcdroast-0.98alpha16/src/xcdroast.h ---- xcdroast-0.98alpha16/src/xcdroast.h.p23 2008-08-21 12:36:52.000000000 +0200 -+++ xcdroast-0.98alpha16/src/xcdroast.h 2009-02-09 17:01:08.000000000 +0100 -@@ -112,22 +112,30 @@ - then in $PREFIX (e.g. /usr/bin/cdrecord instead of - /usr/local/lib/xcdroast-0.98/bin/cdrecord) */ - --#define CDRECORD "bin/cdrecord" --#define CDDA2WAV "bin/cdda2wav" --#define READCD "bin/readcd" --#define MKISOFS "bin/mkisofs" -+#define CDRECORD "bin/wodim" -+#define CDDA2WAV "bin/icedax" -+#define READCD "bin/readom" -+#define MKISOFS "bin/genisoimage" -+ -+#define CDRECORD_NAME "wodim" -+#define CDRECORDDVD_NAME "wodim" -+#define CDRECORDDVD_IS_FREE -+ -+#define CDDA2WAV_NAME "icedax" -+#define READCD_NAME "readom" -+#define MKISOFS_NAME "genisoimage" - - /* MINIMUM required versions. Greater versions are now silently - accepted. - Distribution-Vendors: DO NOT TOUCH THESE! - IT WONT WORK WITH LOWER VERSIONS, EVEN WHEN YOU THINK IT DOES! */ - --#define CDRECORD_VERSION "2.01" --#define CDRECORD_PRODVD_VERSION "2.01a11" -+#define CDRECORD_VERSION "1.1.9" -+#define CDRECORDDVD_VERSION "2.01a11" - #define CDRECORD_VERSION_WITH_ONTHFLYAUDIO "2.01a13" --#define MKISOFS_VERSION "2.01" --#define CDDA2WAV_VERSION "2.01" --#define READCD_VERSION "2.01" -+#define MKISOFS_VERSION "1.1.9" -+#define CDDA2WAV_VERSION "1.1.9" -+#define READCD_VERSION "1.1.9" - - /* group to use for non-root-mode */ - /* #define NONROOTMODEGROUP "xcdwrite" - HISTORIC */ -diff -up xcdroast-0.98alpha16/src/duplicate.c.p23 xcdroast-0.98alpha16/src/duplicate.c ---- xcdroast-0.98alpha16/src/duplicate.c.p23 2003-10-26 14:14:19.000000000 +0100 -+++ xcdroast-0.98alpha16/src/duplicate.c 2009-02-09 16:55:07.000000000 +0100 -@@ -1156,7 +1156,7 @@ GtkWidget *scrolled_win; - gtk_table_set_col_spacings(GTK_TABLE(tbl),10); - gtk_box_pack_start(GTK_BOX(actionspace),tbl,TRUE,TRUE,10); - gtk_widget_show(tbl); -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - f1 = gtk_frame_new(_("CD-Information")); - } else { - f1 = gtk_frame_new(_("CD/DVD-Information")); -@@ -1739,7 +1739,7 @@ GtkWidget *tbl, *check; - gtk_widget_show(tbl); - vbox = gtk_vbox_new(FALSE,10); - gtk_table_attach_defaults(GTK_TABLE(tbl),vbox,0,1,0,1); -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - f1 = gtk_frame_new(_("CD-Information")); - } else { - f1 = gtk_frame_new(_("CD/DVD-Information")); -@@ -2241,7 +2241,7 @@ GtkWidget *tbl, *omenu, *check; - gtk_widget_show(tbl); - vbox = gtk_vbox_new(FALSE,10); - gtk_table_attach_defaults(GTK_TABLE(tbl),vbox,0,1,0,1); -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - f1 = gtk_frame_new(_("CD-Information")); - } else { - f1 = gtk_frame_new(_("CD/DVD-Information")); -@@ -3090,7 +3090,7 @@ gint menuidx, menuhistory; - gtk_table_set_col_spacings(GTK_TABLE(tbl),10); - gtk_box_pack_start(GTK_BOX(actionspace),tbl,TRUE,TRUE,10); - gtk_widget_show(tbl); -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - f1 = gtk_frame_new(_("CD to write")); - } else { - f1 = gtk_frame_new(_("CD/DVD to write")); -@@ -3107,7 +3107,7 @@ gint menuidx, menuhistory; - hbox = gtk_hbox_new(TRUE,10); - gtk_box_pack_start(GTK_BOX(actionspace),hbox,FALSE,TRUE,5); - gtk_widget_show(hbox); -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - b1 = gtk_button_new_with_label(_("Write CD")); - } else { - b1 = gtk_button_new_with_label(_("Write CD/DVD")); -@@ -3118,7 +3118,7 @@ gint menuidx, menuhistory; - GTK_SIGNAL_FUNC(writetracks_clicked), NULL); - define_tooltip(b1,_("Writes all tracks specified by the TOC file to a CD.")); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - b1 = gtk_button_new_with_label(_("Blank CD-RW")); - } else { - b1 = gtk_button_new_with_label(_("Blank CD/DVD+-RW")); -@@ -3239,7 +3239,7 @@ gint menuidx, menuhistory; - gtk_widget_show (menu_item); - i++; - } -- if (curset.isProDVD) { -+ if (curset.isDVD) { - i = 0; - tmpval = curset.cdrtype; - while (dvdtypes[i] != 0) { -@@ -3984,7 +3984,7 @@ GtkWidget *b1; - side_widgets[0] = b1; - define_tooltip(b1,_("Displays information about the currently inserted CD and tracks stored on the harddrive.")); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - b1 = gtk_toggle_button_new_with_label(_("Read CD")); - } else { - b1 = gtk_toggle_button_new_with_label(_("Read CD/DVD")); -@@ -3996,7 +3996,7 @@ GtkWidget *b1; - side_widgets[1] = b1; - define_tooltip(b1,_("Reads all tracks of a CD and copy them to the harddrive.")); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - b1 = gtk_toggle_button_new_with_label(_("Verify CD")); - } else { - b1 = gtk_toggle_button_new_with_label(_("Verify CD/DVD")); -@@ -4016,7 +4016,7 @@ GtkWidget *b1; - side_widgets[3] = b1; - define_tooltip(b1,_("Plays audio tracks (.wav files) from the harddrive via soundcard.")); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - b1 = gtk_toggle_button_new_with_label(_("Write CD")); - } else { - b1 = gtk_toggle_button_new_with_label(_("Write CD/DVD")); -diff -up xcdroast-0.98alpha16/src/main.c.p23 xcdroast-0.98alpha16/src/main.c ---- xcdroast-0.98alpha16/src/main.c.p23 2008-08-21 11:45:34.000000000 +0200 -+++ xcdroast-0.98alpha16/src/main.c 2009-02-09 16:55:07.000000000 +0100 -@@ -583,7 +583,7 @@ gint stat; - */ - - /* warn about non-existing LFS support in dvd mode */ -- if ((curset.isProDVD & 1) && sizeof(off_t) != 8) { -+ if ((curset.isDVD & 1) && sizeof(off_t) != 8) { - show_dialog(ICO_WARN, _("Warning: Your system is not able to create files larger\nthan 2 GB. Writing DVDs will therefore not possible."), T_OK, NULL, NULL, 0); - } - diff --git a/xcdroast-0.98alpha15-14_atapi_to_oldatapi.patch b/xcdroast-0.98alpha15-14_atapi_to_oldatapi.patch deleted file mode 100644 index 52ed821..0000000 --- a/xcdroast-0.98alpha15-14_atapi_to_oldatapi.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: src/io.c -=================================================================== ---- src/io.c.orig 2006-12-19 13:02:15.000000000 +0100 -+++ src/io.c 2006-12-19 13:18:53.000000000 +0100 -@@ -985,7 +985,11 @@ - - /* add the found devices to the writerreader structure */ - count = 0; -- g_snprintf(tmp,MAXLINE,"%s:", transport); -+ if (strstr(transport,"ATAPI")) { -+ g_snprintf(tmp,MAXLINE,"OLD%s:", transport); -+ } else { -+ g_snprintf(tmp,MAXLINE,"%s:", transport); -+ } - while(scsidevices[count] != NULL) { - add_writerreader(scsidevices[count], tmp, txt); - g_free(scsidevices[count]); diff --git a/xcdroast-0.98alpha15-15_no_readcd_version.patch b/xcdroast-0.98alpha15-15_no_readcd_version.patch deleted file mode 100644 index e9ac9e6..0000000 --- a/xcdroast-0.98alpha15-15_no_readcd_version.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -urip xcdroast-0.98+0alpha15/src/io.c xcdroast-0.98+0alpha15-fixed/src/io.c ---- xcdroast-0.98+0alpha15/src/io.c 2003-10-26 15:24:48.000000000 +0100 -+++ xcdroast-0.98+0alpha15-fixed/src/io.c 2007-01-17 23:04:29.000000000 +0100 -@@ -10143,6 +10143,10 @@ gchar *p; - g_error("popen error\n"); - } - -+ /* all versions of readom is good enough! */ -+ return 0; -+ -+#if 0 - strcpy(line,""); - for (;;) { - if (fgets(line,MAXLINE,fpin) == NULL) -@@ -10185,6 +10189,7 @@ gchar *p; - strcpy(found,ver); - return 1; - } -+#endif - } - - diff --git a/xcdroast-0.98alpha15-linebuffer.patch b/xcdroast-0.98alpha15-linebuffer.patch deleted file mode 100644 index f1d0122..0000000 --- a/xcdroast-0.98alpha15-linebuffer.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- xcdroast-0.98alpha15/src/tools.c.linebuffer 2003-10-26 22:28:57.000000000 +0000 -+++ xcdroast-0.98alpha15/src/tools.c 2004-07-12 12:24:36.134850404 +0100 -@@ -596,8 +596,25 @@ - if (rc == -1 && errno == EAGAIN) { - if (n == 1) - return(-1); -- else -+ else { -+ /* Partial line read. Wait a -+ * bit longer in case there's -+ * more. This does not fix -+ * all the races in the -+ * parsing code, but works -+ * around them somewhat. */ -+ struct timeval t; -+ fd_set set; -+ FD_ZERO(&set); -+ FD_SET(fd,&set); -+ t.tv_sec = 1; -+ t.tv_usec = 0; -+ if (select (fd+1, &set, NULL, -+ NULL, &t) > 0) -+ continue; -+ - break; -+ } - } - return(-1); /* error */ - } diff --git a/xcdroast-0.98alpha15-nogtk1.patch b/xcdroast-0.98alpha15-nogtk1.patch deleted file mode 100644 index c82c902..0000000 --- a/xcdroast-0.98alpha15-nogtk1.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- xcdroast-0.98alpha15/configure.in.nogtk1 2005-04-21 18:11:47.000000000 +0200 -+++ xcdroast-0.98alpha15/configure.in 2005-04-21 18:12:05.000000000 +0200 -@@ -99,25 +99,9 @@ - AM_DEP_NONROOTMODE - AM_DEP_ENABLEGTK2 - --if test "$ENABLE_GTK2" = "TRUE"; then -- -- PKG_CHECK_MODULES(PKGCONFIG, gtk+-2.0 >= 2.0.6) -- LIBS="$LIBS $PKGCONFIG_LIBS" -- CFLAGS="$CFLAGS $PKGCONFIG_CFLAGS" -- --else -- dnl pure plain GTK+-1.2.x support -- -- dnl Check for GLIB -- AM_PATH_GLIB(1.2.3,, AC_MSG_ERROR(Test for GLIB failed. See the file 'INSTALL' for help.)) -- -- dnl Check for GTK+ -- AM_PATH_GTK(1.2.3,, AC_MSG_ERROR(Test for GTK failed. See the file 'INSTALL' for help.)) -- -- dnl Check for GDK-Pixbuf -- AM_PATH_GDK_PIXBUF(0.8.0,, AC_MSG_ERROR(Test for gdk_pixbuf failed. See the file 'INSTALL' for help.)) --fi -- -+PKG_CHECK_MODULES(PKGCONFIG, gtk+-2.0 >= 2.0.6) -+LIBS="$LIBS $PKGCONFIG_LIBS" -+CFLAGS="$CFLAGS $PKGCONFIG_CFLAGS" - dnl internationalization macros - AM_GNU_GETTEXT - diff --git a/xcdroast-0.98alpha15-nowarn.patch b/xcdroast-0.98alpha15-nowarn.patch deleted file mode 100644 index 7d56328..0000000 --- a/xcdroast-0.98alpha15-nowarn.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- xcdroast-0.98alpha15/src/init.c.nowarn 2003-10-30 12:58:26.000000000 +0100 -+++ xcdroast-0.98alpha15/src/init.c 2004-09-09 16:50:31.651482768 +0200 -@@ -736,7 +736,7 @@ - #if (defined(__MACH__) && defined(__APPLE__)) || (USE_NONROOTMODE == 0) - dodebug(1,"-- X-CD-Roast compiled with disabled non-root-mode.\n"); - --#if !(defined(__MACH__) && defined(__APPLE__)) -+#if !(defined(__MACH__) && defined(__APPLE__)) && 0 - if (!isroot()) { - g_print("\nWARNING: Using X-CD-Roast as non-root and was compiled without non-root-support.\n"); - } -@@ -1125,7 +1125,10 @@ - if (isroot()) { - show_fancy_dialog(_("Warning:"), _("This copy of X-CD-Roast has been compiled without\nnon-root-support. If you want to use X-CD-Roast without entering\nthe root-password, you have to install a fully enabled version.\n\nVisit http://www.xcdroast.org for more information."), T_OK); - } else { -+#if 0 - show_fancy_dialog(_("Warning:"), _("This copy of X-CD-Roast has been compiled without\nnon-root-support. Therefore you will not be able to use it as\nnon-root user unless you have take special precautions. It is\nrecommended that you install a fully enabled version.\n\nVisit http://www.xcdroast.org for more information."), T_OK); -+#endif -+; - } - gtk_widget_destroy(toplevel); - } diff --git a/xcdroast-0.98alpha15-prodvd.patch b/xcdroast-0.98alpha15-prodvd.patch deleted file mode 100644 index 3b94bef..0000000 --- a/xcdroast-0.98alpha15-prodvd.patch +++ /dev/null @@ -1,397 +0,0 @@ -diff -up xcdroast-0.98alpha16/src/create.c.cdrkit xcdroast-0.98alpha16/src/create.c ---- xcdroast-0.98alpha16/src/create.c.cdrkit 2009-02-17 06:34:16.000000000 -0500 -+++ xcdroast-0.98alpha16/src/create.c 2009-02-17 06:34:16.000000000 -0500 -@@ -523,7 +523,7 @@ GtkWidget *scrolled_win, *list; - gtk_widget_show(tbl); - vbox = gtk_vbox_new(FALSE,10); - gtk_table_attach_defaults(GTK_TABLE(tbl),vbox,1,2,0,1); -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - f1 = gtk_frame_new(_("CD-Information")); - } else { - f1 = gtk_frame_new(_("CD/DVD-Information")); -@@ -1260,7 +1260,7 @@ GtkWidget *scrolled_win, *img_list; - gtk_widget_show(tbl); - vbox = gtk_vbox_new(FALSE,10); - gtk_table_attach_defaults(GTK_TABLE(tbl),vbox,0,1,0,1); -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - f1 = gtk_frame_new(_("CD-Information")); - } else { - f1 = gtk_frame_new(_("CD/DVD-Information")); -@@ -2979,7 +2979,7 @@ GtkTargetEntry target_entry[3]; - GTK_SIGNAL_FUNC(fixate_clicked), NULL); - define_tooltip(b1,_("Just fixate (close) the CD, if for some reason the CD has been written but not fixated.")); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - b1 = gtk_button_new_with_label(_("Blank CD-RW")); - } else { - b1 = gtk_button_new_with_label(_("Blank CD/DVD+-RW")); -@@ -3086,7 +3086,7 @@ GtkTargetEntry target_entry[3]; - gtk_widget_show (menu_item); - i++; - } -- if (curset.isProDVD) { -+ if (curset.isDVD) { - i = 0; - tmpval = curset.cdrtype; - while (dvdtypes[i] != 0) { -@@ -5774,7 +5774,7 @@ GtkObject *adj; - bootable_frame1 = NULL; - bootable_frame2 = NULL; - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - f1 = gtk_frame_new(_("Options to create a bootable CD")); - } else { - f1 = gtk_frame_new(_("Options to create a bootable CD/DVD")); -@@ -5794,7 +5794,7 @@ GtkObject *adj; - gtk_box_pack_start(GTK_BOX(vbox),tbl,FALSE,FALSE,0); - gtk_widget_show(tbl); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - l1 = rightjust_gtk_label_new(_("Make CD bootable?")); - } else { - l1 = rightjust_gtk_label_new(_("Make CD/DVD bootable?")); -@@ -7023,7 +7023,7 @@ gchar tmp2[MAXLINE]; - gtk_widget_show (menu_item); - i++; - } -- if (curset.isProDVD) { -+ if (curset.isDVD) { - i = 0; - tmpval = curset.cdrtype; - while (dvdtypes[i] != 0) { -@@ -7174,7 +7174,7 @@ gchar tmp2[MAXLINE]; - gtk_widget_show(b1); - define_tooltip(b1,_("Set additional write options for advanced users.")); - /* blank button */ -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - b1 = gtk_button_new_with_label(_("Blank CD-RW")); - } else { - b1 = gtk_button_new_with_label(_("Blank CD/DVD+-RW")); -diff -up xcdroast-0.98alpha16/src/init.c.cdrkit xcdroast-0.98alpha16/src/init.c ---- xcdroast-0.98alpha16/src/init.c.cdrkit 2009-02-17 06:34:16.000000000 -0500 -+++ xcdroast-0.98alpha16/src/init.c 2009-02-17 06:34:16.000000000 -0500 -@@ -156,7 +156,7 @@ static void init_curset() { - gint cdrtypes[] = CDR_TYPES_MIN; - gint i; - -- curset.isProDVD = 0; -+ curset.isDVD = 0; - curset.support_ontheflyaudio = 0; - curset.writer_devnr = -1; - curset.reader_devnr = -1; -@@ -1005,7 +1005,7 @@ gint isProDVD, ignoreProDVD; - tocfiles = (GList *) NULL; - strcpy(xcdroast_version_loaded, ""); - -- curset.isProDVD = isProDVD; -+ curset.isDVD = isProDVD; - curset.support_ontheflyaudio = support_ontheflyaudio; - - /* load iso-options if available */ -@@ -1129,7 +1129,7 @@ gint isProDVD, ignoreProDVD; - } - #endif - -- if (curset.isProDVD == 1) { -+ if (curset.isDVD == 1) { - /* set key if we got one from the config-file */ - if (strcmp(setupdata.ProDVDkey,"")) { - -diff -up xcdroast-0.98alpha16/src/io.c.cdrkit xcdroast-0.98alpha16/src/io.c ---- xcdroast-0.98alpha16/src/io.c.cdrkit 2009-02-17 06:34:16.000000000 -0500 -+++ xcdroast-0.98alpha16/src/io.c 2009-02-17 08:39:07.000000000 -0500 -@@ -4725,7 +4725,7 @@ gint fd; - dolog(3, "Saving extended output to %s\n", fname); - - /* write to file */ -- fd = open(fname,O_WRONLY | O_CREAT); -+ fd = open(fname,O_WRONLY | O_CREAT, 0600); - if (fd < 0) { - g_warning("Can't open file %s for writing\n",fname); - return 1; -@@ -5989,7 +5989,7 @@ gchar tmp[MAXLINE]; - if (WIFSIGNALED(ret) && read_done == 0) { - - /* most likely invalid prodvd key */ -- if (curset.isProDVD) { -+ if (curset.isDVD) { - strncpy(tmp, "\nReceived ALARM from cdrecord-ProDVD. Aborting blank...\nInvalid ProDVD key?\n", MAXLINE); - - convert_for_gtk2_textwidget(tmp); -@@ -6372,7 +6372,7 @@ gint cdrecord_stderr; - if (WIFSIGNALED(ret) && read_done == 0) { - - /* most likely invalid prodvd key */ -- if (curset.isProDVD && curset.cdrtype > 1000) { -+ if (curset.isDVD && curset.cdrtype > 1000) { - read_done = 2; - } - } -@@ -6402,7 +6402,7 @@ gint cdrecord_stderr; - } - - /* prodvd and beginning to write soon? */ -- if (curset.isProDVD && curset.cdrtype > 1000) { -+ if (curset.isDVD && curset.cdrtype > 1000) { - if (strstr(line,"Last chance to quit")) { - cdrtimer = gtk_timeout_add(1000, - cdrtimer_callback, NULL); -@@ -6711,7 +6711,7 @@ gchar *p; - - static void display_invalid_prodvdkey() { - -- if (curset.isProDVD && curset.cdrtype > 1000) { -+ if (curset.isDVD && curset.cdrtype > 1000) { - show_dialog(ICO_WARN, _("cdrecord-ProDVD terminated.\n\nMost likely because you have entered\nan invalid key. Please check if it is correct."), T_OK, NULL, NULL, 0); - } - } -@@ -9900,17 +9900,17 @@ gint wrmode; - /* check the version of cdrecord */ - /* return 1 if not correct (to old) */ - --gint check_version_cdrecord(gchar *match, gchar *found, gint *isProDVD) { -+gint check_version_cdrecord(gchar *match, gchar *found, gint *isDVD) { - gchar line[MAXLINE]; - gchar vline[MAXLINE]; - gchar ver[MAXLINE]; - FILE *fpin; - gchar *p; - -- *isProDVD = 0; -+ *isDVD = 0; - strcpy(ver,""); - get_wrap_path("CDRECORD",line); -- strcat(line," -version 2>/dev/null"); -+ strcat(line," -version 2>&1"); - - dodebug(1, "calling: %s\n", line); - if ((fpin = popen(line,"r")) == NULL) { -@@ -9930,7 +9930,7 @@ gchar *p; - } - if (strstr(line, "This version is an unofficial (modified) version with DVD support")) { - dodebug(1, "WARNING: Inoffical cdrecord version found!\n", line); -- *isProDVD = 1; -+ *isDVD = 1; - } - } - -@@ -9955,7 +9955,7 @@ gchar *p; - } else { - p = strstr(vline, "ProDVD"); - if (p != NULL) { -- *isProDVD = 1; -+ *isDVD = 1; - p = strtok(p, " "); - if (p != NULL) { - p = strtok(NULL, " "); -@@ -10005,6 +10005,7 @@ gchar *p; - - gint check_version_mkisofs(gchar *match, gchar *found) { - gchar line[MAXLINE]; -+gchar vline[MAXLINE]; - gchar ver[MAXLINE]; - FILE *fpin; - gchar *p; -@@ -10019,17 +10020,22 @@ gchar *p; - } - - strcpy(line,""); -+ strcpy(vline,""); - for (;;) { - if (fgets(line,MAXLINE,fpin) == NULL) - break; - dodebug(10,"got: %s",line); -+ /* only get first line */ -+ if (strcmp(vline,"") == 0) { -+ strncpy(vline, line, MAXLINE); -+ } - } - - if (pclose(fpin) == -1) { - g_error("pclose error\n"); - } - -- if (strcmp(line,"") == 0 || strstr(line,"sh:") != NULL) { -+ if (strcmp(vline,"") == 0 || strstr(vline,"sh:") != NULL) { - /* failed to open - permission denied */ - return 2; - } -@@ -10038,9 +10044,9 @@ gchar *p; - /* now line contains the version string of mkisofs */ - /* try to extract the version number */ - -- p = strstr(line,"mkisofs"); -+ p = strstr(line,"genisoimage"); - if (p != NULL) { -- p = strtok(p+8, " "); -+ p = strtok(p+11, " "); - if (p != NULL) { - strcpy(ver,p); - } -@@ -10070,7 +10076,7 @@ gchar line[MAXLINE]; - gchar ver[MAXLINE]; - FILE *fpin; - gchar *p; -- -+ int icedax=0; - strcpy(ver,""); - get_wrap_path("CDDA2WAV",line); - strcat(line," -version 2>&1"); -@@ -10085,6 +10091,9 @@ gchar *p; - if (fgets(line,MAXLINE,fpin) == NULL) - break; - dodebug(10,"got: %s",line); -+ if (strstr(line, "icedax") != NULL) { -+ icedax=1; -+ } - } - - if (pclose(fpin) == -1) { -@@ -10096,6 +10105,11 @@ gchar *p; - return 2; - } - -+ if (icedax) { -+ strcpy(found, CDDA2WAV_VERSION); -+ return 0; -+ } -+ - /* now line contains the version string of cdda2wav */ - /* try to extract the version number */ - -@@ -10137,13 +10151,14 @@ gchar *p; - - gint check_version_readcd(gchar *match, gchar *found) { - gchar line[MAXLINE]; -+gchar vline[MAXLINE]; - gchar ver[MAXLINE]; - FILE *fpin; - gchar *p; - - strcpy(ver,""); - get_wrap_path("READCD",line); -- strcat(line," -version 2>/dev/null"); -+ strcat(line," -version 2>/dev/null | fgrep " READCD_NAME); - - dodebug(1, "calling: %s\n", line); - if ((fpin = popen(line,"r")) == NULL) { -@@ -10155,17 +10170,22 @@ gchar *p; - - #if 0 - strcpy(line,""); -+ strcpy(vline,""); - for (;;) { - if (fgets(line,MAXLINE,fpin) == NULL) - break; - dodebug(10,"got: %s",line); -+ /* only get first line */ -+ if (strcmp(vline,"") == 0) { -+ strncpy(vline, line, MAXLINE); -+ } - } - - if (pclose(fpin) == -1) { - g_error("pclose error\n"); - } - -- if (strcmp(line,"") == 0 || strstr(line,"sh:") != NULL) { -+ if (strcmp(vline,"") == 0 || strstr(vline,"sh:") != NULL) { - /* failed to open - permission denied */ - return 2; - } -diff -up xcdroast-0.98alpha16/src/main.c.cdrkit xcdroast-0.98alpha16/src/main.c ---- xcdroast-0.98alpha16/src/main.c.cdrkit 2009-02-17 06:34:16.000000000 -0500 -+++ xcdroast-0.98alpha16/src/main.c 2009-02-17 06:34:16.000000000 -0500 -@@ -226,7 +226,7 @@ gchar tmp[MAXLINE]; - gtk_box_pack_start(GTK_BOX(sidespace), side_t,TRUE,TRUE,0); - - side_t_btn1 = gtk_button_new_with_label (_("Setup")); -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - side_t_btn2 = gtk_button_new_with_label (_("Duplicate CD")); - side_t_btn3 = gtk_button_new_with_label (_("Create CD")); - } else { -diff -up xcdroast-0.98alpha16/src/setup.c.cdrkit xcdroast-0.98alpha16/src/setup.c ---- xcdroast-0.98alpha16/src/setup.c.cdrkit 2009-02-17 06:34:16.000000000 -0500 -+++ xcdroast-0.98alpha16/src/setup.c 2009-02-17 06:34:16.000000000 -0500 -@@ -316,7 +316,7 @@ gchar tmp[MAXLINE]; - dolog(2, "Confirm setup\n"); - - /* some lasts checks and warnings */ -- if (is_dvdwriter(setupdata.writer_devnr) && !curset.isProDVD) { -+ if (is_dvdwriter(setupdata.writer_devnr) && !curset.isDVD) { - ret = show_dialog(ICO_WARN, _("Please note that you have to install ProDVD support before\nyou can write DVDs. Currently you will only be able to\nwrite regular CDs with your DVD-Writer."), T_OK,T_CANCEL, NULL, 0); - if (ret == 1) { - /* abort */ -@@ -1148,7 +1148,7 @@ static const gchar *helpwritemodes[] = H - gtk_box_pack_start(GTK_BOX(vbox2),tbl,FALSE,TRUE,0); - gtk_widget_show(tbl); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - l1 = rightjust_gtk_label_new(_("CD Writer Device:")); - } else { - l1 = rightjust_gtk_label_new(_("CD/DVD Writer Device:")); -@@ -2788,7 +2788,7 @@ GtkWidget *check; - gtk_text_set_point(GTK_TEXT(txt),0); - gtk_text_thaw(GTK_TEXT(txt)); - -- if (curset.isProDVD == 0) { -+ if (curset.isDVD == 0) { - gtk_widget_set_sensitive(f1, FALSE); - gtk_widget_set_sensitive(l1, FALSE); - gtk_widget_set_sensitive(txt, FALSE); -@@ -3198,7 +3198,7 @@ gchar tmp[MAXLINE]; - gtk_container_add (GTK_CONTAINER (f1), tbl); - gtk_widget_show(tbl); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - check = gtk_check_button_new_with_label(_("change CD Writer Device")); - } else { - check = gtk_check_button_new_with_label(_("change CD/DVD Writer Device")); -@@ -3220,7 +3220,7 @@ gchar tmp[MAXLINE]; - gtk_widget_show(check); - define_tooltip(check, _("If enabled, then the user is allowed the change the write parameters for the CD Writer (e.g. Speed and FIFO-Buffer-Size).")); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - check = gtk_check_button_new_with_label(_("change CD Reader Device")); - } else { - check = gtk_check_button_new_with_label(_("change CD/DVD Reader Device")); -@@ -3387,7 +3387,7 @@ gint i; - gtk_notebook_append_page(GTK_NOTEBOOK (notebook),f1,l1); - draw_scsi_scan(f1); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - l2 = gtk_label_new(_("CD Settings")); - } else { - l2 = gtk_label_new(_("CD/DVD Settings")); -diff -up xcdroast-0.98alpha16/src/xtools.c.cdrkit xcdroast-0.98alpha16/src/xtools.c ---- xcdroast-0.98alpha16/src/xtools.c.cdrkit 2008-08-20 12:10:28.000000000 -0400 -+++ xcdroast-0.98alpha16/src/xtools.c 2009-02-17 06:34:16.000000000 -0500 -@@ -2403,7 +2403,7 @@ gchar tmp[MAXLINE]; - - gint get_gracetime() { - -- if (curset.isProDVD && curset.cdrtype > 1000) { -+ if (curset.isDVD && curset.cdrtype > 1000) { - /* use 10 seconds for prodvd, because the keycheck - can take a while... */ - return 10; -@@ -3521,7 +3521,7 @@ gint isdvd,i; - isdvd = 0; - i = get_writerreaderdevs_index(devnr); - -- if (i >= 0 && curset.isProDVD && writerreaderdevs[i]->is_dvdwriter) { -+ if (i >= 0 && curset.isDVD && writerreaderdevs[i]->is_dvdwriter) { - if (convert_devnr2busid(devnr,tmp) != 0) { - g_error("non existing cdrom?"); - } diff --git a/xcdroast-0.98alpha15-scan.patch b/xcdroast-0.98alpha15-scan.patch deleted file mode 100644 index 73d3f7b..0000000 --- a/xcdroast-0.98alpha15-scan.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- xcdroast-0.98alpha15/src/io.c.scan 2003-10-26 15:24:48.000000000 +0100 -+++ xcdroast-0.98alpha15/src/io.c 2004-09-20 16:36:03.841108264 +0200 -@@ -1061,17 +1071,18 @@ - - if (doscanbus) { - /* scan for scsi devices */ -+ scan_other("ATA", 1, txt); - scan_traditional(txt); - - /* scan for alternatives */ - #if defined(linux) - if (scanparam) { -- scan_other("ATA", 1, txt); -+ scan_other("ATA", 2, txt); - } - #endif - #if defined(sun) - if (scanparam) { -- scan_other("USCSI", 2, txt); -+ scan_other("USCSI", 3, txt); - } - #endif - } ---- xcdroast-0.98alpha15/src/setup.c.scan 2003-10-30 12:50:25.000000000 +0100 -+++ xcdroast-0.98alpha15/src/setup.c 2004-09-20 16:37:12.290702344 +0200 -@@ -22,6 +22,8 @@ - #include - #include - -+#include -+ - /* - #ifdef HAVE_LOCALE_H - #include -@@ -4036,7 +4038,14 @@ - - /* fill textbox and do the actual scanning */ - if (!manual) { -- scanbus_new(txt, scanparam); -+ glob_t globbuf; -+ int i; -+ if (glob("/dev/cdrom*", GLOB_NOSORT, NULL, &globbuf) == 0) { -+ for (i = 0; globbuf.gl_pathv && globbuf.gl_pathv[i] != NULL ; i -+++) { -+ scanbus_new_single(globbuf.gl_pathv[i], txt); -+ } -+ globfree(&globbuf); } - } else { - /* the syntax used to scan for REMOTE scsi devices */ - if (strncmp(devicestr,"REMOTE:", 7) == 0 && diff --git a/xcdroast-0.98alpha16-wformat.patch b/xcdroast-0.98alpha16-wformat.patch deleted file mode 100644 index e0b2e1e..0000000 --- a/xcdroast-0.98alpha16-wformat.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up xcdroast-0.98alpha16/src/setup.c.wformat xcdroast-0.98alpha16/src/setup.c ---- xcdroast-0.98alpha16/src/setup.c.wformat 2014-02-21 13:04:20.813356229 +0100 -+++ xcdroast-0.98alpha16/src/setup.c 2014-02-21 13:04:33.893300539 +0100 -@@ -4477,7 +4477,7 @@ gchar tmp[MAXLINE]; - if (!textonly) { - show_dialog(ICO_ERROR,tmp, T_OK, NULL, NULL, 0); - } else { -- g_warning(tmp); -+ g_warning("%s", tmp); - } - } - } diff --git a/xcdroast.desktop b/xcdroast.desktop deleted file mode 100644 index 4868c11..0000000 --- a/xcdroast.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=CD Writer -Type=Application -Exec=/usr/bin/xcdroast -Comment=CD creation tool -Icon=/usr/lib/xcdroast/icons/xcdricon.png diff --git a/xcdroast.spec b/xcdroast.spec deleted file mode 100644 index b525821..0000000 --- a/xcdroast.spec +++ /dev/null @@ -1,430 +0,0 @@ -%global alphatag alpha16 -Summary: An X Window System based tool for creating CDs -Name: xcdroast -Version: 0.98 -Release: 0.25.%{?alphatag}%{?dist} -Epoch: 1 -License: LGPLv2+ and GPLv2 -URL: http://www.xcdroast.org/ - -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{alphatag}.tar.gz -Source1: xcdroast.desktop -Patch1: xcdroast-0.98alpha15-linebuffer.patch -Patch2: xcdroast-0.98alpha15-nowarn.patch -Patch3: xcdroast-0.98alpha15-scan.patch -Patch4: xcdroast-0.98alpha15-13_cdrecord_to_wodim.patch -Patch5: xcdroast-0.98alpha15-14_atapi_to_oldatapi.patch -Patch6: xcdroast-0.98alpha15-15_no_readcd_version.patch -Patch7: xcdroast-0.98alpha15-prodvd.patch -Patch8: xcdroast-0.98alpha15-nogtk1.patch -Patch9: xcdroast-0.98alpha16-wformat.patch - - -Requires: wodim -Requires: genisoimage -Requires: icedax -BuildRequires: gcc -BuildRequires: gtk2-devel >= 2.0.6 -BuildRequires: desktop-file-utils >= 0.2.92 -BuildRequires: autoconf automake - -%description -X-CD-Roast provides a GUI interface for commands like cdrecord and -mkisofs. X-CD-Roast includes a self-explanatory X11 user interface, -automatic SCSI and IDE hardware setup, support for mastering of new -ISO9660 data CDs, support for production of new audio CDs, fast -copying of CDs without hard disk buffering, and a logfile option. - -%package doc -Summary: Manual for xcdroast - -%description doc -This package contains the manual for xcdroast - -%prep -%setup -q -n %{name}-%{version}%{alphatag} -%patch1 -p1 -b .linebuffer -%patch2 -p1 -b .nowarn -%patch3 -p1 -b .scan -%patch4 -p1 -b .p23 -%patch5 -p0 -b .p24 -%patch6 -p1 -b .p25 -%patch7 -p1 -b .cdrkit -%patch8 -p1 -b .nogtk1 -%patch9 -p1 -b .wformat - -# Fix char sets -for file in doc/TRANSLATION.HOWTO ChangeLog; do - iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \ - touch -r $file $file.new && \ - mv $file.new $file -done - -%build -export CFLAGS="$RPM_OPT_FLAGS -Werror=format-security" -autoreconf -ivf -%configure --enable-gtk2 --disable-nonrootmode \ - --with-xcdroast-libdir-prefix=%{_libdir}/%{name} -make %{?_smp_mflags} - -# Change desktop file to the current libdir -sed 's|/usr/lib|%{_libdir}|' %{SOURCE1} > %{name}.desktop - - -%install -mkdir -p $RPM_BUILD_ROOT/{etc/{X11/applnk/Multimedia,pam.d,security/console.apps},usr/sbin} -make install DESTDIR=$RPM_BUILD_ROOT - -desktop-file-install --vendor xcdroast \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Red-Hat-Base \ - --add-category System \ - --add-category DiscBurning \ - %{name}.desktop - -%find_lang %name - -%files -f %{name}.lang -%license COPYING -%doc AUTHORS ChangeLog README doc/DOCUMENTATION doc/FAQ doc/README* doc/TRANSLATION.HOWTO -%{_mandir}/man1/xcdroast.1.* -%{_bindir}/xcdroast -%{_libdir}/xcdroast/ -%{_datadir}/applications/%{name}.desktop - -%files doc -%doc doc/manual/* - -%changelog -* Sun Feb 03 2019 Fedora Release Engineering - 1:0.98-0.25.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 1:0.98-0.24.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Jul 9 2018 Peter Robinson 1:0.98-0.23.alpha16 -- Cleanup spec, update requires, use %%licensee - -* Fri Feb 09 2018 Fedora Release Engineering - 1:0.98-0.22.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1:0.98-0.21.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1:0.98-0.20.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1:0.98-0.19.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 1:0.98-0.18.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 1:0.98-0.17.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering - 1:0.98-0.16.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 1:0.98-0.15.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Feb 21 2014 Tomas Smetana - 1:0.98-0.14.alpha16 -- Require autoconf and automake for build - -* Fri Feb 21 2014 Tomas Smetana - 1:0.98-0.13.alpha16 -- fix #926752: aarch64 support -- fix #1037391: fails to build with "-Werror=format-security" - -* Sun Aug 04 2013 Fedora Release Engineering - 1:0.98-0.12.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 1:0.98-0.11.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 1:0.98-0.10.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 1:0.98-0.9.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Dec 06 2011 Adam Jackson - 1:0.98-0.8.alpha16 -- Rebuild for new libpng - -* Fri Jun 24 2011 Roman Rakus - 1:0.98-0.7.alpha16 -- Fix build fail (#716081) - -* Mon Feb 07 2011 Fedora Release Engineering -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Mar 23 2010 Roman Rakus - 1:0.98-0.5.alpha16 -- Corrected Source0 URL - -* Fri Mar 19 2010 Roman Rakus - 1:0.98-0.4.alpha16 -- Fixes for Merge review #226550 - -* Mon Jul 27 2009 Fedora Release Engineering - 1:0.98-0.3.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Feb 26 2009 Fedora Release Engineering - 1:0.98-0.2.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Feb 09 2009 Roman Rakus - 0.98-0.1.alpha16 -- New version 0.98alpha16 -- some spec file fixes - Resolves: #226550 - -* Mon Feb 18 2008 Fedora Release Engineering - 0.98a15-17 -- Autorebuild for GCC 4.3 - -* Thu Aug 23 2007 Harald Hoyer - 0.98a15-16 -- changed license tag - -* Mon Aug 13 2007 Harald Hoyer - 0.98a15-15 -- more cdrkit compat patches -- changed desktop category -- changed build root path -- added mode to open(2) in io.c - -* Wed Jun 20 2007 Harald Hoyer - 0.98a15-13.1 -- added cdrkit compat patches - -* Thu Mar 15 2007 Karsten Hopp 0.98a15-13 -- rebuild with current gtk2 to add png support (#232013) - -* Wed Jul 12 2006 Jesse Keating - 0.98a15-12.2.2 -- rebuild - -* Fri Feb 10 2006 Jesse Keating - 0.98a15-12.2.1 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating - 0.98a15-12.2 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Thu Apr 21 2005 Harald Hoyer - 0.98a15-12 -- removed gtk1 build requirement - -* Mon Apr 18 2005 Harald Hoyer - 0.98a15-11 -- fixed frozen progress bars with patch from Didier Heyden (bug #134334) - -* Thu Mar 03 2005 Harald Hoyer -- rebuilt - -* Wed Feb 09 2005 Harald Hoyer -- rebuilt - -* Mon Sep 20 2004 Harald Hoyer - 0.98a15-7 -- only add /dev/cdrom* -- enable prodvd mode for our cdrecord - -* Fri Sep 10 2004 Harald Hoyer - 0.98a15-6 -- improved scanning and removed warnings - -* Sun Aug 29 2004 Tim Waugh - 0.98a15-5 -- Actually apply the patch. - -* Tue Jul 13 2004 Harald Hoyer - 0.98a15-4 -- added xcdroast-0.98alpha15-linebuffer.patch (Tim Waugh, bz 127658) -- corrected buildrequires (bz 127300) - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Wed Feb 25 2004 Harald Hoyer - 0.98a15-2 -- 64bit patch added -- configure patch removing pcre req added - -* Tue Feb 24 2004 Harald Hoyer - 0.98a15-1 -- version 0.98alpha15 - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Mon Oct 13 2003 Harald Hoyer 0.98a14-2 -- added patches from xcdroast.org to work again - with the cdrtools-2.01a17 or newer. - -* Tue Sep 01 2003 Harald Hoyer 0.98a14-1 -- new version - -* Wed Jun 04 2003 Elliot Lee -- rebuilt - -* Wed Jan 22 2003 Tim Powers -- rebuilt - -* Tue Jan 07 2003 Harald Hoyer 0.98a13-2 -- removed the old patches -- point the .desktop to an icon - -* Tue Jan 07 2003 Harald Hoyer 0.98a13-2 -- --disable-nonrootmode - -* Tue Jan 07 2003 Harald Hoyer 0.98a13-1 -- bump version - -* Tue Nov 12 2002 Nalin Dahyabhai 0.98a9-21 -- Remove absolute paths from PAM configuration, ensuring that the right set - of modules gets used regardless of arch on multilib systems. - -* Tue Oct 22 2002 Tim Waugh 0.98a9-20 -- Fix POSIX locale patch (bug #76341). - -* Sun Oct 20 2002 Tim Waugh 0.98a9-19 -- Use POSIX locale for df (bug #76341). - -* Tue Aug 13 2002 Havoc Pennington 0.98a9-18 -- rebuild with new imlib soname - -* Tue Aug 13 2002 Tim Waugh 0.98a9-17 -- Another go at fixing bug #70280. - -* Mon Aug 5 2002 Tim Waugh 0.98a9-16 -- Convert translation files to UTF-8 (bug #70280). - -* Fri Jul 26 2002 Tim Waugh 0.98a9-15 -- Use pam_timestamp.so (bug #69884). - -* Tue Jul 23 2002 Tim Waugh 0.98a9-14 -- Desktop file fixes (bug #69537). - -* Mon Jul 15 2002 Tim Waugh 0.98a9-13 -- Use desktop-file-install. - -* Fri Jun 21 2002 Tim Powers 0.98a9-12 -- automated rebuild - -* Thu Jun 20 2002 Tim Waugh 0.98a9-11 -- Set SESSION=true in the console.apps file (bug #62369). - -* Thu May 23 2002 Tim Powers 0.98a9-10 -- automated rebuild - -* Thu Apr 25 2002 Tim Waugh 0.98a9-9 -- Don't explicitly strip binaries (bug #62571). - -* Mon Apr 15 2002 Tim Waugh 0.98a9-8 -- Chicken out of change to fix bug #56844. Better solution needed. - -* Wed Mar 20 2002 Tim Waugh 0.98a9-7 -- Better desktop file comment (bug #61427). - -* Tue Feb 26 2002 Tim Waugh 0.98a9-6 -- Rebuild in new environment. - -* Thu Jan 24 2002 Karsten Hopp -- Fix Requires: - -* Wed Jan 09 2002 Tim Powers -- automated rebuild - -* Thu Nov 29 2001 Tim Waugh 0.98a9-3 -- Fix console.apps file (bug #56844). - -* Mon Jul 30 2001 Tim Waugh 0.98a9-2 -- Put .desktop file in Multimedia, not Applications (bug #50290). - -* Mon Jul 23 2001 Karsten Hopp 0.98a9-1 -- 0.98a9 -- give hint how to setup nonroot-mode (we don't ship the sgid binaries) - -* Wed Jul 19 2001 Karsten Hopp -- remove workaround for older GTK - -* Wed Jul 4 2001 Tim Waugh 0.98a8-5 -- Change Copyright: to License:. -- Change version check for cdrecord to accept 1.10 instead of 1.9. -- ... and require newer cdrecord. - -* Tue Jun 19 2001 Karsten Hopp -- add ExcludeArch: s390 s390x -- add BuildRequires - -* Tue May 22 2001 Karsten Hopp -- fix #41802, needs some testing if cdrecord 1.10 - is compatible with 1.9 - -* Tue Feb 27 2001 Karsten Hopp -- symlink should be relative -- fix strip - -* Mon Feb 12 2001 Karsten Hopp -- update to alpha8 (security bug in alpha7) -- use consolehelper -- fix bugzilla #26870 - -* Fri Dec 01 2000 Karsten Hopp -- rebuild to fix /usr/share/doc permissions - -* Mon Nov 13 2000 Karsten Hopp -- update to 0.98alpha7, which has a new menu to configure non-root mode -- added README.nonroot, README.atapi to documentation - -* Thu Aug 24 2000 Bernhard Rosenkraenzer -- Fix interoperability with mkisofs 1.13 - -* Wed Aug 23 2000 Bernhard Rosenkraenzer -- Update to current, this fixes the "crashes on startup" bug (#16055) - (and the maintainer confirms the "alpha" is more stable than the lastest - "release"). - -* Mon Aug 7 2000 Bernhard Rosenkraenzer -- remove another insistence on Tcl 8.0 - -* Thu Jul 13 2000 Prospector -- automatic rebuild - -* Thu Jun 15 2000 Bill Nottingham -- fix dependencies - -* Sun Jun 11 2000 Bill Nottingham -- build on ia64 - -* Fri Jun 9 2000 Jakub Jelinek -- Remove patch for gcc 2.96 breakages, there were none -- Add patch to make et2c work with recent Tcl/Tk headers - -* Thu Jun 8 2000 Bernhard Rosenkraenzer -- get rid of the ExclusiveArch: line; it compiles on sparc and it might - even work there... -- Exclude ia64 for now; cdrecord isn't available there. - -* Thu Jun 8 2000 Bernhard Rosenkraenzer -- rebuild for main distribution -- fix build with TCL/Tk 8.3 -- remove cdrecord and mkisofs from the package, add - dependencies on the cdrecord and mkisofs packages instead -- fix up the code to find cdrecord where it belongs. -- put man pages in FHS locations -- fix build with kernel 2.4 headers -- work around gcc 2.96 breakages - -* Sun May 28 2000 Ngo Than -- rebuild for 7.0 -- put man page in correct place -- fix xcdroast to build with tcltk8.2 -- add cdrecord-1.8 in xcdroast - -* Tue Apr 04 2000 Ngo Than -- include needed devices in the package (Bug #9997) - -* Fri Feb 11 2000 Ngo Than -- fix Bug 8564 and 8563 - -* Mon Jul 26 1999 Tim Powers -- rebuilt for 6.1 - -* Wed Apr 15 1999 Michael Maher -- built package for 6.0 -- updated source - -* Tue Oct 13 1998 Michael Maher -- rushed by wanger.. not updated - -* Wed May 20 1998 Michael Maher -- built and updated package -- added changelog -- edited paths