From 7e63246f9c4d66e77e74e93c8e0c95f09afb1d33 Mon Sep 17 00:00:00 2001
From: wnd007 <zhu_zongru@hoperun.com>
Date: Fri, 28 Feb 2020 17:27:27 +0800
Subject: [PATCH] update spec and 0004-dvd+rw-tools-7.0-wctomb.patch

---
 0004-dvd+rw-tools-7.0-wctomb.patch |  4 +-
 dvd+rw-tools.spec                  | 59 +++++++++++++-----------------
 2 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/0004-dvd+rw-tools-7.0-wctomb.patch b/0004-dvd+rw-tools-7.0-wctomb.patch
index 56bd725..3d13fc8 100644
--- a/0004-dvd+rw-tools-7.0-wctomb.patch
+++ b/0004-dvd+rw-tools-7.0-wctomb.patch
@@ -1,5 +1,5 @@
---- transport.hxx~	2008-03-25 21:24:47.000000000 -0400
-+++ transport.hxx	2008-03-25 21:25:36.000000000 -0400
+--- ./transport.hxx~	2008-03-25 21:24:47.000000000 -0400
++++ ./transport.hxx	2008-03-25 21:25:36.000000000 -0400
 @@ -116,7 +116,7 @@
  extern "C" char *plusminus_locale()
  { static class __plusminus {
diff --git a/dvd+rw-tools.spec b/dvd+rw-tools.spec
index d36b2d1..264ca24 100644
--- a/dvd+rw-tools.spec
+++ b/dvd+rw-tools.spec
@@ -1,47 +1,41 @@
 Name:           dvd+rw-tools
 Version:        7.1
-Release:        31
+Release:        32
 Summary:        Application to master the Blu-ray Disc and DVD media
 License:        GPLv2
 URL:            http://fy.chalmers.se/~appro/linux/DVD+RW/
-Source0:        http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-%{version}.tar.gz
+Source0:        http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-7.1.tar.gz
 Source1:        index.html
-Patch0:         0000-dvd+rw-tools-7.0.manpatch
-Patch1:         0001-dvd+rw-tools-7.0-wexit.patch
-Patch2:         0002-dvd+rw-tools-7.0-glibc2.6.90.patch
-Patch3:         0003-dvd+rw-tools-7.0-reload.patch
-Patch4:         0004-dvd+rw-tools-7.0-wctomb.patch
-Patch5:         0005-dvd+rw-tools-7.0-dvddl.patch
-Patch6:         0006-dvd+rw-tools-7.1-noevent.patch
-Patch7:         0007-dvd+rw-tools-7.1-lastshort.patch
-Patch8:         0008-dvd+rw-tools-7.1-format.patch
-Patch9:         0009-dvd+rw-tools-7.1-bluray_srm+pow.patch
-Patch10:        0010-dvd+rw-tools-7.1-bluray_pow_freespace.patch
-Patch11:        0011-dvd+rw-tools-7.1-sysmacro-inc.patch
+Patch0000:      0000-dvd+rw-tools-7.0.manpatch
+Patch0001:      0001-dvd+rw-tools-7.0-wexit.patch
+Patch0002:      0002-dvd+rw-tools-7.0-glibc2.6.90.patch
+Patch0003:      0003-dvd+rw-tools-7.0-reload.patch
+Patch0004:      0004-dvd+rw-tools-7.0-wctomb.patch
+Patch0005:      0005-dvd+rw-tools-7.0-dvddl.patch
+Patch0006:      0006-dvd+rw-tools-7.1-noevent.patch
+Patch0007:      0007-dvd+rw-tools-7.1-lastshort.patch
+Patch0008:      0008-dvd+rw-tools-7.1-format.patch
+Patch0009:      0009-dvd+rw-tools-7.1-bluray_srm+pow.patch
+Patch0010:      0010-dvd+rw-tools-7.1-bluray_pow_freespace.patch
+Patch0011:      0011-dvd+rw-tools-7.1-sysmacro-inc.patch
 
-BuildRequires:  gcc gcc-c++ kernel-headers m4
+BuildRequires:  gcc-c++ kernel-headers m4
 Requires:       genisoimage
 
 %description
 As implied/already mentioned - to master the Blu-ray Disc and DVD media,
 both +RW/+R and -R[W].
 
-%package_help
+%package        help
+Summary:        Help docs for dvd+rw-tools
+Buildarch:      noarch
+Requires:       man info
+
+%description    help
+This package contains the help docs for dvd+rw-tools
 
 %prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p0
-%patch5 -p0
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
+%autosetup -n dvd+rw-tools-7.1 -p1
 
 install -m 644 %{SOURCE1} index.html
 
@@ -49,7 +43,7 @@ install -m 644 %{SOURCE1} index.html
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 export LDFLAGS="$RPM_LD_FLAGS"
-make WARN="-DDEFAULT_BUF_SIZE_MB=16 -DRLIMIT_MEMLOCK" %{?_smp_mflags}
+%make_build WARN="-DDEFAULT_BUF_SIZE_MB=16 -DRLIMIT_MEMLOCK"
 
 %install
 %makeinstall
@@ -64,13 +58,12 @@ make WARN="-DDEFAULT_BUF_SIZE_MB=16 -DRLIMIT_MEMLOCK" %{?_smp_mflags}
 
 %files
 %defattr(-,root,root)
-%license LICENSE
-%doc index.html
+%doc index.html LICENSE
 %{_bindir}/*
 
 %files help
 %{_mandir}/man1/*.1*
 
 %changelog
-* Wed Nov 20 2019 openEuler Buildteam <buildteam@openeuler.org> - 7.1-31
+* Wed Nov 20 2019 openEuler Buildteam <buildteam@openeuler.org> - 7.1-32
 - Package init