diff options
| -rw-r--r-- | libre/abs/PKGBUILD | 16 | ||||
| -rw-r--r-- | libre/xarchiver-libre/PKGBUILD | 2 | ||||
| -rw-r--r-- | libre/xarchiver-libre/xarchiver-0.5.3-remove-nonfree-unrar-support.patch | 8 |
3 files changed, 15 insertions, 11 deletions
diff --git a/libre/abs/PKGBUILD b/libre/abs/PKGBUILD index f7e85d0ef..657677114 100644 --- a/libre/abs/PKGBUILD +++ b/libre/abs/PKGBUILD @@ -1,16 +1,15 @@ -# $Id$ +# $Id: PKGBUILD 166402 2012-09-07 16:49:13Z dreisner $ # Maintainer: Allan McRae <allan@archlinux.org> -replaces=('abs-libre') -conflicts=('abs-libre') - pkgname=abs pkgver=2.4.4 -pkgrel=1.1 -pkgdesc="Utilities to download and work with the Arch Build System (ABS)" +pkgrel=1.2 +pkgdesc="Utilities to download and work with the Arch Build System (ABS), with Parabola repos support" arch=('i686' 'x86_64' 'mips64el') url="http://projects.archlinux.org/abs.git/" license=('GPL') +replaces=('abs-libre') +conflicts=('abs-libre') depends=('bash' 'rsync') backup=(etc/abs.conf) source=(ftp://ftp.archlinux.org/other/abs/${pkgname}-${pkgver}.tar.gz{,.sig}) @@ -33,10 +32,15 @@ package() { install -Dm644 README "${pkgdir}"/var/abs/README # make adjustments to abs.conf + sed -i -e 's|i686 or x86_64|i686, x86_64 or mips64el|' "${pkgdir}"/etc/abs.conf sed -i -e 's|rsync.archlinux.org|parabolagnulinux.org|' "${pkgdir}"/etc/abs.conf sed -i -e 's|(core|(libre !libre-testing core|' "${pkgdir}"/etc/abs.conf + sed -i -e 's|!staging !community-staging !gnome-unstable !kde-unstable|!pcr !nonprism !kernels !cross !java !java-ugly !~smv !~xihh !~brendan !~lukeshu !~emulatorman !~aurelien !~jorginho !~coadde !~drtan|' "${pkgdir}"/etc/abs.conf if [[ $CARCH != "x86_64" ]]; then sed -i -e 's| multilib||' -e 's| !multilib-testing||' "${pkgdir}"/etc/abs.conf fi + if [[ $CARCH = "x86_64" ]]; then + sed -i -e 's|community|community libre-multilib|' -e 's|!community-testing|!community-testing !libre-multilib-testing|' "${pkgdir}"/etc/abs.conf + fi sed -i "s/ARCH=.*/ARCH=$CARCH/" "${pkgdir}"/etc/abs.conf } diff --git a/libre/xarchiver-libre/PKGBUILD b/libre/xarchiver-libre/PKGBUILD index 478f5ef6b..c24d97700 100644 --- a/libre/xarchiver-libre/PKGBUILD +++ b/libre/xarchiver-libre/PKGBUILD @@ -35,7 +35,7 @@ md5sums=('fd390bbd2df76a5f8a007bdeae82d4aa' '6178d7ab679b761469c880a8db991907' '35ab96d98521a0a36f3e9e9ec0969107' '0cee887b3c989ba2cdce9154813843fb' - '6ba9f6a6dd9685d8309bd9ed4df1f339') + 'cf1788c180145adc3bc5d3572f8a883b') prepare() { cd $_pkgname-$pkgver diff --git a/libre/xarchiver-libre/xarchiver-0.5.3-remove-nonfree-unrar-support.patch b/libre/xarchiver-libre/xarchiver-0.5.3-remove-nonfree-unrar-support.patch index aa46243e3..e8ba41d59 100644 --- a/libre/xarchiver-libre/xarchiver-0.5.3-remove-nonfree-unrar-support.patch +++ b/libre/xarchiver-libre/xarchiver-0.5.3-remove-nonfree-unrar-support.patch @@ -515,11 +515,11 @@ diff -Nur xarchiver-0.5.3.orig/src/window.h xarchiver-0.5.3/src/window.h #include "7zip.h" #include "bzip2.h" diff -Nur xarchiver-0.5.3.orig/xarchiver.desktop.in xarchiver-0.5.3/xarchiver.desktop.in ---- xarchiver-0.5.3.orig/xarchiver.desktop.in 2014-05-05 16:55:29.564006985 -0300 -+++ xarchiver-0.5.3/xarchiver.desktop.in 2014-05-05 16:56:49.210457785 -0300 +--- xarchiver-0.5.3.orig/xarchiver.desktop.in 2014-05-12 02:00:44.138672823 -0300 ++++ xarchiver-0.5.3/xarchiver.desktop.in 2014-05-12 02:01:31.452361143 -0300 @@ -11,4 +11,4 @@ X-MultipleArgs=false Categories=GTK;Archiving;Utility; StartupNotify=true --MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-rar;application/x-rar-compressed;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-xz;application/x-xz-compressed-tar;application/x-debian-package;application/x-rpm; -+MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-xz;application/x-xz-compressed-tar;application/x-debian-package;application/x-rpm; +-MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-rar;application/x-rar-compressed;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-xz;application/x-xz-compressed-tar;application/x-deb;application/x-rpm; ++MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-xz;application/x-xz-compressed-tar;application/x-deb;application/x-rpm; |