Browse Source

vbootstrap: correct patch2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12259 ec354946-7b23-47d6-9f5a-488ba84defc7
ara_t 3 years ago
parent
commit
0577e0527a

+ 10 - 0
v/vbootstrap/vbootstrap-delete_backslash.patch

@@ -0,0 +1,10 @@
+--- vbuilder.sh.in.orig	2019-10-12 12:36:45.836289418 +0900
++++ vbuilder.sh.in	2019-10-13 11:13:59.416157321 +0900
+@@ -833,6 +833,7 @@
+     $__chroot_sh "cd ${BUILD_DIR}/SRPMS && su ${BUILD_USER} -c 'rpmbuild --rebuild $RPM_OPTS $BASE_RPM_PKG'"
+ 
+     BUILT_RPMS_LIST=$(find $BUILD_ROOT${BUILD_DIR}/RPMS -type f -regex '.*\.rpm' | sed -e s,${BUILD_ROOT},,g -e 's|.*\/compat32-.*||g' -e 's|.*\/.*\.src\.rpm||g' -e 's/$/ \\/g')
++    BUILT_RPMS_LIST=`echo -e ${BUILT_RPMS_LIST} | sed -e 's/\\\\//g'`
+ 
+     [ $with_category_nonfree -eq 1 ] && \
+ 	[ ! -z "$(echo $BUILT_RPMS_LIST | grep -e 'self-build-' -e 'install-assist-')" ] && \

+ 0 - 11
v/vbootstrap/vbootstrap-delete_last_slash.patch

@@ -1,11 +0,0 @@
---- vbuilder.sh.in.orig	2019-10-12 12:36:45.836289418 +0900
-+++ vbuilder.sh.in	2019-10-12 14:51:27.171911654 +0900
-@@ -832,7 +832,7 @@
-     $__chroot_sh "cd ${BUILD_DIR}/SRPMS && apt-get -o APT::Install::Virtual=true -y build-dep $BASE_RPM_PKG"
-     $__chroot_sh "cd ${BUILD_DIR}/SRPMS && su ${BUILD_USER} -c 'rpmbuild --rebuild $RPM_OPTS $BASE_RPM_PKG'"
- 
--    BUILT_RPMS_LIST=$(find $BUILD_ROOT${BUILD_DIR}/RPMS -type f -regex '.*\.rpm' | sed -e s,${BUILD_ROOT},,g -e 's|.*\/compat32-.*||g' -e 's|.*\/.*\.src\.rpm||g' -e 's/$/ \\/g')
-+    BUILT_RPMS_LIST=$(find $BUILD_ROOT${BUILD_DIR}/RPMS -type f -regex '.*\.rpm' | sed -e s,${BUILD_ROOT},,g -e 's|.*\/compat32-.*||g' -e 's|.*\/.*\.src\.rpm||g' -e 's/$/ \\/g' | sed -e s/\\\\$//g)
- 
-     [ $with_category_nonfree -eq 1 ] && \
- 	[ ! -z "$(echo $BUILT_RPMS_LIST | grep -e 'self-build-' -e 'install-assist-')" ] && \

+ 5 - 2
v/vbootstrap/vbootstrap-vl.spec

@@ -7,14 +7,14 @@ Summary: bootstrap scripts to create a basic Vine Linux system
 Summary(ja): Vine Linux の基本システムを作成するためのスクリプト
 Name: vbootstrap
 Version: %{version}
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 License: public domain
 Group: Development/Tools
 Url: http://trac.vinelinux.org/wiki/VineBootstrap
 
 Source0: %{name}-%{version}.tar.xz
 Patch1: vbootstrap-0.3_mk_uramdom.patch
-Patch2: vbootstrap-delete_last_slash.patch
+Patch2: vbootstrap-delete_backslash.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
@@ -96,6 +96,9 @@ vbuilder は vbootstrap を利用して chroot 環境の構築し、
 
 
 %changelog
+* Sun Oct 13 2019 Toshiaki Ara <ara_t@384.jp> 0.3-4
+- correct and rename patch2
+
 * Sat Oct 12 2019 Toshiaki Ara <ara_t@384.jp> 0.3-3
 - add patch2 to fix install error