[mariadb/f19] Fix files list

Honza Horak hhorak at fedoraproject.org
Mon Oct 14 13:53:01 UTC 2013


commit 171e8b9b15206933ef2501e51940b5db66a9b856
Author: Honza HorĂ¡k <hhorak at redhat.com>
Date:   Mon Oct 14 15:52:52 2013 +0200

    Fix files list

 mariadb.spec |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/mariadb.spec b/mariadb.spec
index 5b97bbe..54aef20 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -431,8 +431,8 @@ chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/mysql_config
 
 # install INFO_SRC, INFO_BIN into libdir (upstream thinks these are doc files,
 # but that's pretty wacko --- see also mariadb-file-contents.patch)
-mv ${RPM_BUILD_ROOT}%{_pkgdocdir}/INFO_SRC ${RPM_BUILD_ROOT}%{_libdir}/mysql/
-mv ${RPM_BUILD_ROOT}%{_pkgdocdir}/INFO_BIN ${RPM_BUILD_ROOT}%{_libdir}/mysql/
+install -p -m 644 Docs/INFO_SRC ${RPM_BUILD_ROOT}%{_libdir}/mysql/
+install -p -m 644 Docs/INFO_BIN ${RPM_BUILD_ROOT}%{_libdir}/mysql/
 
 mkdir -p $RPM_BUILD_ROOT/var/log
 touch $RPM_BUILD_ROOT/var/log/mysqld.log
@@ -514,6 +514,14 @@ rm -f ${RPM_BUILD_ROOT}%{_sysconfdir}/init.d/mysql
 # remove duplicate logrotate script
 rm -f ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/mysql
 
+# remove doc files that we rather pack using %%doc
+rm -f ${RPM_BUILD_ROOT}%{_datadir}/doc/COPYING
+rm -f ${RPM_BUILD_ROOT}%{_datadir}/doc/COPYING.LESSER
+rm -f ${RPM_BUILD_ROOT}%{_datadir}/doc/INFO_BIN
+rm -f ${RPM_BUILD_ROOT}%{_datadir}/doc/INFO_SRC
+rm -f ${RPM_BUILD_ROOT}%{_datadir}/doc/INSTALL-BINARY
+rm -f ${RPM_BUILD_ROOT}%{_datadir}/doc/README
+
 # remove solaris files
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mysql/solaris/
 


More information about the scm-commits mailing list