rpms/deco-archive/F-10 deco-archive-shn.diff, NONE, 1.1 .cvsignore, 1.3, 1.4 deco-archive.spec, 1.3, 1.4 sources, 1.3, 1.4

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/deco-archive/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24898

Modified Files:
	.cvsignore deco-archive.spec sources 
Added Files:
	deco-archive-shn.diff 
Log Message:
* Mon Jan 19 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.4
- Version update. New extensions: gem and tbz2
- Handle .shn format (shorten) with ffmpeg (if installed)
- Handle .alz format with unalz (if installed)


deco-archive-shn.diff:

--- NEW FILE deco-archive-shn.diff ---
diff -rupN deco-archive-1.4.old/shn/extract deco-archive-1.4/shn/extract
--- deco-archive-1.4.old/shn/extract	2009-01-18 08:04:29.000000000 -0500
+++ deco-archive-1.4/shn/extract	2009-01-19 11:14:07.000000000 -0500
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec shorten -x "$1"
+exec ffmpeg -i "$1" "$Name".wav 2>/dev/null


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/deco-archive/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Dec 2008 22:47:30 -0000	1.3
+++ .cvsignore	20 Jan 2009 02:09:36 -0000	1.4
@@ -1 +1 @@
-deco-archive-1.3.1.tar.gz
+deco-archive-1.4.tar.gz


Index: deco-archive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deco-archive/F-10/deco-archive.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- deco-archive.spec	13 Dec 2008 22:52:17 -0000	1.3
+++ deco-archive.spec	20 Jan 2009 02:09:36 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           deco-archive
-Version:        1.3.1
-Release:        1%{?dist}.1
+Version:        1.4
+Release:        1%{?dist}
 Summary:        Extraction scripts for various archive formats for use of deco
 Group:          Applications/Archiving
 License:        GPLv3
@@ -9,6 +9,9 @@
 # Use ffmpeg instead of wine+Monkey's Audio for converting ape to wav.
 # Patch sent to upstream via email
 Patch0:         deco-archive-ape.diff
+# Use ffmpeg instead of non-free shorten decoder, which is not available
+# in Fedora
+Patch1:         deco-archive-shn.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -22,6 +25,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 echo "Nothing to build."
@@ -40,7 +44,7 @@
    if [[ -d $i || -h $i ]] ; then
       ln -s ../../..%{_datadir}/%{name}/"$i" %{buildroot}/%{_var}/lib/deco
       case $i in
-         bz2|cpio|gz|rpm|z|tar|"tar\.bz2"|"tar\.gz"|"tar\.z"|taz|tbz|tgz)
+         bz2|cpio|gem|gz|rpm|z|tar|"tar\.bz2"|"tar\.gz"|"tar\.z"|taz|tbz|tbz2|tgz)
             echo "%{_var}/lib/deco/$i" >> %{name}-links.list ;;
          *)
             echo "%ghost %{_var}/lib/deco/$i" >> %{name}-ghosts.list ;;
@@ -57,7 +61,7 @@
 %define do_triggerun() ( [ $2 -gt 0 ] && [ $1 -gt 0 ] ) || (for i in %1; do ( rm -f %{_var}/lib/deco/$i || : ); done;)
 
 # Not handled (yet?):
-# alz (unalz), dpkg-deb (deb,udeb), shn (shorten), zoo
+# dpkg-deb (deb,udeb), zoo
 
 %triggerin -- binutils
 %do_triggerin {a,ar}
@@ -75,9 +79,9 @@
 %do_triggerun "ace|[c0-9][0-9]{2}"
 
 %triggerin -- ffmpeg
-%do_triggerin ape
+%do_triggerin {ape,shn}
 %triggerun -- ffmpeg
-%do_triggerun ape
+%do_triggerun {ape,shn}
 
 %triggerin -- arc
 %do_triggerin {arc,ark,sue}
@@ -139,36 +143,46 @@
 %triggerun -- rzip
 %do_triggerun {rz,"tar\.rz"}
 
+%triggerin -- unalz
+%do_triggerin alz
+%triggerun -- unalz
+%do_triggerun alz
+
 %files -f %{name}.files
 %defattr(-,root,root,-)
 %doc LICENSE CREDITS NEWS README
 %{_datadir}/%{name}
 
 %changelog
-* Fri Dec 12 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.3.1-1.1
+* Mon Jan 19 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.4
+- Version update. New extensions: gem and tbz2
+- Handle .shn format (shorten) with ffmpeg (if installed)
+- Handle .alz format with unalz (if installed)
+
+* Fri Dec 12 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.3.1-1.1
 - Rebuild
 
-* Fri Dec 12 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.3.1-1
+* Fri Dec 12 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [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
+* Mon Dec 01 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.2-6
 - Code cleanup
 
-* Sun Nov 30 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.2-5
+* Sun Nov 30 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.2-5
 - Workaround for the "broken ghosts".
 
-* Sun Nov 30 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.2-4
+* Sun Nov 30 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.2-4
 - Fixed a typo in the %%do_trigger* of tar\.lzma
 - Added rpm to the default list
 - Attempted to mark the non-default archivers as ghosts
 
-* Thu Nov 20 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.2-3
+* Thu Nov 20 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.2-3
 - License is GPLv3.
 - Install the scripts in %%{_datadir}/%%{name} and the symlinks in %%{var}/lib/deco.
 
-* Wed Nov 19 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.2-2
+* Wed Nov 19 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.2-2
 - Added conditionals to the trigger functions to suppress warnings on updates.
 
-* Wed Oct 29 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.2-1
+* Wed Oct 29 2008 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.2-1
 - Initial build.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/deco-archive/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Dec 2008 22:47:30 -0000	1.3
+++ sources	20 Jan 2009 02:09:36 -0000	1.4
@@ -1 +1 @@
-a1ede492c99803bdd134bff280256074  deco-archive-1.3.1.tar.gz
+b48cd159fb73a65a4d6e491351c2e57e  deco-archive-1.4.tar.gz