[deco-archive] Version update.

Orcan Ogetbil oget at fedoraproject.org
Wed Feb 27 04:47:23 UTC 2013 

commit ebaa0d761fde04fd812f595cfab13139739fb3c4
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Tue Feb 26 23:47:19 2013 -0500

    Version update.

 .gitignore            |    1 +
 deco-archive-ape.diff |    6 +++---
 deco-archive-shn.diff |    6 +++---
 deco-archive-zoo.diff |    6 +++---
 deco-archive.spec     |   35 ++++++++++++++++++-----------------
 sources               |    2 +-
 6 files changed, 29 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7390236..18c5ac6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 deco-archive-1.5.1.tar.gz
+/deco-archive-1.6.tar.gz
diff --git a/deco-archive-ape.diff b/deco-archive-ape.diff
index ee4c66a..dcaa787 100644
--- a/deco-archive-ape.diff
+++ b/deco-archive-ape.diff
@@ -1,6 +1,6 @@
-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
+diff -rupN deco-archive-1.6.old/x/ape/extract deco-archive-1.6/x/ape/extract
+--- deco-archive-1.6.old/x/ape/extract	2013-02-24 10:24:11.000000000 -0500
++++ deco-archive-1.6/x/ape/extract	2013-02-26 23:42:26.627191594 -0500
 @@ -1,3 +1,3 @@
  #!/bin/sh
  
diff --git a/deco-archive-shn.diff b/deco-archive-shn.diff
index 26e4022..2ccf2b5 100644
--- a/deco-archive-shn.diff
+++ b/deco-archive-shn.diff
@@ -1,6 +1,6 @@
-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
+diff -rupN deco-archive-1.6.old/x/shn/extract deco-archive-1.6/x/shn/extract
+--- deco-archive-1.6.old/x/shn/extract	2013-02-24 10:24:11.000000000 -0500
++++ deco-archive-1.6/x/shn/extract	2013-02-26 23:43:26.621863195 -0500
 @@ -1,3 +1,3 @@
  #!/bin/sh
  
diff --git a/deco-archive-zoo.diff b/deco-archive-zoo.diff
index 499b8eb..74b2d6c 100644
--- a/deco-archive-zoo.diff
+++ b/deco-archive-zoo.diff
@@ -1,6 +1,6 @@
-diff -rupN deco-archive-1.4.old/zoo/extract deco-archive-1.4/zoo/extract
---- deco-archive-1.4.old/zoo/extract	2009-01-18 08:04:29.000000000 -0500
-+++ deco-archive-1.4/zoo/extract	2009-04-04 21:08:44.000000000 -0400
+diff -rupN deco-archive-1.6.old/x/zoo/extract deco-archive-1.6/x/zoo/extract
+--- deco-archive-1.6.old/x/zoo/extract	2013-02-24 10:24:11.000000000 -0500
++++ deco-archive-1.6/x/zoo/extract	2013-02-26 23:44:18.394579709 -0500
 @@ -1,3 +1,3 @@
  #!/bin/sh
  
diff --git a/deco-archive.spec b/deco-archive.spec
index 61b6718..ddccdc5 100644
--- a/deco-archive.spec
+++ b/deco-archive.spec
@@ -1,6 +1,6 @@
 Name:           deco-archive
-Version:        1.5.1
-Release:        5%{?dist}
+Version:        1.6
+Release:        1%{?dist}
 Summary:        Extraction scripts for various archive formats for use of deco
 Group:          Applications/Archiving
 License:        GPLv3
@@ -15,7 +15,6 @@ Patch1:         deco-archive-shn.diff
 # Use unzoo instead of zoo to extract zoo archives. The latter is not available
 # in Fedora
 Patch2:         deco-archive-zoo.diff
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 Requires:       bzip2,coreutils,cpio,gzip,rpm,tar
@@ -44,21 +43,21 @@ make install DESTDIR=%{buildroot} SHARE=%{_datadir}/%{name}
 install -dm 755 %{buildroot}/%{_var}/lib/deco
 
 # Install the default archivers and add the others to the ghost files list
+pushd x
 for i in *; do
    if [[ -d $i || -h $i ]] ; then
       ln -s ../../..%{_datadir}/%{name}/"$i" %{buildroot}/%{_var}/lib/deco
       case $i in
-         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 ;;
+         bz2|cpio|"cpio\.bz2"|"cpio\.gz"|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 ;;
+            echo "%ghost %{_var}/lib/deco/$i" >> ../%{name}-ghosts.list ;;
       esac
    fi
 done
+popd
 sed -e 's@[[\\]@?@g' %{name}-ghosts.list %{name}-links.list > %{name}.files
 
-%clean
-rm -rf %{buildroot}
 
 
 %define do_triggerin() for i in %1; do (if [ ! -e %{_var}/lib/deco/$i ]; then ln -s ../../..%{_datadir}/%{name}/"$i" %{_var}/lib/deco/ || : ; fi); done;
@@ -111,9 +110,9 @@ rm -rf %{buildroot}
 %do_triggerun {cbr,"rar|[rst][0-9]{2}","part[0-9]+\.rar"}
 
 %triggerin -- unzip
-%do_triggerin {cbz,ear,jar,od{c,f,g,i,m,p,s,t},ot{c,f,g,h,i,p,s,t},oxt,pk{3,4},wsz,xpi,zip}
+%do_triggerin {cbz,ear,ipsw,jar,od{c,f,g,i,m,p,s,t},ot{c,f,g,h,i,p,s,t},oxt,pk{3,4},wsz,xpi,zip}
 %triggerun -- unzip
-%do_triggerun {cbz,ear,jar,od{c,f,g,i,m,p,s,t},ot{c,f,g,h,i,p,s,t},oxt,pk{3,4},wsz,xpi,zip}
+%do_triggerun {cbz,ear,ipsw,jar,od{c,f,g,i,m,p,s,t},ot{c,f,g,h,i,p,s,t},oxt,pk{3,4},wsz,xpi,zip}
 
 %triggerin -- flac
 %do_triggerin flac
@@ -131,9 +130,9 @@ rm -rf %{buildroot}
 %do_triggerun {lrz,"tar\.lrz"}
 
 %triggerin -- lzip
-%do_triggerin {lz,"tar\.lz"}
+%do_triggerin {lz,"cpio\.lz","tar\.lz"}
 %triggerun -- lzip
-%do_triggerun {lz,"tar\.lz"}
+%do_triggerun {lz,"cpio\.lz","tar\.lz"}
 
 %triggerin -- xz-lzma-compat
 %do_triggerin {lzma,"tar\.lzma",tlz}
@@ -141,14 +140,14 @@ rm -rf %{buildroot}
 %do_triggerun {lzma,"tar\.lzma",tlz}
 
 %triggerin -- lzop
-%do_triggerin lzo
+%do_triggerin {lzo,"cpio\.lzo"}
 %triggerun -- lzop
-%do_triggerun lzo
+%do_triggerun {lzo,"cpio\.lzo"}
 
 %triggerin -- xz
-%do_triggerin {"tar\.xz",txz,xz}
+%do_triggerin {"cpio\.xz","tar\.xz",txz,xz}
 %triggerun -- xz
-%do_triggerun {"tar\.xz",txz,xz}
+%do_triggerun {"cpio\.xz","tar\.xz",txz,xz}
 
 %triggerin -- rzip
 %do_triggerin {rz,"tar\.rz"}
@@ -166,11 +165,13 @@ rm -rf %{buildroot}
 %do_triggerun zoo
 
 %files -f %{name}.files
-%defattr(-,root,root,-)
 %doc LICENSE CREDITS NEWS README
 %{_datadir}/%{name}
 
 %changelog
+* Sun Feb 24 2013 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.6-1
+- Version update.
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 02b73b0..0418d69 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5f85c4782edcea9fd174096a9a17eb18  deco-archive-1.5.1.tar.gz
+744c2b5345e31acf5b77b63b878fccd0  deco-archive-1.6.tar.gz

More information about the scm-commits mailing list