packages (MYSQL_5_0): mysql/mysql.spec - fix lib64 packaging

glen glen at pld-linux.org
Sat Mar 12 15:29:32 CET 2011


Author: glen                         Date: Sat Mar 12 14:29:32 2011 GMT
Module: packages                      Tag: MYSQL_5_0
---- Log message:
- fix lib64 packaging

---- Files affected:
packages/mysql:
   mysql.spec (1.353.2.99 -> 1.353.2.100) 

---- Diffs:

================================================================
Index: packages/mysql/mysql.spec
diff -u packages/mysql/mysql.spec:1.353.2.99 packages/mysql/mysql.spec:1.353.2.100
--- packages/mysql/mysql.spec:1.353.2.99	Thu Feb 24 15:55:49 2011
+++ packages/mysql/mysql.spec	Sat Mar 12 15:29:27 2011
@@ -26,7 +26,7 @@
 Summary(zh_CN.UTF-8):	MySQL数据库服务器
 Name:		mysql
 Version:	5.0.92
-Release:	1
+Release:	2
 License:	GPL + MySQL FLOSS Exception
 Group:		Applications/Databases
 Source0:	ftp://gd.tuwien.ac.at/db/mysql/Downloads/MySQL-5.0/%{name}-%{version}.tar.gz
@@ -676,11 +676,11 @@
 %endif
 
 %if %{with sphinx}
-rm -f $RPM_BUILD_ROOT/usr/lib/mysql/sphinx.a
-rm -f $RPM_BUILD_ROOT/usr/lib/mysql/sphinx.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/mysql/sphinx.a
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/mysql/sphinx.la
 # TODO: patch build with -avoid-version
-rm -f $RPM_BUILD_ROOT/usr/lib/mysql/sphinx.so.0
-mv -f $RPM_BUILD_ROOT/usr/lib/mysql/sphinx.so{.0.0.0,}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/mysql/sphinx.so.0
+mv $RPM_BUILD_ROOT%{_libdir}/mysql/sphinx.so{.0.0.0,}
 %endif
 
 install mysqld.conf $RPM_BUILD_ROOT%{_datadir}/mysql/mysqld.conf
@@ -1130,6 +1130,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.353.2.100  2011/03/12 14:29:27  glen
+- fix lib64 packaging
+
 Revision 1.353.2.99  2011/02/24 14:55:49  glen
 - up to 5.0.92
 - package new sphinx plugin files
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.353.2.99&r2=1.353.2.100&f=u



More information about the pld-cvs-commit mailing list