gzip: Move everything to /usr.

diff --git a/gzip/gzip.nm b/gzip/gzip.nm
index 624226a451b4aba8fa6a9c70bf1a4d15af0215f6..6c7a1693533ef5757cc642a15651def7d9f334ab 100644 (file)
--- a/gzip/gzip.nm
+++ b/gzip/gzip.nm
@@ -5,7 +5,7 @@
 
 name       = gzip
 version    = 1.4
-release    = 2
+release    = 3
 
 groups     = Applications/Compression
 url        = http://www.gzip.org/
@@ -20,33 +20,29 @@ end
 source_dl  =
 
 build
-       build
-               # NO_ASM is for textrels.
+       # NO_ASM is for textrels.
+       configure_options += \
                DEFS=NO_ASM \
-               CPPFLAGS="-DHAVE_LSTAT" \
-               ./configure \
-                       --prefix=/usr \
-                       --bindir=/bin
-
-               make %{PARALLELISMFLAGS}
-       end
+               CPPFLAGS="-DHAVE_LSTAT"
 
        test
                make check
        end
-
-       install
-               make install DESTDIR=%{BUILDROOT}
-
-               mkdir -pv %{BUILDROOT}/usr/bin
-               mv -v %{BUILDROOT}/bin/{gzexe,uncompress,zcmp,zdiff,zegrep} %{BUILDROOT}/usr/bin
-               mv -v %{BUILDROOT}/bin/{zfgrep,zforce,zgrep,zless,zmore,znew} %{BUILDROOT}/usr/bin
-       end
 end
 
 packages
        package %{name}
                groups += Base Build
+
+               provides
+                       /bin/gunzip
+                       /bin/gzip
+                       /bin/zcat
+               end
+
+               conflicts
+                       filesystem < 002
+               end
        end
 
        package %{name}-debuginfo