Author: glen Date: Mon Dec 27 21:10:29 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- use INSTALL_LAYOUT=RPM for default paths, keep overrides we disagree
---- Files affected:
packages/mysql:
mysql.spec (1.508 -> 1.509)
---- Diffs:
================================================================
Index: packages/mysql/mysql.spec
diff -u packages/mysql/mysql.spec:1.508 packages/mysql/mysql.spec:1.509
--- packages/mysql/mysql.spec:1.508 Mon Dec 27 22:06:11 2010
+++ packages/mysql/mysql.spec Mon Dec 27 22:10:23 2010
@@ -558,22 +558,9 @@
-DWITH_COMMENT="PLD Linux Distribution MySQL RPM" \
-DWITH_LIBWRAP=%{?with_tcpd:ON}%{?!with_tcpd:OFF} \
-DCURSES_INCLUDE_PATH=/usr/include/ncurses \
- -DCMAKE_INSTALl_PREFIX="" \
-DMYSQL_UNIX_ADDR=/var/lib/%{name}/%{name}.sock \
- -DINSTALL_INCLUDEDIR=%{_includedir}/%{name} \
- -DINSTALL_BINDIR=%{_bindir} \
- -DINSTALL_DOCDIR=%{_docdir}/%{name}-%{version} \
- -DINSTALL_DOCREADMEDIR=%{_docdir}/%{name}-%{version} \
- -DINSTALL_INFODIR=%{_infodir} \
- -DINSTALL_LIBDIR=%{_libdir} \
- -DINSTALL_MANDIR=%{_mandir} \
- -DINSTALL_MYSQLDATADIR=/var/lib/%{name} \
- -DINSTALL_MYSQLSHAREDIR=%{_datadir}/%{name} \
- -DINSTALL_MYSQLTESTDIR=%{_datadir}/%{name}-test \
- -DINSTALL_PLUGINDIR=%{_libdir}/%{name}/plugin \
- -DINSTALL_SBINDIR=%{_sbindir} \
- -DINSTALL_SCRIPTDIR=%{_bindir} \
- -DINSTALL_SHAREDIR=%{_datadir} \
+ -DINSTALL_LAYOUT=RPM \
+ -DINSTALL_MYSQLTESTDIR_RPM="" \
-DINSTALL_SQLBENCHDIR=%{_datadir} \
-DINSTALL_SUPPORTFILESDIR=%{_datadir}/%{name}-support \
..
@@ -633,7 +620,6 @@
sed -i -e '/libs/s/$ldflags//' $RPM_BUILD_ROOT%{_bindir}/mysql_config
# remove known unpackaged files
-rm -rf $RPM_BUILD_ROOT%{_datadir}/mysql-test
rm -rf $RPM_BUILD_ROOT%{_datadir}/mysql-support
# remove .txt variants for .sys messages
@@ -1109,6 +1095,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.509 2010/12/27 21:10:23 glen
+- use INSTALL_LAYOUT=RPM for default paths, keep overrides we disagree
+
Revision 1.508 2010/12/27 21:06:11 glen
- only need gcc4 in build section
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.508&r2=1.509&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
