'diff reduction' to RPM 5 development version (no functional change)

openpkg/HISTORY

@@ -2,6 +2,7 @@
 2007
 ====
 
+20070718 "diff reduction" to RPM 5 development version (no functional change)
 20070717 fix a very long-standing cruel implementation bug in the platform detection
 20070711 upgrade to cURL 7.16.4
 20070630 upgrade to GNU tar 1.18

openpkg/openpkg.spec

@@ -39,7 +39,7 @@
 #   o any cc(1)
 
 #   the package version/release
-%define       V_openpkg  20070717
+%define       V_openpkg  20070718
 
 #   the used software versions
 %define       V_rpm      4.2.1
@@ -93,63 +93,63 @@ Source14:     http://curl.haxx.se/download/curl-%{V_curl}.tar.gz
 Source15:     http://switch.dl.sourceforge.net/beecrypt/beecrypt-%{V_beecrypt}.tar.gz
 Source16:     http://www.bzip.org/%{V_bzip2}/bzip2-%{V_bzip2}.tar.gz
 Source17:     http://www.zlib.net/zlib-%{V_zlib}.tar.gz
-Source18:     HISTORY
-Source19:     README
-Source20:     aux.prereq.sh
-Source21:     aux.usrgrp.sh
-Source22:     aux.wrapbin.sh
-Source23:     aux.wrapsrc.sh
-Source24:     bash.patch
-Source25:     beecrypt.patch
-Source26:     dot.bash_login
-Source27:     dot.bashrc
-Source28:     dot.lsyncrc
-Source29:     install.sh
-Source30:     local.README
-Source31:     lsync
-Source32:     lsync.8
-Source33:     lsync.pod
-Source34:     make.patch
-Source35:     man.sh
-Source36:     openpkg.1
-Source37:     openpkg.boot
-Source38:     openpkg.com.pgp
-Source39:     openpkg.net.pgp
-Source40:     openpkg.org.pgp
-Source41:     openpkg.pod
-Source42:     openpkg.sh
-Source43:     openssl.patch
-Source44:     perl.patch
-Source45:     pod2man.sh
-Source46:     rc
-Source47:     rc.8
-Source48:     rc.conf
-Source49:     rc.func
-Source50:     rc.openpkg
-Source51:     rc.pod
-Source52:     release.8
-Source53:     release.pod
-Source54:     release.sh
-Source55:     root.README
-Source56:     rpm-config.8
-Source57:     rpm-config.pod
-Source58:     rpm-config.sh
-Source59:     rpm.patch.bugfix
-Source60:     rpm.patch.feature
-Source61:     rpm.patch.porting
-Source62:     rpm.patch.regen
-Source63:     rpmdb
-Source64:     rpmmacros
-Source65:     rpmpopt
-Source66:     rpmrc
-Source67:     rpmtool
-Source68:     rpmtool.8
-Source69:     rpmtool.pod
-Source70:     shtool
-Source71:     tar.patch
-Source72:     uuid.8
-Source73:     uuid.pod
-Source74:     uuid.sh
+Source100:    bash.patch
+Source101:    beecrypt.patch
+Source102:    make.patch
+Source103:    openssl.patch
+Source104:    perl.patch
+Source105:    tar.patch
+Source106:    rpm.patch.bugfix
+Source107:    rpm.patch.feature
+Source108:    rpm.patch.porting
+Source109:    rpm.patch.regen
+Source200:    HISTORY
+Source201:    README
+Source202:    aux.prereq.sh
+Source203:    aux.usrgrp.sh
+Source204:    aux.wrapbin.sh
+Source205:    aux.wrapsrc.sh
+Source206:    dot.bash_login
+Source207:    dot.bashrc
+Source208:    dot.lsyncrc
+Source209:    install.sh
+Source210:    local.README
+Source211:    lsync
+Source212:    lsync.8
+Source213:    lsync.pod
+Source214:    man.sh
+Source215:    openpkg.1
+Source216:    openpkg.boot
+Source217:    openpkg.com.pgp
+Source218:    openpkg.net.pgp
+Source219:    openpkg.org.pgp
+Source220:    openpkg.pod
+Source221:    openpkg.sh
+Source222:    pod2man.sh
+Source223:    rc
+Source224:    rc.8
+Source225:    rc.conf
+Source226:    rc.func
+Source227:    rc.openpkg
+Source228:    rc.pod
+Source229:    release.8
+Source230:    release.pod
+Source231:    release.sh
+Source232:    root.README
+Source233:    rpm-config.8
+Source234:    rpm-config.pod
+Source235:    rpm-config.sh
+Source236:    rpmdb
+Source237:    rpmtool
+Source238:    rpmtool.8
+Source239:    rpmtool.pod
+Source240:    shtool
+Source241:    uuid.8
+Source242:    uuid.pod
+Source243:    uuid.sh
+Source244:    rpmmacros
+Source245:    rpmpopt
+Source246:    rpmrc
 
 #   build information
 Prefix:       %{l_prefix}
@@ -160,7 +160,7 @@ Provides:     OpenPKG
 
 %description
     This is the bootstrap package for the RPM-based Unix Software
-    Package Hierarchy OpenPKG. The RedHat Package Manager (RPM) is a
+    Package Hierarchy OpenPKG. The RPM Package Manager (RPM) is a
     sophisticated and portable package manager for Unix platforms,
     which supports automated building, installation, management and
     deinstallation of Unix software. RPM was originally designed and
@@ -171,7 +171,7 @@ Provides:     OpenPKG
     OpenPKG project.
 
     The OpenPKG bootstrap package includes the following software:
-        RedHat RPM %{V_rpm}, ZLib %{V_zlib}, GNU Bzip2 %{V_bzip2},
+        RPM %{V_rpm}, ZLib %{V_zlib}, GNU Bzip2 %{V_bzip2},
         GNU Gzip %{V_gzip}, GNU Tar %{V_tar}, GNU Patch %{V_patch},
         GNU Make %{V_make}, GNU Bash %{V_bash}, cURL %{V_curl},
         OSSP uuid %{V_uuid}, BeeCrypt %{V_beecrypt},
@@ -601,19 +601,19 @@ Provides:     OpenPKG
     set +x; VERBOSE "PREPARATION: Unpack Distribution Tarballs"; set -x
 
     #   unpack distribution tarballs
-    ${l_gzip} -dc `SOURCE rpm-%{V_rpm}.tar.gz`                   | ${l_tar} xf - 2>/dev/null || true
-    ${l_gzip} -dc `SOURCE zlib-%{V_zlib}.tar.gz`                 | ${l_tar} xf - 2>/dev/null || true
-    ${l_gzip} -dc `SOURCE bzip2-%{V_bzip2}.tar.gz`               | ${l_tar} xf - 2>/dev/null || true
-    ${l_gzip} -dc `SOURCE curl-%{V_curl}.tar.gz`                 | ${l_tar} xf - 2>/dev/null || true
-    ${l_gzip} -dc `SOURCE make-%{V_make}.tar.gz`                 | ${l_tar} xf - 2>/dev/null || true
-    ${l_gzip} -dc `SOURCE bash-%{V_bash}.tar.gz`                 | ${l_tar} xf - 2>/dev/null || true
-    ${l_gzip} -dc `SOURCE uuid-%{V_uuid}.tar.gz`                 | ${l_tar} xf - 2>/dev/null || true
-    ${l_gzip} -dc `SOURCE beecrypt-%{V_beecrypt}.tar.gz`         | ${l_tar} xf - 2>/dev/null || true
-    ${l_gzip} -dc `SOURCE openpkg-registry-%{V_registry}.tar.gz` | ${l_tar} xf - 2>/dev/null || true
-    ${l_gzip} -dc `SOURCE perl-%{V_perl}-mini.tar.gz`            | ${l_tar} xf - 2>/dev/null || true
-    ${l_gzip} -dc `SOURCE openssl-%{V_openssl}.tar.gz`           | ${l_tar} xf - 2>/dev/null || true
-    ${l_gzip} -dc `SOURCE openpkg-tools-%{V_tools}.tar.gz`       | ${l_tar} xf - 2>/dev/null || true
-    ${l_gzip} -dc `SOURCE openpkg-executable-%{V_exec}.tar.gz`   | ${l_tar} xf - 2>/dev/null || true
+    ${l_gzip} -dc `SOURCE rpm-%{V_rpm}.tar.gz`                        | ${l_tar} xf - 2>/dev/null || true
+    ${l_gzip} -dc `SOURCE zlib-%{V_zlib}.tar.gz`                      | ${l_tar} xf - 2>/dev/null || true
+    ${l_gzip} -dc `SOURCE bzip2-%{V_bzip2}.tar.gz`                    | ${l_tar} xf - 2>/dev/null || true
+    ${l_gzip} -dc `SOURCE curl-%{V_curl}.tar.gz`                      | ${l_tar} xf - 2>/dev/null || true
+    ${l_gzip} -dc `SOURCE make-%{V_make}.tar.gz`                      | ${l_tar} xf - 2>/dev/null || true
+    ${l_gzip} -dc `SOURCE bash-%{V_bash}.tar.gz`                      | ${l_tar} xf - 2>/dev/null || true
+    ${l_gzip} -dc `SOURCE uuid-%{V_uuid}.tar.gz`                      | ${l_tar} xf - 2>/dev/null || true
+    ${l_gzip} -dc `SOURCE beecrypt-%{V_beecrypt}.tar.gz`              | ${l_tar} xf - 2>/dev/null || true
+    ${l_gzip} -dc `SOURCE openpkg-registry-%{V_registry}.tar.gz`      | ${l_tar} xf - 2>/dev/null || true
+    ${l_gzip} -dc `SOURCE perl-%{V_perl}-mini.tar.gz`                 | ${l_tar} xf - 2>/dev/null || true
+    ${l_gzip} -dc `SOURCE openssl-%{V_openssl}.tar.gz`                | ${l_tar} xf - 2>/dev/null || true
+    ${l_gzip} -dc `SOURCE openpkg-tools-%{V_tools}.tar.gz`            | ${l_tar} xf - 2>/dev/null || true
+    ${l_gzip} -dc `SOURCE openpkg-executable-%{V_exec}.tar.gz`        | ${l_tar} xf - 2>/dev/null || true
 
     #   update config.guess/config.sub
     for dir in rpm-%{V_rpm} rpm-%{V_rpm}/popt beecrypt-%{V_beecrypt} \
@@ -639,26 +639,12 @@ Provides:     OpenPKG
     ) || exit $?
     ( cd bash-%{V_bash}
       ${l_patch} -p0 <`SOURCE bash.patch`
-      sh $shtool subst \
-          -e 's;@l_openpkg_release@;OpenPKG;' \
-          version.c
       sleep 1
       touch y.tab.[ch]
+      touch configure config.h.in
     ) || exit $?
     ( cd beecrypt-%{V_beecrypt}
       ${l_patch} -p0 <`SOURCE beecrypt.patch`
-      sh $shtool subst \
-          -e 's;^[ 	][ 	]*#;#;' \
-          aes.c base64.c blowfish.c entropy.c fips186.c fips186.h md5.c \
-          md5.h mp.c mtprng.c mtprng.h sha1.c sha1.h sha256.c sha256.h timestamp.c
-      sh $shtool subst \
-         -e 's;cppglue\.lo;;g' \
-         -e 's;cppglue\.cxx;;g' \
-         -e '/^CXX = /s;@CXX@;@CC@;g' \
-         Makefile.in
-      sh $shtool subst \
-          -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
-          configure
     ) || exit $?
     ( cd perl-%{V_perl}
       ${l_patch} -p0 <`SOURCE perl.patch`
@@ -697,6 +683,9 @@ Provides:     OpenPKG
 
     #   build GNU bash tool
     ( cd bash-%{V_bash}
+      sh $shtool subst \
+          -e 's;@l_openpkg_release@;OpenPKG;' \
+          version.c
       ( #   force disabled wide-character support
         echo "ac_cv_header_wchar_h=no"
         echo "ac_cv_header_wctype_h=no"
@@ -879,6 +868,18 @@ Provides:     OpenPKG
 
     #   build BeeCrypt library
     ( cd beecrypt-%{V_beecrypt}
+      sh $shtool subst \
+          -e 's;^[ 	][ 	]*#;#;' \
+          aes.c base64.c blowfish.c entropy.c fips186.c fips186.h md5.c \
+          md5.h mp.c mtprng.c mtprng.h sha1.c sha1.h sha256.c sha256.h timestamp.c
+      sh $shtool subst \
+         -e 's;cppglue\.lo;;g' \
+         -e 's;cppglue\.cxx;;g' \
+         -e '/^CXX = /s;@CXX@;@CC@;g' \
+         Makefile.in
+      sh $shtool subst \
+          -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
+          configure
       ( echo 'ac_cv_have_dev_dsp=no'
         echo 'ac_cv_have_dev_audio=no'
         echo 'ac_cv_func_gettimeofday=yes'
@@ -901,7 +902,7 @@ Provides:     OpenPKG
     ) || exit $?
 
     #   display verbosity header
-    set +x; VERBOSE "BUILD: Build RPM (RedHat Package Manager)"; set -x
+    set +x; VERBOSE "BUILD: Build RPM (RPM Package Manager)"; set -x
 
     #   build RPM
     ( br=`pwd`
@@ -986,6 +987,9 @@ Provides:     OpenPKG
       ${l_make}
     ) || exit $?
 
+    #   display verbosity header
+    set +x; VERBOSE "BUILD: Build OpenPKG Frontend (Set-UID Wrapper)"; set -x
+
     #   build "openpkg" executable
     ( cd openpkg-executable-%{V_exec}
       ${l_make} \
@@ -1048,38 +1052,6 @@ Provides:     OpenPKG
       ${l_make} install
     ) || exit $?
 
-    #   display verbosity header
-    set +x; VERBOSE "INSTALL: Stripping Down Installation"; set -x
-
-    #   strip RPM installation
-    ${l_strip} $RPM_BUILD_ROOT%{l_prefix}/bin/* \
-          $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/* >/dev/null 2>&1 || true
-    for dir in man/ja man/pl man/ru man/sk src; do
-        rm -rf $RPM_BUILD_ROOT%{l_prefix}/$dir >/dev/null 2>&1 || true
-    done
-    rm -rf $RPM_BUILD_ROOT/var >/dev/null 2>&1 || true
-    for file in rpme rpmi rpmsign rpmu rpmverify rpmquery gendiff; do
-        rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/$file >/dev/null 2>&1 || true
-    done
-    rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/* >/dev/null 2>&1 || true
-    rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/* >/dev/null 2>&1 || true
-    rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man3/* >/dev/null 2>&1 || true
-    rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/rpmpopt >/dev/null 2>&1 || true
-    rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/rpmrc >/dev/null 2>&1 || true
-    rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/lib*.la >/dev/null 2>&1 || true
-    rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/lib >/dev/null 2>&1 || true
-    for file in \
-        u_pkg.sh vpkg-provides.sh vpkg-provides2.sh rpmdiff.cgi rpmdiff \
-        perl.prov perl.req mkinstalldirs magic.prov magic.req http.req \
-        getpo.sh get_magic.pl find-provides find-requires \
-        find-requires.perl find-req.pl find-provides.perl \
-        find-prov.pl find-lang.sh cpanflute convertrpmrc.sh check-prereqs \
-        rpmputtext rpmgettext brp-compress brp-redhat brp-sparc64-linux \
-        brp-strip brp-strip-shared brp-strip-comment-note rpmrc \
-        config.guess config.sub check-files; do
-        rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/$file >/dev/null 2>&1 || true
-    done
-
     #   display verbosity header
     set +x; VERBOSE "INSTALL: Install Additional Files"; set -x
 
@@ -1108,6 +1080,18 @@ Provides:     OpenPKG
     mv $RPM_BUILD_ROOT%{l_prefix}/lib/librpm* \
        $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/
 
+    #   move rpm tool to custom location
+    mv $RPM_BUILD_ROOT%{l_prefix}/bin/rpm \
+       $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/rpm
+    mv $RPM_BUILD_ROOT%{l_prefix}/man/man8/rpm.8 \
+       $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/rpm.8
+
+    #   move rpm2cpio tool to custom location
+    mv $RPM_BUILD_ROOT%{l_prefix}/bin/rpm2cpio \
+       $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/rpm2cpio
+    mv $RPM_BUILD_ROOT%{l_prefix}/man/man8/rpm2cpio.8 \
+       $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/rpm2cpio.8
+
     #   replace symlinks with hardlinks
     for entry in rpme:rpmi rpmt:rpmb rpmu:rpmi rpmv:rpmq; do
         eval `echo $entry | sed -e 's/^\(.*\):\(.*\)$/dst=\1; src=\2/'`
@@ -1121,6 +1105,38 @@ Provides:     OpenPKG
     mv $RPM_BUILD_ROOT%{l_prefix}/man/man8/rpmbuild.8 \
        $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/rpmbuild.8
 
+    #   display verbosity header
+    set +x; VERBOSE "INSTALL: Stripping Down Installation"; set -x
+
+    #   strip RPM installation
+    ${l_strip} $RPM_BUILD_ROOT%{l_prefix}/bin/* \
+          $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/* >/dev/null 2>&1 || true
+    for dir in man/ja man/pl man/ru man/sk src; do
+        rm -rf $RPM_BUILD_ROOT%{l_prefix}/$dir >/dev/null 2>&1 || true
+    done
+    rm -rf $RPM_BUILD_ROOT/var >/dev/null 2>&1 || true
+    for file in rpme rpmi rpmsign rpmu rpmverify rpmquery gendiff; do
+        rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/$file >/dev/null 2>&1 || true
+    done
+    rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/* >/dev/null 2>&1 || true
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/* >/dev/null 2>&1 || true
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man3/* >/dev/null 2>&1 || true
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/rpmpopt >/dev/null 2>&1 || true
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/rpmrc >/dev/null 2>&1 || true
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/lib*.la >/dev/null 2>&1 || true
+    rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/lib >/dev/null 2>&1 || true
+    for file in \
+        u_pkg.sh vpkg-provides.sh vpkg-provides2.sh rpmdiff.cgi rpmdiff \
+        perl.prov perl.req mkinstalldirs magic.prov magic.req http.req \
+        getpo.sh get_magic.pl find-provides find-requires \
+        find-requires.perl find-req.pl find-provides.perl \
+        find-prov.pl find-lang.sh cpanflute convertrpmrc.sh check-prereqs \
+        rpmputtext rpmgettext brp-compress brp-redhat brp-sparc64-linux \
+        brp-strip brp-strip-shared brp-strip-comment-note rpmrc \
+        config.guess config.sub check-files; do
+        rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/$file >/dev/null 2>&1 || true
+    done
+
     #   display verbosity header
     set +x; VERBOSE "INSTALL: Install Additional Tools"; set -x
 
@@ -1158,18 +1174,6 @@ Provides:     OpenPKG
         <`SOURCE rpm-config.8` \
         >$RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/rpm-config.8
 
-    #   move rpm2cpio tool to custom location
-    mv $RPM_BUILD_ROOT%{l_prefix}/bin/rpm2cpio \
-       $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/rpm2cpio
-    mv $RPM_BUILD_ROOT%{l_prefix}/man/man8/rpm2cpio.8 \
-       $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/rpm2cpio.8
-
-    #   move rpm tool to custom location
-    mv $RPM_BUILD_ROOT%{l_prefix}/bin/rpm \
-       $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/rpm
-    mv $RPM_BUILD_ROOT%{l_prefix}/man/man8/rpm.8 \
-       $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/rpm.8
-
     #   install OpenPKG registry commands
     ( cd openpkg-registry-%{V_registry}
       mv  $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/rpm \
@@ -1463,24 +1467,32 @@ Provides:     OpenPKG
     %{l_prefix}/include/openpkg/rpm/rpmurl.h
     %{l_prefix}/include/openpkg/rpm/stringbuf.h
     %{l_prefix}/include/openpkg/rpm/ugid.h
-    %{l_prefix}/include/openpkg/rpm/zlib.h
     %{l_prefix}/include/openpkg/rpm/zconf.h
+    %{l_prefix}/include/openpkg/rpm/zlib.h
     %dir %{l_prefix}/info
     %dir %{l_prefix}/lib
     %dir %{l_prefix}/lib/openpkg
     %{l_prefix}/lib/openpkg/bash
     %{l_prefix}/lib/openpkg/bzip2
-    %{l_prefix}/lib/openpkg/uuid
-    %{l_prefix}/lib/openpkg/miniperl
-    %{l_prefix}/lib/openpkg/openssl
     %{l_prefix}/lib/openpkg/curl
     %{l_prefix}/lib/openpkg/file
     %{l_prefix}/lib/openpkg/gzip
+    %{l_prefix}/lib/openpkg/librpm.a
+    %{l_prefix}/lib/openpkg/librpmbeecrypt.a
+    %{l_prefix}/lib/openpkg/librpmbuild.a
+    %{l_prefix}/lib/openpkg/librpmbz2.a
+    %{l_prefix}/lib/openpkg/librpmdb.a
+    %{l_prefix}/lib/openpkg/librpmio.a
+    %{l_prefix}/lib/openpkg/librpmpopt.a
+    %{l_prefix}/lib/openpkg/librpmz.a
     %{l_prefix}/lib/openpkg/macros
     %{l_prefix}/lib/openpkg/magic
     %{l_prefix}/lib/openpkg/magic.mgc
     %{l_prefix}/lib/openpkg/magic.mime
     %{l_prefix}/lib/openpkg/magic.mime.mgc
+    %{l_prefix}/lib/openpkg/miniperl
+    %{l_prefix}/lib/openpkg/openpkg
+    %{l_prefix}/lib/openpkg/openssl
     %{l_prefix}/lib/openpkg/patch
     %{l_prefix}/lib/openpkg/rc
     %{l_prefix}/lib/openpkg/rpm
@@ -1501,40 +1513,32 @@ Provides:     OpenPKG
     %{l_prefix}/lib/openpkg/rpmv
     %{l_prefix}/lib/openpkg/shtool
     %{l_prefix}/lib/openpkg/tar
-    %{l_prefix}/lib/openpkg/librpm.a
-    %{l_prefix}/lib/openpkg/librpmbeecrypt.a
-    %{l_prefix}/lib/openpkg/librpmbuild.a
-    %{l_prefix}/lib/openpkg/librpmbz2.a
-    %{l_prefix}/lib/openpkg/librpmdb.a
-    %{l_prefix}/lib/openpkg/librpmio.a
-    %{l_prefix}/lib/openpkg/librpmpopt.a
-    %{l_prefix}/lib/openpkg/librpmz.a
-    %{l_prefix}/lib/openpkg/openpkg
+    %{l_prefix}/lib/openpkg/uuid
     %dir %{l_prefix}/libexec
     %dir %{l_prefix}/libexec/openpkg
-    %{l_prefix}/libexec/openpkg/uuid
-    %{l_prefix}/libexec/openpkg/uuid.8
-    %{l_prefix}/libexec/openpkg/man
-    %{l_prefix}/libexec/openpkg/curl.sh
-    %{l_prefix}/libexec/openpkg/build.pl
     %{l_prefix}/libexec/openpkg/build.8
+    %{l_prefix}/libexec/openpkg/build.pl
+    %{l_prefix}/libexec/openpkg/curl.sh
     %{l_prefix}/libexec/openpkg/install
     %{l_prefix}/libexec/openpkg/lsync
     %{l_prefix}/libexec/openpkg/lsync.8
+    %{l_prefix}/libexec/openpkg/man
     %{l_prefix}/libexec/openpkg/rc
     %{l_prefix}/libexec/openpkg/rc.8
+    %{l_prefix}/libexec/openpkg/register
+    %{l_prefix}/libexec/openpkg/register.8
+    %{l_prefix}/libexec/openpkg/release
+    %{l_prefix}/libexec/openpkg/release.8
+    %{l_prefix}/libexec/openpkg/rpm
     %{l_prefix}/libexec/openpkg/rpm-config
     %{l_prefix}/libexec/openpkg/rpm-config.8
+    %{l_prefix}/libexec/openpkg/rpm.8
     %{l_prefix}/libexec/openpkg/rpm2cpio
     %{l_prefix}/libexec/openpkg/rpm2cpio.8
     %{l_prefix}/libexec/openpkg/rpmbuild
     %{l_prefix}/libexec/openpkg/rpmbuild.8
-    %{l_prefix}/libexec/openpkg/rpm
-    %{l_prefix}/libexec/openpkg/rpm.8
-    %{l_prefix}/libexec/openpkg/register
-    %{l_prefix}/libexec/openpkg/register.8
-    %{l_prefix}/libexec/openpkg/release
-    %{l_prefix}/libexec/openpkg/release.8
+    %{l_prefix}/libexec/openpkg/uuid
+    %{l_prefix}/libexec/openpkg/uuid.8
     %dir %{l_prefix}/man
     %dir %{l_prefix}/man/man1
     %dir %{l_prefix}/man/man2