diff --git a/util/archive/p7zip/actions.py b/util/archive/p7zip/actions.py index bd3d8a280e..000f918a77 100644 --- a/util/archive/p7zip/actions.py +++ b/util/archive/p7zip/actions.py @@ -2,37 +2,26 @@ # -*- coding: utf-8 -*- # # Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt +# See the file https://www.gnu.org/licenses/gpl-3.0.txt from pisi.actionsapi import shelltools from pisi.actionsapi import autotools from pisi.actionsapi import pisitools from pisi.actionsapi import get -WorkDir = "p7zip_%s" % get.srcVERSION() +WorkDir = "p7zip-%s" % get.srcVERSION() makefiles = { - 'i686' : "makefile.linux_x86_asm_gcc_4.X", - 'x86_64' : "makefile.linux_amd64_asm" + 'x86_64' : "makefile.linux_amd64" } def setup(): shelltools.copy(makefiles[get.ARCH()], "makefile.machine") - for i in shelltools.ls("makefile.*"): - pisitools.dosed(i, "^CC=gcc ", "CC=%s " % get.CC()) - pisitools.dosed(i, "^CXX=g\+\+ ", "CXX=%s " % get.CXX()) - def build(): - autotools.make('OPTFLAGS="%s" all3' % get.CFLAGS()) + autotools.make('OPTFLAGS="%s %s" 7z 7za 7zr sfx' % (get.CFLAGS(), get.CXXFLAGS())) def install(): - pisitools.insinto("/usr/lib/p7zip", "bin/*") + autotools.rawInstall("DEST_DIR=%s DEST_HOME=/usr DEST_MAN=/usr/share/man" % get.installDIR()) - # p7zip wrapper - pisitools.dobin("contrib/gzip-like_CLI_wrapper_for_7z/p7zip") - pisitools.doman("contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1") - pisitools.doman("man1/*") - - pisitools.dohtml("DOC/MANUAL/*") - pisitools.dodoc("ChangeLog", "README", "TODO", "DOC/*.txt") + pisitools.dodoc("README.md") diff --git a/util/archive/p7zip/pspec.xml b/util/archive/p7zip/pspec.xml index 53b8fa39da..e8bc23250f 100644 --- a/util/archive/p7zip/pspec.xml +++ b/util/archive/p7zip/pspec.xml @@ -1,9 +1,9 @@ - + p7zip - http://p7zip.sourceforge.net/ + https://github.com/jinfeihan57/p7zip PisiLinux Community admins@pisilinux.org @@ -14,8 +14,8 @@ p7zip is a port of 7-Zip archiver for Unix. Supports packing-unpacking 7z, ZIP, GZIP, BZIP2 and TAR archives and unpacking RAR, CAB, ISO, ARJ, LZH, CHM, Z, CPIO, RPM, DEB and NSIS arhives. - - mirrors://sourceforge/p7zip/p7zip/16.02/p7zip_16.02_src_all.tar.bz2 + + https://github.com/jinfeihan57/p7zip/archive/v17.03.tar.gz yasm-devel @@ -34,14 +34,16 @@ /usr/share/doc /usr/share/man - - 7z - 7za - 7zr - + + 2021-03-13 + 17.03 + Version bump. + fury + uglyside@yandex.ru + 2020-02-19 16.02