diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-09-04 22:12:38 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-09-04 22:12:38 -0300 |
| commit | 89c3e689a0a3348b23eeef904ba5fc936a92382c (patch) | |
| tree | d06c90bb79f01e9b9011a5e5b94d04524d818e41 | |
| parent | 35f7581c202decb6716adca302099aa6e136f00f (diff) | |
p7zip: remove libre suffix and add complex pkgrel
| -rw-r--r-- | libre/p7zip/7zFM.desktop (renamed from libre/p7zip-libre/7zFM.desktop) | 0 | ||||
| -rw-r--r-- | libre/p7zip/PKGBUILD (renamed from libre/p7zip-libre/PKGBUILD) | 23 | ||||
| -rw-r--r-- | libre/p7zip/install (renamed from libre/p7zip-libre/install) | 0 | ||||
| -rw-r--r-- | libre/p7zip/libre.patch (renamed from libre/p7zip-libre/libre.patch) | 0 |
4 files changed, 11 insertions, 12 deletions
diff --git a/libre/p7zip-libre/7zFM.desktop b/libre/p7zip/7zFM.desktop index 62b8e8562..62b8e8562 100644 --- a/libre/p7zip-libre/7zFM.desktop +++ b/libre/p7zip/7zFM.desktop diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip/PKGBUILD index 98c91718e..b34262451 100644 --- a/libre/p7zip-libre/PKGBUILD +++ b/libre/p7zip/PKGBUILD @@ -5,23 +5,22 @@ # Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us> # Maintainer (Arch): Gaetan Bisson <bisson@archlinux.org> -pkgname=p7zip-libre -_pkgname=${pkgname%-libre} +_pkgname=p7zip-libre +pkgname=p7zip pkgver=9.20.1 -pkgrel=9.4 +pkgrel=9.parabola1 pkgdesc='Command-line version of the 7zip compressed file archiver, without nonfree decompression engine for RAR archives' url='http://p7zip.sourceforge.net/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') -provides=("p7zip=$pkgver") -conflicts=('p7zip') -replaces=('p7zip') +conflicts=('p7zip-libre') +replaces=('p7zip-libre') depends=('gcc-libs' 'bash') optdepends=('wxgtk2.8: GUI' 'desktop-file-utils: desktop entries') makedepends=('yasm' 'nasm' 'wxgtk2.8') -mksource=("http://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}/${pkgver}/${_pkgname}_${pkgver}_src_all.tar.bz2") -source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}_${pkgver}_src_all.tar.bz2" +mksource=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}_${pkgver}_src_all.tar.bz2") +source=("https://repo.parabolagnulinux.org/other/${_pkgname}/${_pkgname}_${pkgver}_src_all.tar.bz2" '7zFM.desktop' 'libre.patch') mksha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7') sha1sums=('4e5ba097a90f3e00ad072023030c87f0707733b8' @@ -32,7 +31,7 @@ options=('!makeflags') install=install mksource() { - cd "${srcdir}/${_pkgname}_${pkgver}" + cd "${srcdir}/${pkgname}_${pkgver}" # Remove nonfree unRAR utility files from the source rm -rv CPP/7zip/{Archive,Compress}/Rar @@ -45,7 +44,7 @@ mksource() { } prepare() { - cd "${srcdir}/${_pkgname}_${pkgver}" + cd "${srcdir}/${pkgname}_${pkgver}" # remove rar and parent folder icon references patch -Np1 -i ../libre.patch @@ -60,12 +59,12 @@ prepare() { } build() { - cd "${srcdir}/${_pkgname}_${pkgver}" + cd "${srcdir}/${pkgname}_${pkgver}" make all4 OPTFLAGS="${CXXFLAGS}" } package() { - cd "${srcdir}/${_pkgname}_${pkgver}" + cd "${srcdir}/${pkgname}_${pkgver}" make install \ DEST_DIR="${pkgdir}" \ DEST_HOME="/usr" \ diff --git a/libre/p7zip-libre/install b/libre/p7zip/install index 7f3cc4358..7f3cc4358 100644 --- a/libre/p7zip-libre/install +++ b/libre/p7zip/install diff --git a/libre/p7zip-libre/libre.patch b/libre/p7zip/libre.patch index 86b2caebc..86b2caebc 100644 --- a/libre/p7zip-libre/libre.patch +++ b/libre/p7zip/libre.patch |