diff --git a/cdrdao-1.2.3-stat.patch b/cdrdao-1.2.3-stat.patch deleted file mode 100644 index 5a68e7130df5f9802b450971f52a33c3f3dd393d..0000000000000000000000000000000000000000 --- a/cdrdao-1.2.3-stat.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up cdrdao-1.2.3/dao/ScsiIf-linux.cc.stat cdrdao-1.2.3/dao/ScsiIf-linux.cc ---- cdrdao-1.2.3/dao/ScsiIf-linux.cc.stat 2010-01-20 20:11:36.000000000 +0100 -+++ cdrdao-1.2.3/dao/ScsiIf-linux.cc 2010-01-20 20:14:07.000000000 +0100 -@@ -19,6 +19,9 @@ - - #include - -+#include -+#include -+ - #include - #include - #include diff --git a/cdrdao-1.2.3.tar.bz2 b/cdrdao-1.2.3.tar.bz2 deleted file mode 100644 index b92580abe43bcbd33596d7ab561c8f1d1661a6bc..0000000000000000000000000000000000000000 Binary files a/cdrdao-1.2.3.tar.bz2 and /dev/null differ diff --git a/cdrdao-1.2.3.tar.gz b/cdrdao-1.2.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..21072b4003fcf17e6cbc7e9e0c984fad548a478c Binary files /dev/null and b/cdrdao-1.2.3.tar.gz differ diff --git a/cdrdao.spec b/cdrdao.spec index cde952f481a8b0a1025fb20ceb0f498e6611284e..daf43c31cd3f1afd5bb054434e9851e472521d9d 100644 --- a/cdrdao.spec +++ b/cdrdao.spec @@ -1,16 +1,17 @@ +%global bname rel_1_2_3 Summary: Records audio or data CD-Rs in disk-at-once (DAO) mode Name: cdrdao Version: 1.2.3 -Release: 36 +Release: 37 License: GPLv2+ URL: http://cdrdao.sourceforge.net/ -Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +Source0: https://github.com/cdrdao/%{name}/archive/%{bname}/%{name}-%{version}.tar.gz BuildRequires: gcc-c++ gcc libsigc++20-devel libao-devel BuildRequires: libvorbis-devel >= 1.0 libmad-devel BuildRequires: lame-devel autoconf GConf2-devel -Patch1: cdrdao-1.2.3-stat.patch +Patch1: cdrdao-1.2.3-helpmansync.patch Patch2: cdrdao-1.2.3-format_security.patch Patch3: cdrdao-1.2.3-narrowing.patch Patch4: cdrdao-1.2.3-lame-3.100.patch @@ -22,7 +23,11 @@ on a textual description of the CD contents (toc-file). %package_help %prep -%autosetup -p 1 +%autosetup -n %{name}-%{bname} -p 1 +if [ -e autogen.sh ]; then + sed -i '/autoreconf/d' autogen.sh + ./autogen.sh +fi %build autoreconf -v -f -i -I. @@ -49,6 +54,9 @@ autoreconf -v -f -i -I. %{_mandir}/man1 %changelog +* Thu Nov 26 2020 maminjie - 1.2.3-37 +- switch Source0 to github and optimize patch file + * Thu Jan 16 2020 fengbing - 1.2.3-36 - Type:N/A - ID:N/A diff --git a/cdrdao.yaml b/cdrdao.yaml index 00bbaf050db91e87f0ad529e5c29027a1bf150ae..f8e6794a38e1e66b7f1eb3df4e597be5f4a32b5c 100644 --- a/cdrdao.yaml +++ b/cdrdao.yaml @@ -1,4 +1,4 @@ -version_control: NA -src_repo: NA -tag_prefix: NA -seperator: NA +version_control: github +src_repo: cdrdao/cdrdao +tag_prefix: "rel_" +separator: "_"