diff --git a/srcpkgs/rinse/patches/fix-tests.patch b/srcpkgs/rinse/patches/fix-tests.patch index 6c7bb3e06b6..7a4ff0e63c8 100644 --- a/srcpkgs/rinse/patches/fix-tests.patch +++ b/srcpkgs/rinse/patches/fix-tests.patch @@ -1,4 +1,6 @@ -This fixes the notab tests by converting them to spaces +Source: maxice8 +Upstream: no (feel free to) +Reason: fixes test for tab chars --- scripts/opensuse-11.1/post-install.sh +++ scripts/opensuse-11.1/post-install.sh @@ -65,3 +67,29 @@ This fixes the notab tests by converting them to spaces fi +--- scripts/centos-7/post-install.sh ++++ scripts/centos-7/post-install.sh +@@ -39,8 +39,8 @@ install -m 600 /dev/null $prefix/var/log/tallylog + + cd $prefix/var/log + for n in messages secure maillog spooler;do +- [ -f $n ] && continue +- umask 066 && touch $n ++ [ -f $n ] && continue ++ umask 066 && touch $n + done + cd / + touch $prefix/var/log/lastlog +--- scripts/opensuse-42.2/post-install.sh ++++ scripts/opensuse-42.2/post-install.sh +@@ -38,8 +38,8 @@ gpgcheck=1 + EOF + + if [ $ARCH = "i386" ] ; then +- echo " Setting architecture to i686" +- sed -i 's/\(# \)\?arch = .*/arch = i686/' ${prefix}/etc/zypp/zypp.conf ++ echo " Setting architecture to i686" ++ sed -i 's/\(# \)\?arch = .*/arch = i686/' ${prefix}/etc/zypp/zypp.conf + fi + + diff --git a/srcpkgs/rinse/template b/srcpkgs/rinse/template index 3b34fa241a9..61edd615997 100644 --- a/srcpkgs/rinse/template +++ b/srcpkgs/rinse/template @@ -1,28 +1,28 @@ # Template file for 'rinse' pkgname=rinse -version=3.0.2 +version=3.3 revision=1 -wrksrc="$pkgname" -hostmakedepends="perl dpkg" +noarch=yes +build_style=gnu-makefile +hostmakedepends="dpkg" makedepends="perl" -depends="rpm wget perl-LWP" -checkdepends="${depends} perl-Test-Pod" +depends="perl-LWP rpm wget" +checkdepends="perl-LWP perl-Test-Pod rpm wget" short_desc="Bootstrap a rpm based distribution like debootstrap" maintainer="maxice8 " -license="GPL-3" +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="https://salsa.debian.org/debian/rinse" +#changelog="https://salsa.debian.org/debian/rinse/raw/master/debian/changelog" +distfiles="https://salsa.debian.org/debian/rinse/-/archive/${version}/rinse-${version}.tar.gz" +checksum=290a90a80bd8358fcaf6849a590eb14f1bb05ce81b365bd95e4d41a93be82e19 +make_check_target=test + conf_files="/etc/rinse/rinse.conf" -homepage="http://collab-maint.alioth.debian.org/rinse/" -distfiles="http://collab-maint.alioth.debian.org/rinse/download/rinse_${version}.tar.gz" -checksum=42f7cc074e84b8c99c290a2284c9de285998c100e8a77481bf14b6cd76608710 pre_install() { - sed -i 's|pod2man.*$|pod2man --release=3.0.2 --official --section=8 ./bin/rinse ./bin/rinse.8|' Makefile -} - -do_check() { - make test + sed -i "s|pod2man.*$|pod2man --release=${version} --official --section=8 ./bin/rinse ./bin/rinse.8|g" Makefile } do_install() { - make PREFIX="${DESTDIR}" sbindir="${DESTDIR}"/bin install + make ${makejobs} PREFIX="$DESTDIR" sbindir="${DESTDIR}/bin" install }