--- dvd+rw-tools.spec~	2004-08-10 13:43:53 +0400
+++ dvd+rw-tools.spec	2004-08-10 14:09:20 +0400
@@ -1,33 +1,43 @@
-Summary: Toolchain for mastering recordable DVD media
 Name: dvd+rw-tools
 Version: 5.17.4.8.6
-Release: alt3
-License: GPL
+Release: alt3.1
+
 Group: Video
+Summary: Toolchain for mastering recordable DVD media
+Url: http://fy.chalmers.se/~appro/linux/DVD+RW/
+License: GPL
+
+Requires: mkisofs >= 1.10, control
+
+# Automatically added by buildreq on Tue Aug 10 2004 (-bi)
+BuildRequires: gcc-c++ libstdc++-devel
+
 Source: http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-%version.tar.gz
 Source1: growisofs.control
 Source2: dvd+rw-format.control
 Source3: dvd+rw-booktype.control
-Url: http://fy.chalmers.se/~appro/linux/DVD+RW/
-Requires: mkisofs >= 1.10
 
-# Automatically added by buildreq on Mon Sep 08 2003
-#BuildRequires: cpp2.95 gcc2.95-c++ libstdc++2.95-devel
+Patch1: dvd+rw-tools-5.17.4.8.6-proc-may-be-unreadable.patch
+Patch2: dvd+rw-tools-5.17.4.8.6-supermount.patch
 
 %description
 Collection of tools to master DVD+RW/+R/-R/-RW media. For further
 information see http://fy.chalmers.se/~appro/linux/DVD+RW/.
 
-%description -l ru_RU.KIO8-R
+%description -l ru_RU.KOI8-R
 Набор утилит для подготовки и записи на DVD+RW/+R/-R/-RW носители.
 
+
 %prep
 %setup -q
+%patch1 -p0
+%patch2 -p0
+
 
 %build
-%define _optlevel 9
 %add_optflags %optflags_notraceback %optflags_fastmath -fsigned-char -finline-functions -Dsize16='short' -Dsize32='int'
-%make_build OPT="$RPM_OPT_FLAGS"
+%make_build CFLAGS="%optflags" CXXFLAGS="%optflags"
+
 
 %install
 %__mkdir_p %buildroot%_bindir
@@ -38,12 +48,14 @@
 %__install -pD -m755 $RPM_SOURCE_DIR/dvd+rw-format.control $RPM_BUILD_ROOT/etc/control.d/facilities/dvd+rw-format
 %__install -pD -m755 $RPM_SOURCE_DIR/dvd+rw-booktype.control $RPM_BUILD_ROOT/etc/control.d/facilities/dvd+rw-booktype
 
+
 %pre -n dvd+rw-tools
 [ $1 -eq 1 ] || /usr/sbin/control-dump growisofs dvd+rw-format dvd+rw-booktype
 
 %post -n dvd+rw-tools
 [ $1 -eq 1 ] || /usr/sbin/control-restore growisofs dvd+rw-format dvd+rw-booktype
 
+
 %files
 %config /etc/control.d/facilities/growisofs
 %config /etc/control.d/facilities/dvd+rw-format
@@ -55,6 +67,12 @@
 #%doc changelog
 
 %changelog
+* Tue Aug 10 2004 Sergey V Turchin <zerg at altlinux dot org> 5.17.4.8.6-alt3.1
+- add patch to read /etc/mtab instead /proc/mounts
+- add patch to success umount when subfs or supermount
+- remove requires to gcc-2.95
+- cleanup spec
+
 * Tue Jun 15 2004 Maxim Tyurin <mrkooll@altlinux.ru> 5.17.4.8.6-alt3
 - rebuild with glibc 2.3.3