up to 3.00auto/th/cdrtools-3.00-1

3 files changed, 57 insertions, 263 deletions

diff --git a/cdrtools-config.patch b/cdrtools-config.patch
index ccdcd8f..1f8b0ee 100644
--- a/cdrtools-config.patch
+++ b/cdrtools-config.patch
@@ -1,10 +1,9 @@
-diff -urN cdrtools-2.01.01.orig/cdrecord/cdrecord.1 cdrtools-2.01.01/cdrecord/cdrecord.1
---- cdrtools-2.01.01.orig/cdrecord/cdrecord.1	2010-01-31 22:09:45.000000000 +0100
-+++ cdrtools-2.01.01/cdrecord/cdrecord.1	2010-02-08 14:15:04.000000000 +0100
+--- cdrtools-3.00/cdrecord/cdrecord.1~	2014-03-25 14:58:38.000000000 +0200
++++ cdrtools-3.00/cdrecord/cdrecord.1	2014-03-25 14:59:13.673238717 +0200
 @@ -71,7 +71,7 @@
  explained below refers to
  .IR scsibus / target / lun
- of the CD/DVD/BluRay-Recorder.
+ of the CD/DVD/BluRay-recorder.
 -If a file /etc/default/cdrecord exists, the parameter to the
 +If a file /etc/cdrecord.conf exists, the parameter to the
  .B dev=
@@ -76,7 +75,6 @@ diff -urN cdrtools-2.01.01.orig/cdrecord/cdrecord.1 cdrtools-2.01.01/cdrecord/cd
  that allows to identify a specific drive on the system.
  .TP
  .B CDR_SPEED
-diff -urN cdrtools-2.01.01.orig/cdrecord/cdrecord.dfl cdrtools-2.01.01/cdrecord/cdrecord.dfl
 --- cdrtools-2.01.01.orig/cdrecord/cdrecord.dfl	2008-12-30 14:29:50.000000000 +0100
 +++ cdrtools-2.01.01/cdrecord/cdrecord.dfl	2010-02-08 14:15:04.000000000 +0100
 @@ -1,6 +1,6 @@
@@ -96,192 +94,6 @@ diff -urN cdrtools-2.01.01.orig/cdrecord/cdrecord.dfl cdrtools-2.01.01/cdrecord/
  #
  #CDR_SPEED=40
  
-diff -urN cdrtools-2.01.01.orig/cdrecord/README.ATAPI cdrtools-2.01.01/cdrecord/README.ATAPI
---- cdrtools-2.01.01.orig/cdrecord/README.ATAPI	2008-10-12 21:08:13.000000000 +0200
-+++ cdrtools-2.01.01/cdrecord/README.ATAPI	2010-02-08 14:15:04.000000000 +0100
-@@ -512,14 +512,14 @@
-       ln -s scd1 cdrw  # NOTE: see above, maybe cdrom
-    Check the new SCSI settings:
-       cdrecord -scanbus
--   Setup cdrecord's environment - edit /etc/default/cdrecord:
-+   Setup cdrecord's environment - edit /etc/cdrecord.conf:
-       CDR_DEVICE=cdrw
-       cdrw=1,0,0        4       8m
-       cdrom=1,2,0       0       0m
-    Input the right values, the fields are described in the manpage
-    of cdrecord. Alternatively, you may use this values as
-    cdrecord-parameter or take a frontend with an own configuration
--   scheme, then you don't need to modify /etc/default/cdrecord.
-+   scheme, then you don't need to modify /etc/cdrecord.conf
- 9. It's done! Insert a CD and try "cdrecord -v -toc"
- /*--------------------------------------------------------------------------*/
- He had constant buffer underrun problems:
-diff -urN cdrtools-2.01.01.orig/doc/cdrecord.man cdrtools-2.01.01/doc/cdrecord.man
---- cdrtools-2.01.01.orig/doc/cdrecord.man	2010-01-31 22:56:01.000000000 +0100
-+++ cdrtools-2.01.01/doc/cdrecord.man	2010-02-08 14:18:18.000000000 +0100
-@@ -32,7 +32,7 @@
- 
-      The _d_e_v_i_c_e parameter to  the  ddeevv==  option  explained  below
-      refers  to _s_c_s_i_b_u_s/_t_a_r_g_e_t/_l_u_n of the CD/DVD/BluRay-Recorder.
--     If a file /etc/default/cdrecord exists, the parameter to the
-+     If a file /etc/cdrecord.conf exists, the parameter to the
-      ddeevv== option may also be a drive name label in said file (see
-      FILES section).
- 
-@@ -1422,11 +1422,11 @@
-           If no _d_e_v option is present, ccddrreeccoorrdd will try  to  get
-           the device from the CCDDRR__DDEEVVIICCEE environment.
- 
--          If a file  /etc/default/cdrecord  exists,  and  if  the
-+          If a file  /etc/cdrecord.conf  exists,  and  if  the
-           argument  to the ddeevv== option or the CCDDRR__DDEEVVIICCEE environ-
-           ment does not contain the characters ',', '/',  '@'  or
-           ':',  it is interpreted as a device label name that was
--          defined in the file  /etc/default/cdrecord  (see  FILES
-+          defined in the file  /etc/cdrecord.conf  (see  FILES
-           section).
- 
-         AAuuttoottaarrggeett MMooddee
-@@ -2078,7 +2078,7 @@
-      CCDDRR__DDEEVVIICCEE
-           This may either hold a device identifier that is  suit-
-           able  to the open call of the SCSI transport library or
--          a label in the file /etc/default/cdrecord.
-+          a label in the file /etc/cdrecord.conf.
- 
-      CCDDRR__SSPPEEEEDD
-           Sets the default speed  value  for  writing  (see  also
-@@ -2143,14 +2143,14 @@
- FFIILLEESS
-      //eettcc//ddeeffaauulltt//ccddrreeccoorrdd
-           Default values can be set for the following options  in
--          /etc/default/cdrecord.   For  example:  CDR_FIFOSIZE=8m
-+          /etc/cdrecord.conf.   For  example:  CDR_FIFOSIZE=8m
-           or CDR_SPEED=2
- 
-           CCDDRR__DDEEVVIICCEE
-                This may either hold a device identifier  that  is
-                suitable  to  the  open call of the SCSI transport
-                library    or    a    label    in     the     file
--               /etc/default/cdrecord  that  allows  to identify a
-+               /etc/cdrecord.conf  that  allows  to identify a
-                specific drive on the system.
- 
-           CCDDRR__SSPPEEEEDD
-diff -urN cdrtools-2.01.01.orig/doc/cdrecord.ps cdrtools-2.01.01/doc/cdrecord.ps
---- cdrtools-2.01.01.orig/doc/cdrecord.ps	2010-01-31 22:55:49.000000000 +0100
-+++ cdrtools-2.01.01/doc/cdrecord.ps	2010-02-08 14:24:23.000000000 +0100
-@@ -341,7 +341,7 @@
- (lun)4915 2952 w
- 10 R f
- (of the)1 281 1 5119 2952 t
--( the)1 161( a \256le /etc/default/cdrecord exists, the parameter to)7 2128(CD/DVD/BluRay-Recorder. If)1 1279 3 1080 3072 t
-+( the)1 161( a \256le /etc/cdrecord.conf exists, the parameter to)7 2128(CD/DVD/BluRay-Recorder. If)1 1279 3 1080 3072 t
- 10 B f
- ( =)1 0( v=)1 57( ev)1 50(d de)1 100 4 4687 3072 t
- 10 R f
-@@ -3329,7 +3329,7 @@
- ( E)1 0( CE)1 67( IC)1 72( VI)1 39( EV)1 72(D DE)1 139 6 5011 2640 t
- 10 R f
- (environment.)1440 2760 w
--( the argument to the)4 1007(If a \256le /etc/default/cdrecord exists, and if)6 1977 2 1440 3000 t
-+( the argument to the)4 1007(If a \256le /etc/cdrecord.conf exists, and if)6 1977 2 1440 3000 t
- 10 B f
- ( =)1 0( v=)1 57( ev)1 50(d de)1 100 4 4501 3000 t
- 10 R f
-@@ -3346,7 +3346,7 @@
- (@)4333 3120 w
- 10 R f
- (' or ':', it is interpreted)5 975 1 4425 3120 t
--(as a device label name that was de\256ned in the \256le /etc/default/cdrecord \(see FILES section\).)14 3779 1 1440 3240 t
-+(as a device label name that was de\256ned in the \256le /etc/cdrecord.conf \(see FILES section\).)14 3779 1 1440 3240 t
- 10 B f
- ( e)1 0( de)1 44( od)1 56( Mo)1 50( M)1 127( t)1 0( et)1 33( ge)1 44( rg)1 50( ar)1 44( ta)1 50( ot)1 33( to)1 50( ut)1 33(A Au)1 128 15 1240 3480 t
- 10 R f
-@@ -4755,7 +4755,7 @@
- ( E)1 0( CE)1 67( IC)1 72( VI)1 39( EV)1 72(D DE)1 139 6 1346 2496 t
- 10 R f
- ( call of the SCSI transport)5 1126(This may either hold a device identi\256er that is suitable to the open)12 2834 2 1440 2616 t
--(library or a label in the \256le /etc/default/cdrecord.)7 1996 1 1440 2736 t
-+(library or a label in the \256le /etc/cdrecord.conf.)7 1996 1 1440 2736 t
- 10 B f
- (C CD DR R)3 216 1 1080 2904 t
- 10 S f
-@@ -4891,7 +4891,7 @@
- 10 B f
- ( d)1 0( rd)1 56( or)1 44( re ec co)3 138( dr)1 44( cd)1 56( /c)1 44( t/)1 28( lt)1 33( ul)1 28( au)1 56( fa)1 50( ef)1 33( de)1 44( /d)1 56( c/)1 28( tc)1 44( et)1 33(/ /e)1 72 19 1080 6672 t
- 10 R f
--( example:)1 423( For)1 229( /etc/default/cdrecord.)1 907(Default values can be set for the following options in)9 2401 4 1440 6792 t
-+( example:)1 423( For)1 229( /etc/cdrecord.conf.)1 907(Default values can be set for the following options in)9 2401 4 1440 6792 t
- 9 R f
- (CDR)1440 6912 w
- 9 S f
-@@ -4931,7 +4931,7 @@
- (\302)976 480 w
- 10 R f
- ( \( 1 \))3 164( CDRECORD)1 3277(s USER COMMANDS)2 950 3 1009 480 t
--( identify a)2 455(transport library or a label in the \256le /etc/default/cdrecord that allows to)11 3145 2 1800 960 t
-+( identify a)2 455(transport library or a label in the \256le /etc/cdrecord.conf that allows to)11 3145 2 1800 960 t
- (speci\256c drive on the system.)4 1167 1 1800 1080 t
- 10 B f
- (C CD DR R)3 216 1 1440 1248 t
-diff -urN cdrtools-2.01.01.orig/doc/readcd.man cdrtools-2.01.01/doc/readcd.man
---- cdrtools-2.01.01.orig/doc/readcd.man	2010-01-29 23:52:16.000000000 +0100
-+++ cdrtools-2.01.01/doc/readcd.man	2010-02-08 14:26:27.000000000 +0100
-@@ -28,7 +28,7 @@
- 
-      The _d_e_v_i_c_e parameter to  the  ddeevv==  option  explained  below
-      refers  to _s_c_s_i_b_u_s/_t_a_r_g_e_t/_l_u_n of the CD/DVD/BluRay-Recorder.
--     If a file /etc/default/cdrecord exists, the parameter to the
-+     If a file /etc/cdrecord.conf exists, the parameter to the
-      ddeevv== option may also be a drive name label in said file (see
-      FILES section).
- 
-@@ -351,11 +351,11 @@
-           If no _d_e_v option is present, rreeaaddccdd will try to get the
-           device from the CCDDRR__DDEEVVIICCEE environment.
- 
--          If a file  /etc/default/cdrecord  exists,  and  if  the
-+          If a file  /etc/cdrecord.conf  exists,  and  if  the
-           argument  to the ddeevv== option or the CCDDRR__DDEEVVIICCEE environ-
-           ment does not contain the characters ',', '/',  '@'  or
-           ':',  it is interpreted as a device label name that was
--          defined in the file  /etc/default/cdrecord  (see  FILES
-+          defined in the file  /etc/cdrecord.conf  (see  FILES
-           section).
- 
-         AAuuttoottaarrggeett MMooddee
-diff -urN cdrtools-2.01.01.orig/doc/readcd.ps cdrtools-2.01.01/doc/readcd.ps
---- cdrtools-2.01.01.orig/doc/readcd.ps	2010-01-29 23:57:11.000000000 +0100
-+++ cdrtools-2.01.01/doc/readcd.ps	2010-02-08 14:29:09.000000000 +0100
-@@ -330,7 +330,7 @@
- (lun)4915 2832 w
- 10 R f
- (of the)1 281 1 5119 2832 t
--( the)1 161( a \256le /etc/default/cdrecord exists, the parameter to)7 2128(CD/DVD/BluRay-Recorder. If)1 1279 3 1080 2952 t
-+( the)1 161( a \256le /etc/cdrecord.conf exists, the parameter to)7 2128(CD/DVD/BluRay-Recorder. If)1 1279 3 1080 2952 t
- 10 B f
- (dev=)4687 2952 w
- 10 R f
-@@ -1192,7 +1192,7 @@
- 10 R f
- (environ-)5062 3000 w
- (ment.)1440 3120 w
--( the argument to the)4 1007(If a \256le /etc/default/cdrecord exists, and if)6 1977 2 1440 3360 t
-+( the argument to the)4 1007(If a \256le /etc/cdrecord.conf exists, and if)6 1977 2 1440 3360 t
- 10 B f
- (dev=)4501 3360 w
- 10 R f
-@@ -1209,7 +1209,7 @@
- (@)4333 3480 w
- 10 R f
- (' or ':', it is interpreted)5 975 1 4425 3480 t
--(as a device label name that was de\256ned in the \256le /etc/default/cdrecord \(see FILES section\).)14 3779 1 1440 3600 t
-+(as a device label name that was de\256ned in the \256le /etc/cdrecord.conf \(see FILES section\).)14 3779 1 1440 3600 t
- 10 B f
- (Autotarget Mode)1 742 1 1240 3840 t
- 10 R f
-diff -urN cdrtools-2.01.01.orig/libcdrdeflt/cdrdeflt.c cdrtools-2.01.01/libcdrdeflt/cdrdeflt.c
 --- cdrtools-2.01.01.orig/libcdrdeflt/cdrdeflt.c	2009-07-10 23:57:18.000000000 +0200
 +++ cdrtools-2.01.01/libcdrdeflt/cdrdeflt.c	2010-02-08 14:15:04.000000000 +0100
 @@ -49,7 +49,7 @@
@@ -293,7 +105,6 @@ diff -urN cdrtools-2.01.01.orig/libcdrdeflt/cdrdeflt.c cdrtools-2.01.01/libcdrde
  }
  
  EXPORT void
-diff -urN cdrtools-2.01.01.orig/readcd/readcd.1 cdrtools-2.01.01/readcd/readcd.1
 --- cdrtools-2.01.01.orig/readcd/readcd.1	2010-01-29 23:27:12.000000000 +0100
 +++ cdrtools-2.01.01/readcd/readcd.1	2010-02-08 14:15:04.000000000 +0100
 @@ -64,7 +64,7 @@
@@ -323,27 +134,3 @@ diff -urN cdrtools-2.01.01.orig/readcd/readcd.1 cdrtools-2.01.01/readcd/readcd.1
  .sp
  .B \h'-2m'Autotarget Mode
  .br
-diff -urN cdrtools-2.01.01.orig/README.openserver cdrtools-2.01.01/README.openserver
---- cdrtools-2.01.01.orig/README.openserver	2000-01-25 17:37:48.000000000 +0100
-+++ cdrtools-2.01.01/README.openserver	2010-02-08 14:15:04.000000000 +0100
-@@ -55,7 +55,7 @@
- ===================================================================
-            THE OLD ADDRESSING IS NO LONGER AVAILABLE!
- 	    
--         PLEASE ADJUST YOUR /etc/default/cdrecord FILES!
-+         PLEASE ADJUST YOUR /etc/cdrecord.conf FILES!
- ===================================================================
- 
- Running cdrecord with the old address method will result in an error!
-diff -urN cdrtools-2.01.01.orig/README.unixware cdrtools-2.01.01/README.unixware
---- cdrtools-2.01.01.orig/README.unixware	2001-03-04 00:41:43.000000000 +0100
-+++ cdrtools-2.01.01/README.unixware	2010-02-08 14:15:04.000000000 +0100
-@@ -64,7 +64,7 @@
- ===================================================================
-            THE OLD ADDRESSING IS NO LONGER AVAILABLE!
- 	    
--         PLEASE ADJUST YOUR /etc/default/cdrecord FILES!
-+         PLEASE ADJUST YOUR /etc/cdrecord.conf FILES!
- ===================================================================
- 
- Running cdrecord with the old address method will result in an error!
diff --git a/cdrtools-rename.patch b/cdrtools-rename.patch
index 305f431..b337fec 100644
--- a/cdrtools-rename.patch
+++ b/cdrtools-rename.patch
@@ -1,6 +1,11 @@
---- cdrtools-2.01.01.orig/autoconf/configure.in	2009-12-31 16:15:52.000000000 +0100
-+++ cdrtools-2.01.01/autoconf/configure.in	2010-01-06 09:38:12.000000000 +0100
-@@ -354,13 +354,13 @@
+--- cdrtools-3.00/./autoconf/configure.in~	2010-05-07 20:00:25.000000000 +0300
++++ cdrtools-3.00/./autoconf/configure.in	2014-03-24 23:12:01.206179037 +0200
+@@ -370,17 +370,17 @@
+ dnl POSIX rules. The new POSIX interfaces in question should be called
+ dnl fdexec*() to follow the rules of other similar POSIX functions.
+ dnl
+-dnl We use AC_RCHECK_FUNCS() because some Linux distros define a
++dnl We use AC_CHECK_FUNCS() because some Linux distros define a
  dnl fexecve() that returns ENOSYS an AC_CHECK_FUNCS() would return FALSE
  dnl
  echo Checking for POSIX violations by the POSIX.1-2008 standard:
@@ -17,8 +22,8 @@
  echo End of tests for POSIX violations by the POSIX.1-2008 standard.
  
  dnl Check whether a symbol is either defined in an include file or
---- cdrtools-2.01.01/include/schily/schily.h.orig	2010-01-06 08:17:45.000000000 +0100
-+++ cdrtools-2.01.01/include/schily/schily.h	2010-01-06 08:19:08.000000000 +0100
+--- cdrtools-3.00/include/schily/schily.h~	2009-10-23 00:18:55.000000000 +0300
++++ cdrtools-3.00/include/schily/schily.h	2014-03-24 23:14:00.498115198 +0200
 @@ -144,7 +144,6 @@
  #define	fexecl		js_fexecl
  #define	fexecle		js_fexecle
@@ -53,15 +58,15 @@
  extern	int	getstr __PR((char *, int));
  extern	int	breakline __PR((char *, char, char **, int));
  extern	int	getallargs __PR((int *, char * const**, const char *, ...));
---- cdrtools-2.01.01/libfind/find.c.orig	2010-01-06 08:21:03.000000000 +0100
-+++ cdrtools-2.01.01/libfind/find.c	2010-01-06 08:21:50.000000000 +0100
-@@ -1747,7 +1747,7 @@
+--- cdrtools-3.00/libfind/find.c~	2010-04-27 21:42:14.000000000 +0300
++++ cdrtools-3.00/libfind/find.c	2014-03-24 23:15:42.452619081 +0200
+@@ -1878,7 +1878,7 @@
  #endif
- 		av[ac] = NULL;	/* -exec {} \; is not NULL terminated */
+ 		pp[ac] = NULL;	/* -exec {} \; is not NULL terminated */
  
 -		fexecve(av[0], state->std[0], state->std[1], state->std[2],
 +		js_fexecve(av[0], state->std[0], state->std[1], state->std[2],
- 							av, state->env);
+ 							pp, state->env);
  		err = geterrno();
  #ifdef	PLUS_DEBUG
 --- cdrtools-2.01.01/libscg/scsitransp.c.orig	2009-09-07 21:09:48.000000000 +0200
@@ -242,14 +247,14 @@
 -	return (getline(lbuf, len));
 +	return (js_getline(lbuf, len));
  }
---- cdrtools-2.01.01/scgcheck/sense.c.orig	2010-01-06 08:22:58.000000000 +0100
-+++ cdrtools-2.01.01/scgcheck/sense.c	2010-01-06 08:24:02.000000000 +0100
+--- cdrtools-3.00/scgcheck/sense.c~	2010-05-24 12:19:15.000000000 +0300
++++ cdrtools-3.00/scgcheck/sense.c	2014-03-24 23:16:55.065826928 +0200
 @@ -116,7 +116,7 @@
  
  			printf("Ready to eject tray? Enter <CR> to continue: ");
  			flushit();
--			(void) getline(abuf, sizeof(abuf));
-+			(void) js_getline(abuf, sizeof(abuf));
+-			(void) getline(abuf, sizeof (abuf));
++			(void) js_getline(abuf, sizeof (abuf));
  			if (abuf[0] != 'n') {
  				scsi_unload(scgp, (cdr_t *)0);
  				needload = TRUE;
diff --git a/cdrtools.spec b/cdrtools.spec
index b7c2781..f6283f7 100644
--- a/cdrtools.spec
+++ b/cdrtools.spec
@@ -6,13 +6,13 @@ Summary(pt_BR.UTF-8):	Um programa de gravação de CD/DVD
 Summary(ru.UTF-8):	Программа для записи CD/DVD, запускаемая из командной строки
 Summary(uk.UTF-8):	Програма для запису CD/DVD, яка запускається з командної стрічки
 Name:		cdrtools
-Version:	2.01.01
-Release:	0.%{subver}.1
+Version:	3.00
+Release:	1
 Epoch:		5
 License:	GPL v2 (mkisofs), LGPL v2.1 (cdda2wav), CDDL v1.0 (the rest)
 Group:		Applications/System
-Source0:	ftp://ftp.berlios.de/pub/cdrecord/alpha/%{name}-%{version}%{subver}.tar.bz2
-# Source0-md5:	0564e79a18d9a6768dbbb02a7717c5ab
+Source0:	ftp://ftp.berlios.de/pub/cdrecord/%{name}-%{version}.tar.bz2
+# Source0-md5:	f9fbab08fbd458b0d2312976d8c5f558
 Patch0:		%{name}-config.patch
 Patch2:		%{name}-man.patch
 Patch3:		%{name}-make.patch
@@ -231,7 +231,7 @@ BTC.
 
 %prep
 %setup -q
-chmod +w -R *
+chmod -R u+rw -R .
 %patch0 -p1
 %patch2 -p1
 %patch3 -p1
@@ -240,11 +240,9 @@ chmod +w -R *
 %patch6 -p1
 
 # Remove profiled make files
-rm -f $(find . -name '*_p.mk')
+rm -v $(find . -name '*_p.mk')
 
-cp -f /usr/share/automake/config.* ./conf
-#ln -sf i586-linux-gcc.rul RULES/x86_64-linux-gcc.rul
-#ln -sf i586-linux-cc.rul RULES/x86_64-linux-cc.rul
+cp -p /usr/share/automake/config.* conf
 
 # kill annoying beep and sleep
 %{__sed} -i -e 's/^__gmake_warn.*//g' RULES/mk-gmake.id
@@ -258,18 +256,28 @@ cp -f /usr/share/automake/config.* ./conf
 
 %{__sed} -i -e 's#/usr/bin/gm4#%{_bindir}/m4#g' autoconf/autoconf
 
-cd ./autoconf
+cd autoconf
+install -d m4
+mv acgeneral.m4 acspecific.m4 autoheader.m4 acoldnames.m4 autoconf.m4 m4
+mv aclocal.m4 acinclude.m4
+
 for a in acgeneral.m4 acspecific.m4 autoheader.m4 acoldnames.m4 autoconf.m4; do
 	:> $a
 done
-# don't run aclocal, aclocal.m4 contains only local defs
+
+# extract only needed functions
+sed -ne '/AC_INCL_CHECK_TYPE/,/dnl ###/p' m4/acgeneral.m4 >> acinclude.m4
+
+%build
+cd autoconf
+%{__aclocal} -I .
 %{__autoconf}
 cd ../cdda2wav
 %{__autoconf}
 cd ..
-
-%build
 %{__make} -j1 \
+	PARCH=%{_arch}-%{_target_vendor} \
+	O_ARCH=%{_target_os} \
 	CC="%{__cc}" \
 	LDCC="%{__cc}" \
 	COPTOPT="%{rpmcflags}" \
@@ -280,31 +288,24 @@ cd ..
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_includedir}/schily/scg}
-
 %{__make} -j1 install \
-	MANDIR=share/man \
-	INS_BASE=$RPM_BUILD_ROOT%{_prefix}
-
-install -p cdda2wav/cdda2mp3	$RPM_BUILD_ROOT%{_bindir}
-install -p cdda2wav/cdda2ogg	$RPM_BUILD_ROOT%{_bindir}
+	PARCH=%{_arch}-%{_target_vendor} \
+	O_ARCH=%{_target_os} \
+	DEFINSUMASK=002 \
+	DEFINSMODEF=644 \
+	DEFINSMODEX=755 \
+	INS_BASE=%{_prefix} \
+	DESTDIR=$RPM_BUILD_ROOT
 
-cp -p include/schily/*.h	$RPM_BUILD_ROOT%{_includedir}/schily
-cp -p incs/*/align.h		$RPM_BUILD_ROOT%{_includedir}/schily
-cp -p incs/*/avoffset.h	$RPM_BUILD_ROOT%{_includedir}/schily
-cp -p incs/*/xconfig.h	$RPM_BUILD_ROOT%{_includedir}/schily
-cp -p libscg/scg/*.h		$RPM_BUILD_ROOT%{_includedir}/schily/scg
+cp -p libscg/scg/*.h $RPM_BUILD_ROOT%{_includedir}/schily/scg
 
 cp -p cdrecord/cdrecord.dfl	$RPM_BUILD_ROOT%{_sysconfdir}/cdrecord.conf
 
-# fix manual pages
-chmod u+rw $RPM_BUILD_ROOT -R
-
-echo '.so isoinfo.8' > $RPM_BUILD_ROOT%{_mandir}/man8/devdump.8
-echo '.so isoinfo.8' > $RPM_BUILD_ROOT%{_mandir}/man8/isovfy.8
-echo '.so isoinfo.8' > $RPM_BUILD_ROOT%{_mandir}/man8/isodump.8
-echo '.so cdda2ogg.1' > $RPM_BUILD_ROOT%{_mandir}/man1/cdda2mp3.1
-
-rm -rf $RPM_BUILD_ROOT%{_includedir}/scg
+rm -r $RPM_BUILD_ROOT%{_includedir}/scg
+rm -r $RPM_BUILD_ROOT%{_includedir}/schily/%{_target_platform}-cc
+rm -r $RPM_BUILD_ROOT%{_docdir}/{mkisofs,rscsi,cdrecord,cdda2wav,libparanoia}
+rm $RPM_BUILD_ROOT%{_mandir}/man5/makefiles.5*
+rm $RPM_BUILD_ROOT%{_mandir}/man5/makerules.5*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -323,6 +324,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/cdrecord.1*
 %{_mandir}/man1/rscsi.1*
 %{_mandir}/man1/scgcheck.1*
+%{_mandir}/man1/scgskeleton.1*
 
 %files devel
 %defattr(644,root,root,755)