Compare commits
2 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
e07cef2995 | ||
|
9f31116c6e |
14 changed files with 1 additions and 1219 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1 +0,0 @@
|
|||
xcdroast-0.98alpha16.tar.gz
|
||||
1
dead.package
Normal file
1
dead.package
Normal file
|
|
@ -0,0 +1 @@
|
|||
Orphaned for 6+ weeks
|
||||
1
sources
1
sources
|
|
@ -1 +0,0 @@
|
|||
bc3d335a30f292067eaaf1ea03ebaf17 xcdroast-0.98alpha16.tar.gz
|
||||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
@ -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]);
|
||||
|
|
@ -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
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -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 */
|
||||
}
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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);
|
||||
}
|
||||
|
|
@ -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?");
|
||||
}
|
||||
|
|
@ -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 <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
+#include <glob.h>
|
||||
+
|
||||
/*
|
||||
#ifdef HAVE_LOCALE_H
|
||||
#include <locale.h>
|
||||
@@ -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 &&
|
||||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -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
|
||||
427
xcdroast.spec
427
xcdroast.spec
|
|
@ -1,427 +0,0 @@
|
|||
%global alphatag alpha16
|
||||
Summary: An X Window System based tool for creating CDs
|
||||
Name: xcdroast
|
||||
Version: 0.98
|
||||
Release: 0.24.%{?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
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.98-0.24.alpha16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Mon Jul 9 2018 Peter Robinson <pbrobinson@fedoraproject.org> 1:0.98-0.23.alpha16
|
||||
- Cleanup spec, update requires, use %%licensee
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.98-0.22.alpha16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.98-0.21.alpha16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.98-0.20.alpha16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.98-0.19.alpha16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.98-0.18.alpha16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.98-0.17.alpha16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.98-0.16.alpha16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.98-0.15.alpha16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Fri Feb 21 2014 Tomas Smetana <tsmetana@redhat.com> - 1:0.98-0.14.alpha16
|
||||
- Require autoconf and automake for build
|
||||
|
||||
* Fri Feb 21 2014 Tomas Smetana <tsmetana@redhat.com> - 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 <rel-eng@lists.fedoraproject.org> - 1:0.98-0.12.alpha16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.98-0.11.alpha16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.98-0.10.alpha16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.98-0.9.alpha16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 1:0.98-0.8.alpha16
|
||||
- Rebuild for new libpng
|
||||
|
||||
* Fri Jun 24 2011 Roman Rakus <rrakus@redhat.com> - 1:0.98-0.7.alpha16
|
||||
- Fix build fail (#716081)
|
||||
|
||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Tue Mar 23 2010 Roman Rakus <rrakus@redhat.com> - 1:0.98-0.5.alpha16
|
||||
- Corrected Source0 URL
|
||||
|
||||
* Fri Mar 19 2010 Roman Rakus <rrakus@redhat.com> - 1:0.98-0.4.alpha16
|
||||
- Fixes for Merge review #226550
|
||||
|
||||
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.98-0.3.alpha16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.98-0.2.alpha16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Mon Feb 09 2009 Roman Rakus <rrakus@redhat.com> - 0.98-0.1.alpha16
|
||||
- New version 0.98alpha16
|
||||
- some spec file fixes
|
||||
Resolves: #226550
|
||||
|
||||
* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.98a15-17
|
||||
- Autorebuild for GCC 4.3
|
||||
|
||||
* Thu Aug 23 2007 Harald Hoyer <harald@redhat.com> - 0.98a15-16
|
||||
- changed license tag
|
||||
|
||||
* Mon Aug 13 2007 Harald Hoyer <harald@redhat.com> - 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 <harald@redhat.com> - 0.98a15-13.1
|
||||
- added cdrkit compat patches
|
||||
|
||||
* Thu Mar 15 2007 Karsten Hopp <karsten@redhat.com> 0.98a15-13
|
||||
- rebuild with current gtk2 to add png support (#232013)
|
||||
|
||||
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0.98a15-12.2.2
|
||||
- rebuild
|
||||
|
||||
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 0.98a15-12.2.1
|
||||
- bump again for double-long bug on ppc(64)
|
||||
|
||||
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 0.98a15-12.2
|
||||
- rebuilt for new gcc4.1 snapshot and glibc changes
|
||||
|
||||
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
|
||||
- rebuilt
|
||||
|
||||
* Thu Apr 21 2005 Harald Hoyer <harald@redhat.com> - 0.98a15-12
|
||||
- removed gtk1 build requirement
|
||||
|
||||
* Mon Apr 18 2005 Harald Hoyer <harald@redhat.com> - 0.98a15-11
|
||||
- fixed frozen progress bars with patch from Didier Heyden (bug #134334)
|
||||
|
||||
* Thu Mar 03 2005 Harald Hoyer <harald@redhat.com>
|
||||
- rebuilt
|
||||
|
||||
* Wed Feb 09 2005 Harald Hoyer <harald@redhat.com>
|
||||
- rebuilt
|
||||
|
||||
* Mon Sep 20 2004 Harald Hoyer <harald@redhat.com> - 0.98a15-7
|
||||
- only add /dev/cdrom*
|
||||
- enable prodvd mode for our cdrecord
|
||||
|
||||
* Fri Sep 10 2004 Harald Hoyer <harald@redhat.com> - 0.98a15-6
|
||||
- improved scanning and removed warnings
|
||||
|
||||
* Sun Aug 29 2004 Tim Waugh <twaugh@redhat.com> - 0.98a15-5
|
||||
- Actually apply the patch.
|
||||
|
||||
* Tue Jul 13 2004 Harald Hoyer <harald@redhat.com> - 0.98a15-4
|
||||
- added xcdroast-0.98alpha15-linebuffer.patch (Tim Waugh, bz 127658)
|
||||
- corrected buildrequires (bz 127300)
|
||||
|
||||
* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
|
||||
- rebuilt
|
||||
|
||||
* Wed Feb 25 2004 Harald Hoyer <harald@redhat.com> - 0.98a15-2
|
||||
- 64bit patch added
|
||||
- configure patch removing pcre req added
|
||||
|
||||
* Tue Feb 24 2004 Harald Hoyer <harald@redhat.com> - 0.98a15-1
|
||||
- version 0.98alpha15
|
||||
|
||||
* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
|
||||
- rebuilt
|
||||
|
||||
* Mon Oct 13 2003 Harald Hoyer <harald@redhat.de> 0.98a14-2
|
||||
- added patches from xcdroast.org to work again
|
||||
with the cdrtools-2.01a17 or newer.
|
||||
|
||||
* Tue Sep 01 2003 Harald Hoyer <harald@redhat.com> 0.98a14-1
|
||||
- new version
|
||||
|
||||
* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
|
||||
- rebuilt
|
||||
|
||||
* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
|
||||
- rebuilt
|
||||
|
||||
* Tue Jan 07 2003 Harald Hoyer <harald@redhat.com> 0.98a13-2
|
||||
- removed the old patches
|
||||
- point the .desktop to an icon
|
||||
|
||||
* Tue Jan 07 2003 Harald Hoyer <harald@redhat.com> 0.98a13-2
|
||||
- --disable-nonrootmode
|
||||
|
||||
* Tue Jan 07 2003 Harald Hoyer <harald@redhat.com> 0.98a13-1
|
||||
- bump version
|
||||
|
||||
* Tue Nov 12 2002 Nalin Dahyabhai <nalin@redhat.com> 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 <twaugh@redhat.com> 0.98a9-20
|
||||
- Fix POSIX locale patch (bug #76341).
|
||||
|
||||
* Sun Oct 20 2002 Tim Waugh <twaugh@redhat.com> 0.98a9-19
|
||||
- Use POSIX locale for df (bug #76341).
|
||||
|
||||
* Tue Aug 13 2002 Havoc Pennington <hp@redhat.com> 0.98a9-18
|
||||
- rebuild with new imlib soname
|
||||
|
||||
* Tue Aug 13 2002 Tim Waugh <twaugh@redhat.com> 0.98a9-17
|
||||
- Another go at fixing bug #70280.
|
||||
|
||||
* Mon Aug 5 2002 Tim Waugh <twaugh@redhat.com> 0.98a9-16
|
||||
- Convert translation files to UTF-8 (bug #70280).
|
||||
|
||||
* Fri Jul 26 2002 Tim Waugh <twaugh@redhat.com> 0.98a9-15
|
||||
- Use pam_timestamp.so (bug #69884).
|
||||
|
||||
* Tue Jul 23 2002 Tim Waugh <twaugh@redhat.com> 0.98a9-14
|
||||
- Desktop file fixes (bug #69537).
|
||||
|
||||
* Mon Jul 15 2002 Tim Waugh <twaugh@redhat.com> 0.98a9-13
|
||||
- Use desktop-file-install.
|
||||
|
||||
* Fri Jun 21 2002 Tim Powers <timp@redhat.com> 0.98a9-12
|
||||
- automated rebuild
|
||||
|
||||
* Thu Jun 20 2002 Tim Waugh <twaugh@redhat.com> 0.98a9-11
|
||||
- Set SESSION=true in the console.apps file (bug #62369).
|
||||
|
||||
* Thu May 23 2002 Tim Powers <timp@redhat.com> 0.98a9-10
|
||||
- automated rebuild
|
||||
|
||||
* Thu Apr 25 2002 Tim Waugh <twaugh@redhat.com> 0.98a9-9
|
||||
- Don't explicitly strip binaries (bug #62571).
|
||||
|
||||
* Mon Apr 15 2002 Tim Waugh <twaugh@redhat.com> 0.98a9-8
|
||||
- Chicken out of change to fix bug #56844. Better solution needed.
|
||||
|
||||
* Wed Mar 20 2002 Tim Waugh <twaugh@redhat.com> 0.98a9-7
|
||||
- Better desktop file comment (bug #61427).
|
||||
|
||||
* Tue Feb 26 2002 Tim Waugh <twaugh@redhat.com> 0.98a9-6
|
||||
- Rebuild in new environment.
|
||||
|
||||
* Thu Jan 24 2002 Karsten Hopp <karsten@redhat.de>
|
||||
- Fix Requires:
|
||||
|
||||
* Wed Jan 09 2002 Tim Powers <timp@redhat.com>
|
||||
- automated rebuild
|
||||
|
||||
* Thu Nov 29 2001 Tim Waugh <twaugh@redhat.com> 0.98a9-3
|
||||
- Fix console.apps file (bug #56844).
|
||||
|
||||
* Mon Jul 30 2001 Tim Waugh <twaugh@redhat.com> 0.98a9-2
|
||||
- Put .desktop file in Multimedia, not Applications (bug #50290).
|
||||
|
||||
* Mon Jul 23 2001 Karsten Hopp <karsten@redhat.de> 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 <karsten@redhat.de>
|
||||
- remove workaround for older GTK
|
||||
|
||||
* Wed Jul 4 2001 Tim Waugh <twaugh@redhat.com> 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 <karsten@redhat.de>
|
||||
- add ExcludeArch: s390 s390x
|
||||
- add BuildRequires
|
||||
|
||||
* Tue May 22 2001 Karsten Hopp <karsten@redhat.de>
|
||||
- fix #41802, needs some testing if cdrecord 1.10
|
||||
is compatible with 1.9
|
||||
|
||||
* Tue Feb 27 2001 Karsten Hopp <karsten@redhat.de>
|
||||
- symlink should be relative
|
||||
- fix strip
|
||||
|
||||
* Mon Feb 12 2001 Karsten Hopp <karsten@redhat.de>
|
||||
- update to alpha8 (security bug in alpha7)
|
||||
- use consolehelper
|
||||
- fix bugzilla #26870
|
||||
|
||||
* Fri Dec 01 2000 Karsten Hopp <karsten@redhat.de>
|
||||
- rebuild to fix /usr/share/doc permissions
|
||||
|
||||
* Mon Nov 13 2000 Karsten Hopp <karsten@redhat.de>
|
||||
- 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 <bero@redhat.com>
|
||||
- Fix interoperability with mkisofs 1.13
|
||||
|
||||
* Wed Aug 23 2000 Bernhard Rosenkraenzer <bero@redhat.com>
|
||||
- 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 <bero@redhat.com>
|
||||
- remove another insistence on Tcl 8.0
|
||||
|
||||
* Thu Jul 13 2000 Prospector <bugzilla@redhat.com>
|
||||
- automatic rebuild
|
||||
|
||||
* Thu Jun 15 2000 Bill Nottingham <notting@redhat.com>
|
||||
- fix dependencies
|
||||
|
||||
* Sun Jun 11 2000 Bill Nottingham <notting@redhat.com>
|
||||
- build on ia64
|
||||
|
||||
* Fri Jun 9 2000 Jakub Jelinek <jakub@redhat.com>
|
||||
- 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 <bero@redhat.com>
|
||||
- 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 <bero@redhat.com>
|
||||
- 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 <than@redhat.de>
|
||||
- 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 <than@redhat.de>
|
||||
- include needed devices in the package (Bug #9997)
|
||||
|
||||
* Fri Feb 11 2000 Ngo Than <than@redhat.de>
|
||||
- fix Bug 8564 and 8563
|
||||
|
||||
* Mon Jul 26 1999 Tim Powers <timp@redhat.com>
|
||||
- rebuilt for 6.1
|
||||
|
||||
* Wed Apr 15 1999 Michael Maher <mike@redhat.com>
|
||||
- built package for 6.0
|
||||
- updated source
|
||||
|
||||
* Tue Oct 13 1998 Michael Maher <mike@redhat.com>
|
||||
- rushed by wanger.. not updated
|
||||
|
||||
* Wed May 20 1998 Michael Maher <mike@redhat.com>
|
||||
- built and updated package
|
||||
- added changelog
|
||||
- edited paths
|
||||
Loading…
Add table
Add a link
Reference in a new issue