Browse Source

updated self-build-setup-vl.spec: defined %%__libdir (to build on x86_64)

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3629 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 13 years ago
parent
commit
b909375cb5
1 changed files with 14 additions and 7 deletions
  1. 14 7
      s/self-build-setup/self-build-setup-vl.spec

+ 14 - 7
s/self-build-setup/self-build-setup-vl.spec

@@ -1,6 +1,8 @@
+%define __libdir	%{_prefix}/lib
+
 %define name		self-build-setup
 %define version		1.0.1
-%define release		1%{?_dist_release}
+%define release		2%{?_dist_release}
 
 Summary:	Setup files for self-build package
 Summary(ja): 	self-build パッケージ用の設定ファイル
@@ -58,7 +60,7 @@ self-build-* パッケージより先に、単体でインストールしてく
 
 %install
 [ "${RPM_BUILD_ROOT}" != "/" ] && %__rm -rf ${RPM_BUILD_ROOT}
-%__make DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} install
+%__make DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{__libdir} install
 
 %clean
 [ "${RPM_BUILD_ROOT}" != "/" ] && %__rm -rf ${RPM_BUILD_ROOT}
@@ -74,16 +76,21 @@ self-build-* パッケージより先に、単体でインストールしてく
 %config %{_sysconfdir}/self-build.conf
 %{_datadir}/apt/scripts/install-self-build-rpm.lua
 %{_datadir}/apt/scripts/check-self-build.lua
-%{_libdir}/rpm/check-self-build.sh
-%{_libdir}/rpm/install-self-build-rpm.sh
-%{_libdir}/rpm/pre-allocate-rpm.sh
-%{_libdir}/rpm/self-build-rpm.sh
-%{_libdir}/rpm/get-binary-rpm.sh
+%{__libdir}/rpm/check-self-build.sh
+%{__libdir}/rpm/install-self-build-rpm.sh
+%{__libdir}/rpm/pre-allocate-rpm.sh
+%{__libdir}/rpm/self-build-rpm.sh
+%{__libdir}/rpm/get-binary-rpm.sh
 %{_localedir}/ja/LC_MESSAGES/%{name}.mo
 %dir %{_localstatedir}/cache/self-build
 %dir %{_localstatedir}/lib/self-build
 
 %changelog
+* Thu Apr 21 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.0.1-2
+- rebuilt with rpm-4.8.1
+- defined %%__libdir
+  - s/%%{_libdir}/%%{__libdir}/g
+
 * Tue Mar 30 2010 Kazutaka HARADA <kazutaka@vinelinux.org> 1.0.1-1
 - update self-build-rpm.sh to avoid early temination of build process