rpms/deco-archive/devel deco-archive-ape.diff, NONE, 1.1 .cvsignore, 1.2, 1.3 deco-archive.spec, 1.1, 1.2 sources, 1.2, 1.3

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/deco-archive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8823

Modified Files:
	.cvsignore deco-archive.spec sources 
Added Files:
	deco-archive-ape.diff 
Log Message:
* Fri Dec 12 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.3.1-1
- Version update
- Use ffmpeg instead of wine+Monkey's Audio for converting ape to wav


deco-archive-ape.diff:

--- NEW FILE deco-archive-ape.diff ---
diff -rupN deco-archive-1.2.old/ape/extract deco-archive-1.2/ape/extract
--- deco-archive-1.2.old/ape/extract	2008-09-28 15:21:35.000000000 -0400
+++ deco-archive-1.2/ape/extract	2008-12-12 20:33:37.000000000 -0500
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec wine "C:\\Program Files\\Monkey's Audio\\MAC.exe" "$1" "$Name.wav" -d
+exec ffmpeg -i "$1" "$Name".wav 2>/dev/null


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deco-archive/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Dec 2008 01:59:56 -0000	1.2
+++ .cvsignore	13 Dec 2008 22:37:17 -0000	1.3
@@ -1 +1 @@
-deco-archive-1.2.tar.gz
+deco-archive-1.3.1.tar.gz


Index: deco-archive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deco-archive/devel/deco-archive.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deco-archive.spec	4 Dec 2008 01:59:56 -0000	1.1
+++ deco-archive.spec	13 Dec 2008 22:37:17 -0000	1.2
@@ -1,11 +1,14 @@
 Name:           deco-archive
-Version:        1.2
-Release:        6%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        Extraction scripts for various archive formats for use of deco
 Group:          Applications/Archiving
 License:        GPLv3
 URL:            http://hartlich.com/deco/
 Source0:        http://hartlich.com/deco/archive/download/%{name}-%{version}.tar.gz
+# Use ffmpeg instead of wine+Monkey's Audio for converting ape to wav.
+# Patch sent to upstream via email
+Patch0:         deco-archive-ape.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -18,6 +21,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 echo "Nothing to build."
@@ -70,12 +74,9 @@
 %triggerun -- unace
 %do_triggerun "ace|[c0-9][0-9]{2}"
 
-# Note that the following also requires the installation
-# of Monkey's Audio through wine
-# http://www.monkeysaudio.com/download.html
-%triggerin -- wine
+%triggerin -- ffmpeg
 %do_triggerin ape
-%triggerun -- wine
+%triggerun -- ffmpeg
 %do_triggerun ape
 
 %triggerin -- arc
@@ -113,6 +114,16 @@
 %triggerun -- lha
 %do_triggerun {lha,lzh}
 
+%triggerin -- lrzip
+%do_triggerin {lrz,"tar\.lrz"}
+%triggerun -- lrzip
+%do_triggerun {lrz,"tar\.lrz"}
+
+%triggerin -- lzip
+%do_triggerin {lz,"tar\.lz"}
+%triggerun -- lzip
+%do_triggerun {lz,"tar\.lz"}
+
 %triggerin -- lzma
 %do_triggerin {lzma,"tar\.lzma",tlz}
 %triggerun -- lzma
@@ -123,6 +134,10 @@
 %triggerun -- lzop
 %do_triggerun lzo
 
+%triggerin -- rzip
+%do_triggerin {rz,"tar\.rz"}
+%triggerun -- rzip
+%do_triggerun {rz,"tar\.rz"}
 
 %files -f %{name}.files
 %defattr(-,root,root,-)
@@ -130,6 +145,10 @@
 %{_datadir}/%{name}
 
 %changelog
+* Fri Dec 12 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.3.1-1
+- Version update
+- Use ffmpeg instead of wine+Monkey's Audio for converting ape to wav
+
 * Mon Dec 01 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.2-6
 - Code cleanup
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deco-archive/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Dec 2008 01:59:56 -0000	1.2
+++ sources	13 Dec 2008 22:37:17 -0000	1.3
@@ -1 +1 @@
-5f3900969477445bd044009a91cab18e  deco-archive-1.2.tar.gz
+a1ede492c99803bdd134bff280256074  deco-archive-1.3.1.tar.gz