2:50 p.m.
commit df7dcf844c169d1255386fb7682948ea924a9216
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Jul 14 15:49:05 2016 +0100
fix bz4123
.gitignore | 1 +
License.htm | 44 ++++++++++++++++++++++
mac-3.99-u4-b5-analyse.patch | 25 -------------
mac-3.99-u4-b5-gcc44.patch | 27 --------------
mac-3.99-u4-b5-gcc45.patch | 9 -----
mac-3.99-u4-b5-gcc6.patch | 87 --------------------------------------------
mac.spec | 27 +++++++-------
sources | 2 +-
8 files changed, 60 insertions(+), 162 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 545c721..bb3b048 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
mac-3.99-u4-b5.tar.gz
+/monkeys-audio_4.11-u4-b5-s7.orig.tar.gz
diff --git a/License.htm b/License.htm
new file mode 100644
index 0000000..3081335
--- /dev/null
+++ b/License.htm
@@ -0,0 +1,44 @@
+<html>
+
+<head>
+<meta http-equiv="Content-Type" content="text/html;
charset=windows-1252">
+<meta name="GENERATOR" content="Microsoft FrontPage 4.0">
+<meta name="ProgId" content="FrontPage.Editor.Document">
+<title>Well</title>
+</head>
+
+<body>
+
+<p align="center"><font face="Verdana"
size="4">Monkey's Audio Source Code
+License Agreement</font></p>
+<p><font face="Verdana" size="2"><b>License
Agreement</b></font></p>
+<p><font face="Verdana" size="2">1. The Monkey's
Audio SDK and source code can
+be freely used to add APE format playback, encoding, or tagging support to any
+product, free or commercial. Use of the code for proprietary efforts that
+don't support the official APE format require written consent of the
author.</font></p>
+<p><font face="Verdana" size="2">2. Monkey's Audio
source can be included in GPL
+and open-source software, although Monkey's Audio itself will not be subjected
+to external licensing requirements or other viral source
restrictions.</font></p>
+<p><font face="Verdana" size="2">3. Code changes and
improvements must be
+contributed back to the Monkey's Audio project free from restrictions or
+royalties for the sake of the common good, unless exempted by express written
+consent of the author.</font></p>
+<p><font face="Verdana" size="2">4. Any source code,
ideas, or libraries used
+must be plainly acknowledged in the software using the code.</font></p>
+<p><font face="Verdana" size="2">5. Although the software
has been tested thoroughly, the author is in no way responsible for damages due to
+bugs or misuse. </font></p>
+<p><font face="Verdana" size="2">6. If you do not
completely agree with all of
+the previous stipulations, you must cease using this source code and remove it
+from your storage device.</font></p>
+<p align="center"
style="margin:0in;margin-bottom:.0001pt;text-align:center"> </p>
+<p align="center"
style="margin:0in;margin-bottom:.0001pt;text-align:center"><i><font
face="Verdana" size="2">All
+rights not expressly granted here are reserved by Matthew T.
Ashland.</font></i></p>
+<p align="center"
style="margin:0in;margin-bottom:.0001pt;text-align:center"><font
size="2"><font face="Verdana"><span
style="mso-bidi-font-family: Arial Unicode
MS"> </span></font></font></p>
+<p align="center"
style="margin:0in;margin-bottom:.0001pt;text-align:center"><font
face="Verdana" size="2">-
+All materials and programs copyrighted �2000-2006 by Matthew T. Ashland
-</font></p>
+<p align="center"
style="margin:0in;margin-bottom:.0001pt;text-align:center"><font
face="Verdana" size="2">-
+All rights reserved. -</font></p>
+
+</body>
+
+</html>
diff --git a/mac.spec b/mac.spec
index 063a4fe..5fe377e 100644
--- a/mac.spec
+++ b/mac.spec
@@ -1,17 +1,16 @@
Name: mac
-Version: 3.99
-Release: 13.u4b5%{?dist}
+Version: 4.11
+Release: 1.u4b5%{?dist}
Summary: Monkey's Audio Codec (MAC) utility
Group: Applications/Multimedia
License: Monkey's Audio Source Code License Agreement
URL: http://supermmx.org/linux/mac/
-Source0: http://supermmx.org/resources/linux/mac/mac-%{version}-u4-b5.tar.gz
+# use debian multimedia source
+Source0:
ftp://ftp.deb-multimedia.org/pool/main/m/monkeys-audio/monkeys-audio_%{ve...
Source1: mac-permission_to_redistribute.txt
-Patch0: mac-3.99-u4-b5-gcc44.patch
-Patch1: mac-3.99-u4-b5-analyse.patch
-Patch2: mac-3.99-u4-b5-gcc45.patch
-Patch3: mac-3.99-u4-b5-gcc6.patch
+Source2: License.htm
+Patch0: mac-4.11-u4-b5-s7-gcc6.patch
%ifarch i686 x86_64
BuildRequires: yasm
@@ -56,14 +55,12 @@ developing applications that use %{name}.
%prep
-%setup -q -n %{name}-%{version}-u4-b5
-%patch0 -p1 -b .gcc44
-%patch1 -p1 -b .an
-%patch2 -p1 -b .gcc45
-%patch3 -p1 -b .gcc6
+%setup -q -n monkeys-audio-%{version}-u4-b5-s7
+%patch0 -p1 -b .gcc6
#Copy permission to redistribute
cp -p %{SOURCE1} .
+cp -p %{SOURCE2} src/
# Fix encoding issues:
for txtfile in src/Credits.txt ; do
@@ -116,13 +113,17 @@ execstack -c $RPM_BUILD_ROOT%{_libdir}/libmac.so.2.0.0
%{_libdir}/*.so.*
%files devel
-%doc TODO src/Readme.htm src/Credits.txt src/History.txt
+%doc TODO src/Credits.txt src/History.txt
%{_includedir}/mac/
%{_libdir}/*.so
%changelog
+* Thu Jul 14 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 4.11-1.u4b5
+- fix bz4123
+- use monkeys-audio source from Debian multimedia
+
* Fri Jul 01 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 3.99-13.u4b5
- patch for gcc-6
diff --git a/sources b/sources
index aa526c3..723ad17 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-75716b342e07deae58f56a2522362006 mac-3.99-u4-b5.tar.gz
+c438547f6336f2eda3ca820c08664aea monkeys-audio_4.11-u4-b5-s7.orig.tar.gz