From 9b8aa148fba708cf59683b9fdd1060d0ab891a48 Mon Sep 17 00:00:00 2001 From: Victoria Ivanova Date: Sat, 26 May 2018 16:53:17 +0200 Subject: [PATCH] Bump to 3.3 diff --git a/.SRCINFO b/.SRCINFO index 8ba85e7..e4ae14d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,10 +1,8 @@ -# Generated by mksrcinfo v8 -# Sun Nov 5 10:24:10 UTC 2017 pkgbase = rinse pkgdesc = Bootstrap a rpm based distribution like debootstrap - pkgver = 3.0.2 - pkgrel = 3 - url = http://collab-maint.alioth.debian.org/rinse/ + pkgver = 3.3 + pkgrel = 2 + url = https://salsa.debian.org/debian/rinse.git arch = any license = GPL makedepends = make @@ -17,10 +15,10 @@ pkgbase = rinse depends = rpm-org depends = cpio backup = etc/rinse/rinse.conf - source = http://collab-maint.alioth.debian.org/rinse/download/rinse_3.0.2.tar.gz + source = https://salsa.debian.org/debian/rinse/-/archive/3.3/rinse-3.3.tar.gz source = sbin.patch - md5sums = 51c7875ae363ed35963e3b9fad344dd1 - md5sums = a9f0c264fa8b2427bc7e327a632a2b0d + md5sums = aad4821a80959981769ea03302c65187 + md5sums = ef452bd9b51722324ea31ea5ef7d5e78 pkgname = rinse diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6c0270e --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +pkg +src +rinse-*.tar.* diff --git a/PKGBUILD b/PKGBUILD index 17b419a..e9aa4e4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,11 +3,11 @@ # Rinse RPM Distro Bootstrapper pkgname=rinse -pkgver=3.0.2 -pkgrel=3 +pkgver=3.3 +pkgrel=2 pkgdesc="Bootstrap a rpm based distribution like debootstrap" arch=('any') -url="http://collab-maint.alioth.debian.org/rinse/" +url="https://salsa.debian.org/debian/rinse.git" license=('GPL') groups=() depends=('glibc' 'perl' 'perl-html-parser' 'perl-uri' 'perl-libwww' 'wget' 'rpm-org' 'cpio') @@ -19,19 +19,20 @@ replaces=() backup=('etc/rinse/rinse.conf') options=() install= -source=("http://collab-maint.alioth.debian.org/rinse/download/rinse_3.0.2.tar.gz" - "sbin.patch") +source=("https://salsa.debian.org/debian/rinse/-/archive/3.3/rinse-3.3.tar.gz" + "sbin.patch") + noextract=() -md5sums=('51c7875ae363ed35963e3b9fad344dd1' - 'a9f0c264fa8b2427bc7e327a632a2b0d') +md5sums=('aad4821a80959981769ea03302c65187' + 'ef452bd9b51722324ea31ea5ef7d5e78') prepare() { - patch -p0 -i $srcdir/sbin.patch - sed -i 's|pod2man.*$|pod2man --release=3.0.2 --official --section=8 ./bin/rinse ./bin/rinse.8|' $srcdir/$pkgname/Makefile + patch -p0 -i $srcdir/sbin.patch + sed -i 's|pod2man.*$|pod2man --release=$pkgver --official --section=8 ./bin/rinse ./bin/rinse.8|' $srcdir/$pkgname-$pkgver/Makefile } package() { - cd "$srcdir/$pkgname" + cd "$srcdir/$pkgname-$pkgver" make PREFIX="$pkgdir/" sbindir="$pkgdir/bin" install } diff --git a/sbin.patch b/sbin.patch index f00c9f0..d8034d2 100644 --- a/sbin.patch +++ b/sbin.patch @@ -2,7 +2,7 @@ +++ rinse/Makefile 2015-10-19 11:45:52.398805700 +0600 @@ -52,15 +52,15 @@ install: fixupperms - mkdir -p ${PREFIX}/etc/bash_completion.d + mkdir -p ${PREFIX}/usr/share/bash-completion/completions mkdir -p ${PREFIX}/etc/rinse - mkdir -p ${PREFIX}/usr/sbin + mkdir -p ${PREFIX}/usr/bin