commit dvd+rw-tools for openSUSE:Factory

2019-04-10 Thread root
Hello community,

here is the log from the commit of package dvd+rw-tools for openSUSE:Factory 
checked in at 2019-04-11 08:49:08

Comparing /work/SRC/openSUSE:Factory/dvd+rw-tools (Old)
 and  /work/SRC/openSUSE:Factory/.dvd+rw-tools.new.27019 (New)


Package is "dvd+rw-tools"

Thu Apr 11 08:49:08 2019 rev:24 rq:692930 version:7.1

Changes:

--- /work/SRC/openSUSE:Factory/dvd+rw-tools/dvd+rw-tools.changes
2017-02-21 13:35:12.252484239 +0100
+++ /work/SRC/openSUSE:Factory/.dvd+rw-tools.new.27019/dvd+rw-tools.changes 
2019-04-11 08:49:11.176615491 +0200
@@ -1,0 +2,8 @@
+Tue Apr  9 22:26:01 UTC 2019 - Christophe Giboudeaux 
+
+- Add fix-build-with-recent-glibc.patch.
+- Refresh dvd+rw-tools-buffer.patch
+- Refresh growisofs-dvd-dl-undersized.patch
+- Run spec-cleaner
+
+---

New:

  fix-build-with-recent-glibc.patch



Other differences:
--
++ dvd+rw-tools.spec ++
--- /var/tmp/diff_new_pack.e8IYjG/_old  2019-04-11 08:49:12.696617057 +0200
+++ /var/tmp/diff_new_pack.e8IYjG/_new  2019-04-11 08:49:12.696617057 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package dvd+rw-tools
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -20,10 +20,9 @@
 Version:7.1
 Release:0
 Summary:Collection of Tools for Mastering Blu-ray and DVD+-RW/+-R Media
-License:GPL-2.0+
+License:GPL-2.0-or-later
 Group:  Productivity/Multimedia/CD/Record
-
-Url:http://fy.chalmers.se/~appro/linux/DVD+RW/
+URL:http://fy.chalmers.se/~appro/linux/DVD+RW/
 # http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-7.1.tar.gz
 Source0:%{name}-%{version}.tar.bz2
 # PATCH-FIX-OPENSUSE utf8ize.patch sbra...@suse.cz -- Convert some strings to 
UTF-8
@@ -36,12 +35,12 @@
 Patch3: dvd+rw-tools-gcc43.patch
 # PATCH-FIX-OPENSUSE dvd+rw-tools-buffer.patch bnc#354838 nadvor...@suse.cz -- 
Fix buffer size
 Patch4: dvd+rw-tools-buffer.patch
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-
+# PATCH-FIX-UPSTREAM fix-build-with-recent-glibc.patch
+Patch5: fix-build-with-recent-glibc.patch
 BuildRequires:  gcc-c++
 BuildRequires:  m4
 # According to Linux from scratch dvd+rw-tools needs this to function 
correctly with wodim
-Requires:   /usr/bin/mkisofs
+Requires:   %{_bindir}/mkisofs
 Requires:   libisoburn1
 
 %description
@@ -55,13 +54,14 @@
 #%%patch2
 %patch3
 %patch4
+%patch5 -p1
 
 %build
 export CFLAGS="%{optflags} -fno-strict-aliasing"
 export CXXFLAGS="%{optflags} -fno-strict-aliasing"
 
-make %{?_smp_mflags} CC="%{__cc}" CXX="%{__cxx}"
-make rpl8 btcflash %{?_smp_mflags} CC="%{__cc}" CXX="%{__cxx}"
+make %{?_smp_mflags} CC="gcc" CXX="g++"
+make rpl8 btcflash %{?_smp_mflags} CC="gcc" CXX="g++"
 
 %install
 make prefix=%{buildroot}%{_prefix} manprefix=%{buildroot}%{_mandir} install
@@ -70,8 +70,8 @@
 mv %{buildroot}%{_bindir}/btcflash %{buildroot}%{_bindir}/dvd+rw-tools-btcflash
 
 %files
-%defattr(-,root,root,-)
-%doc LICENSE index.html
+%license LICENSE
+%doc index.html
 %{_bindir}/dvd+rw-booktype
 %{_bindir}/dvd+rw-format
 %{_bindir}/dvd+rw-mediainfo
@@ -79,6 +79,6 @@
 %{_bindir}/dvd-ram-control
 %{_bindir}/growisofs
 %{_bindir}/rpl8
-%doc %{_mandir}/man1/growisofs.1%{ext_man}
+%{_mandir}/man1/growisofs.1%{?ext_man}
 
 %changelog

++ dvd+rw-tools-buffer.patch ++
--- /var/tmp/diff_new_pack.e8IYjG/_old  2019-04-11 08:49:12.720617082 +0200
+++ /var/tmp/diff_new_pack.e8IYjG/_new  2019-04-11 08:49:12.720617082 +0200
@@ -1,6 +1,6 @@
 --- transport.hxx
 +++ transport.hxx
-@@ -116,7 +116,7 @@
+@@ -124,7 +124,7 @@
  extern "C" char *plusminus_locale()
  { static class __plusminus {
  private:

++ fix-build-with-recent-glibc.patch ++
diff --git a/growisofs.c b/growisofs.c
index 6c47192..2602f1d 100644
--- a/growisofs.c
+++ b/growisofs.c
@@ -441,6 +441,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include "mp.h"
 
++ growisofs-dvd-dl-undersized.patch ++
--- /var/tmp/diff_new_pack.e8IYjG/_old  2019-04-11 08:49:12.736617099 +0200
+++ /var/tmp/diff_new_pack.e8IYjG/_new  2019-04-11 08:49:12.736617099 +0200
@@ -1,6 +1,6 @@
 --- ./growisofs_mmc.cpp.joe2006-04-27 20:45:00.788446635 +02

commit dvd+rw-tools for openSUSE:Factory

2017-02-21 Thread root
Hello community,

here is the log from the commit of package dvd+rw-tools for openSUSE:Factory 
checked in at 2017-02-21 13:35:11

Comparing /work/SRC/openSUSE:Factory/dvd+rw-tools (Old)
 and  /work/SRC/openSUSE:Factory/.dvd+rw-tools.new (New)


Package is "dvd+rw-tools"

Changes:

--- /work/SRC/openSUSE:Factory/dvd+rw-tools/dvd+rw-tools.changes
2013-05-16 15:34:24.0 +0200
+++ /work/SRC/openSUSE:Factory/.dvd+rw-tools.new/dvd+rw-tools.changes   
2017-02-21 13:35:12.252484239 +0100
@@ -1,0 +2,5 @@
+Thu Feb  9 12:25:20 UTC 2017 - dims...@opensuse.org
+
+- Explicitly BuildRequire m4.
+
+---



Other differences:
--
++ dvd+rw-tools.spec ++
--- /var/tmp/diff_new_pack.V8Aqlh/_old  2017-02-21 13:35:12.880395659 +0100
+++ /var/tmp/diff_new_pack.V8Aqlh/_new  2017-02-21 13:35:12.880395659 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package dvd+rw-tools
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -31,7 +31,7 @@
 # PATCH-FIX-OPENSUSE growisofs-dvd-dl-undersized.patch bnc#164032 
joes...@suse.de -- Allow users to burn images that would fit on a single-layer 
DVD to a dual-layer disc
 Patch1: growisofs-dvd-dl-undersized.patch
 # NOTE: commented out. PATCH-FIX-OPENSUSE growisofs-genisoimage.patch 
nadvor...@suse.cz -- Make the package call genisoimage directly, not via 
compatibility symlink
-#Patch2: growisofs-genisoimage.patch
+Patch2: growisofs-genisoimage.patch
 # PATCH-FIX-OPENSUSE dvd+rw-tools-gcc43.patch r...@suse.de -- Fix build with 
gcc-4.3
 Patch3: dvd+rw-tools-gcc43.patch
 # PATCH-FIX-OPENSUSE dvd+rw-tools-buffer.patch bnc#354838 nadvor...@suse.cz -- 
Fix buffer size
@@ -39,6 +39,7 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 BuildRequires:  gcc-c++
+BuildRequires:  m4
 # According to Linux from scratch dvd+rw-tools needs this to function 
correctly with wodim
 Requires:   /usr/bin/mkisofs
 Requires:   libisoburn1




commit dvd+rw-tools for openSUSE:Factory

2013-05-16 Thread h_root
Hello community,

here is the log from the commit of package dvd+rw-tools for openSUSE:Factory 
checked in at 2013-05-16 15:34:23

Comparing /work/SRC/openSUSE:Factory/dvd+rw-tools (Old)
 and  /work/SRC/openSUSE:Factory/.dvd+rw-tools.new (New)


Package is "dvd+rw-tools"

Changes:

--- /work/SRC/openSUSE:Factory/dvd+rw-tools/dvd+rw-tools.changes
2012-08-09 16:49:05.0 +0200
+++ /work/SRC/openSUSE:Factory/.dvd+rw-tools.new/dvd+rw-tools.changes   
2013-05-16 15:34:24.0 +0200
@@ -1,0 +2,8 @@
+Fri May 10 06:05:38 UTC 2013 - davejpla...@gmail.com
+
+- Change requirement from genisoimage to /usr/bin/mkisofs to allow
+  the use of either wodim or cdrtools and commented out patch 
+  growisofs-genisoimage.patch as this prevents the use of cdrtools
+  without user intervention.
+
+---



Other differences:
--
++ dvd+rw-tools.spec ++
--- /var/tmp/diff_new_pack.uWAyya/_old  2013-05-16 15:34:25.0 +0200
+++ /var/tmp/diff_new_pack.uWAyya/_new  2013-05-16 15:34:25.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package dvd+rw-tools
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,8 +30,8 @@
 Patch0: utf8ize.patch
 # PATCH-FIX-OPENSUSE growisofs-dvd-dl-undersized.patch bnc#164032 
joes...@suse.de -- Allow users to burn images that would fit on a single-layer 
DVD to a dual-layer disc
 Patch1: growisofs-dvd-dl-undersized.patch
-# PATCH-FIX-OPENSUSE growisofs-genisoimage.patch nadvor...@suse.cz -- Make the 
package call genisoimage directly, not via compatibility symlink
-Patch2: growisofs-genisoimage.patch
+# NOTE: commented out. PATCH-FIX-OPENSUSE growisofs-genisoimage.patch 
nadvor...@suse.cz -- Make the package call genisoimage directly, not via 
compatibility symlink
+#Patch2: growisofs-genisoimage.patch
 # PATCH-FIX-OPENSUSE dvd+rw-tools-gcc43.patch r...@suse.de -- Fix build with 
gcc-4.3
 Patch3: dvd+rw-tools-gcc43.patch
 # PATCH-FIX-OPENSUSE dvd+rw-tools-buffer.patch bnc#354838 nadvor...@suse.cz -- 
Fix buffer size
@@ -39,7 +39,9 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 BuildRequires:  gcc-c++
-Requires:   genisoimage
+# According to Linux from scratch dvd+rw-tools needs this to function 
correctly with wodim
+Requires:   /usr/bin/mkisofs
+Requires:   libisoburn1
 
 %description
 The dvd+rw-tools collection of tools makes it possible to burn images to
@@ -49,7 +51,7 @@
 %setup -q
 %patch0
 %patch1
-%patch2
+#%%patch2
 %patch3
 %patch4
 

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit dvd+rw-tools for openSUSE:Factory

2012-08-09 Thread h_root
Hello community,

here is the log from the commit of package dvd+rw-tools for openSUSE:Factory 
checked in at 2012-08-09 16:49:03

Comparing /work/SRC/openSUSE:Factory/dvd+rw-tools (Old)
 and  /work/SRC/openSUSE:Factory/.dvd+rw-tools.new (New)


Package is "dvd+rw-tools", Maintainer is "nadvor...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/dvd+rw-tools/dvd+rw-tools.changes
2011-10-04 18:09:09.0 +0200
+++ /work/SRC/openSUSE:Factory/.dvd+rw-tools.new/dvd+rw-tools.changes   
2012-08-09 16:49:05.0 +0200
@@ -1,0 +2,5 @@
+Wed Aug  8 09:12:16 UTC 2012 - cfarr...@suse.com
+
+- Update license in spec file to use SPDX format 
+
+---



Other differences:
--
++ dvd+rw-tools.spec ++
--- /var/tmp/diff_new_pack.CTvUt4/_old  2012-08-09 16:49:06.0 +0200
+++ /var/tmp/diff_new_pack.CTvUt4/_new  2012-08-09 16:49:06.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package dvd+rw-tools
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,15 +16,14 @@
 #
 
 
-
 Name:   dvd+rw-tools
 Version:7.1
-Release:45
+Release:0
 Summary:Collection of Tools for Mastering Blu-ray and DVD+-RW/+-R Media
+License:GPL-2.0+
+Group:  Productivity/Multimedia/CD/Record
 
-License:GPLv2+, Public Domain, Freeware
 Url:http://fy.chalmers.se/~appro/linux/DVD+RW/
-Group:  Productivity/Multimedia/CD/Record
 # http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-7.1.tar.gz
 Source0:%{name}-%{version}.tar.bz2
 # PATCH-FIX-OPENSUSE utf8ize.patch sbra...@suse.cz -- Convert some strings to 
UTF-8

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit dvd+rw-tools for openSUSE:Factory

2011-10-04 Thread h_root

Hello community,

here is the log from the commit of package dvd+rw-tools for openSUSE:Factory
checked in at Tue Oct 4 18:09:12 CEST 2011.




--- openSUSE:Factory/dvd+rw-tools/dvd+rw-tools.changes  2011-09-23 
01:55:55.0 +0200
+++ /mounts/work_src_done/STABLE/dvd+rw-tools/dvd+rw-tools.changes  
2011-09-30 16:52:02.0 +0200
@@ -1,0 +2,5 @@
+Fri Sep 30 14:51:50 UTC 2011 - u...@suse.com
+
+- cross-build fix: use %__cc, %__cxx macros
+
+---

calling whatdependson for head-i586




Other differences:
--
++ dvd+rw-tools.spec ++
--- /var/tmp/diff_new_pack.kRPrJf/_old  2011-10-04 18:09:07.0 +0200
+++ /var/tmp/diff_new_pack.kRPrJf/_new  2011-10-04 18:09:07.0 +0200
@@ -58,8 +58,8 @@
 export CFLAGS="%{optflags} -fno-strict-aliasing"
 export CXXFLAGS="%{optflags} -fno-strict-aliasing"
 
-make %{?_smp_mflags}
-make rpl8 btcflash %{?_smp_mflags}
+make %{?_smp_mflags} CC="%{__cc}" CXX="%{__cxx}"
+make rpl8 btcflash %{?_smp_mflags} CC="%{__cc}" CXX="%{__cxx}"
 
 %install
 make prefix=%{buildroot}%{_prefix} manprefix=%{buildroot}%{_mandir} install

continue with "q"...



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit dvd+rw-tools for openSUSE:Factory

2011-09-20 Thread h_root

Hello community,

here is the log from the commit of package dvd+rw-tools for openSUSE:Factory
checked in at Tue Sep 20 12:52:53 CEST 2011.




--- dvd+rw-tools/dvd+rw-tools.changes   2011-04-10 19:16:13.0 +0200
+++ /mounts/work_src_done/STABLE/dvd+rw-tools/dvd+rw-tools.changes  
2011-09-18 19:34:46.0 +0200
@@ -1,0 +2,6 @@
+Sun Sep 18 17:17:12 UTC 2011 - jeng...@medozas.de
+
+- Remove redundant tags/sections from specfile
+  (cf. packaging guidelines)
+
+---

calling whatdependson for head-i586




Other differences:
--
++ dvd+rw-tools.spec ++
--- /var/tmp/diff_new_pack.fA0uAM/_old  2011-09-20 12:52:49.0 +0200
+++ /var/tmp/diff_new_pack.fA0uAM/_new  2011-09-20 12:52:49.0 +0200
@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 
 Name:   dvd+rw-tools
@@ -68,9 +67,6 @@
 # Rename btcflash binary in order to avoid conflict with btcflash from cdrtools
 mv %{buildroot}%{_bindir}/btcflash %{buildroot}%{_bindir}/dvd+rw-tools-btcflash
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root,-)
 %doc LICENSE index.html






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit dvd+rw-tools for openSUSE:Factory

2011-04-11 Thread h_root

Hello community,

here is the log from the commit of package dvd+rw-tools for openSUSE:Factory
checked in at Mon Apr 11 10:49:50 CEST 2011.




--- dvd+rw-tools/dvd+rw-tools.changes   2008-08-19 17:14:07.0 +0200
+++ /mounts/work_src_done/STABLE/dvd+rw-tools/dvd+rw-tools.changes  
2011-04-10 19:16:13.0 +0200
@@ -1,0 +2,16 @@
+Sun Apr 10 17:06:21 UTC 2011 - asterios.dra...@gmail.com
+
+- Spec file updates:
+  * Changes based on rpmdevtools templates and spec-cleaner run.
+  * Added description for the patches based on openSUSE Patches Guidelines.
+  * Added genisoimage in Requires:.
+  * Updates in Summary: and %description.
+  * Compile the package with -fno-strict-aliasing.
+  * Rename btcflash binary to "dvd+rw-tools-btcflash" in order to avoid
+conflict with btcflash from cdrtools.
+  * Small updates in %files section.
+  * Remove the entries from %changelog.
+- Removed rpm_opt_flags.diff patch (not required since the flags can be set in
+  the spec file).
+
+---

calling whatdependson for head-i586


Old:

  rpm_opt_flags.diff



Other differences:
--
++ dvd+rw-tools.spec ++
--- /var/tmp/diff_new_pack.mQvkCG/_old  2011-04-11 10:47:50.0 +0200
+++ /var/tmp/diff_new_pack.mQvkCG/_new  2011-04-11 10:47:50.0 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package dvd+rw-tools (Version 7.1)
+# spec file for package dvd+rw-tools
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,59 +19,68 @@
 
 
 Name:   dvd+rw-tools
-BuildRequires:  gcc-c++
-License:GPL v2 or later; Public Domain, Freeware
-Group:  Productivity/Multimedia/CD/Record
-AutoReqProv:on
 Version:7.1
-Release:35
-Source: dvd+rw-tools-%{version}.tar.bz2
+Release:45
+Summary:Collection of Tools for Mastering Blu-ray and DVD+-RW/+-R Media
+
+License:GPLv2+, Public Domain, Freeware
 Url:http://fy.chalmers.se/~appro/linux/DVD+RW/
-Summary:Collection of Tools for Mastering DVD+RW/+R Media
+Group:  Productivity/Multimedia/CD/Record
+# http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-7.1.tar.gz
+Source0:%{name}-%{version}.tar.bz2
+# PATCH-FIX-OPENSUSE utf8ize.patch sbra...@suse.cz -- Convert some strings to 
UTF-8
+Patch0: utf8ize.patch
+# PATCH-FIX-OPENSUSE growisofs-dvd-dl-undersized.patch bnc#164032 
joes...@suse.de -- Allow users to burn images that would fit on a single-layer 
DVD to a dual-layer disc
+Patch1: growisofs-dvd-dl-undersized.patch
+# PATCH-FIX-OPENSUSE growisofs-genisoimage.patch nadvor...@suse.cz -- Make the 
package call genisoimage directly, not via compatibility symlink
+Patch2: growisofs-genisoimage.patch
+# PATCH-FIX-OPENSUSE dvd+rw-tools-gcc43.patch r...@suse.de -- Fix build with 
gcc-4.3
+Patch3: dvd+rw-tools-gcc43.patch
+# PATCH-FIX-OPENSUSE dvd+rw-tools-buffer.patch bnc#354838 nadvor...@suse.cz -- 
Fix buffer size
+Patch4: dvd+rw-tools-buffer.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-Patch1: rpm_opt_flags.diff
-Patch4: utf8ize.patch
-Patch7: growisofs-dvd-dl-undersized.patch
-Patch8: growisofs-genisoimage.patch
-Patch9: dvd+rw-tools-gcc43.patch
-Patch10:dvd+rw-tools-buffer.patch
 
-%description
-Collection of Tools for Mastering DVD+RW/+R Media
+BuildRequires:  gcc-c++
+Requires:   genisoimage
 
-Authors:
-
-ap...@fy.chalmers.se
+%description
+The dvd+rw-tools collection of tools makes it possible to burn images to
+Blu-ray and DVD+-RW/+-R media.
 
 %prep
 %setup -q
+%patch0
 %patch1
+%patch2
+%patch3
 %patch4
-%patch7
-%patch8
-%patch9
-%patch10
 
 %build
-make
-make rpl8 btcflash
+export CFLAGS="%{optflags} -fno-strict-aliasing"
+export CXXFLAGS="%{optflags} -fno-strict-aliasing"
+
+make %{?_smp_mflags}
+make rpl8 btcflash %{?_smp_mflags}
 
 %install
-make prefix=$RPM_BUILD_ROOT/usr manprefix=$RPM_BUILD_ROOT%{_mandir} install
+make prefix=%{buildroot}%{_prefix} manprefix=%{buildroot}%{_mandir} install
+
+# Rename btcflash binary in order to avoid conflict with btcflash from cdrtools
+mv %{buildroot}%{_bindir}/btcflash %{buildroot}%{_bindir}/dvd+rw-tools-btcflash
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
-%defattr(-, root, root)
-%doc index.html
-%doc %{_mandir}/man1/growisofs.1.gz
-/usr/bin/dvd+rw-booktype
-/usr/bin/dvd+rw-format
-/usr/bin/dvd+rw-mediainfo
-/usr/bin/dvd-ram-control
-/usr/bin/growisofs
-/usr/bin/btcflash
-/usr/bin/rpl8
+%defattr(-,root,root,-)
+%doc LICENSE index.html
+%{_bindir}/dvd+rw-booktype
+%{_bi