summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorunknown <lenz@mysql.com>2005-04-13 19:46:26 +0200
committerunknown <lenz@mysql.com>2005-04-13 19:46:26 +0200
commit3d73ea281d4ed65497b92d592c1bbf1caa0e5b2d (patch)
tree062cab7826ac51a8508bc7ee6ea88cd0b833514c /support-files
parent26d7574462a8abb69c55f5280d43ce15b66b3a29 (diff)
parentc80e4f1affc9b037f56428f18642c5768300bdac (diff)
downloadmariadb-git-3d73ea281d4ed65497b92d592c1bbf1caa0e5b2d.tar.gz
- After merge fixes
BitKeeper/deleted/.del-Do-compile~d1a6d7e535befea3: Auto merged BitKeeper/deleted/.del-Makefile.am~8eda4336dfcaefc: Auto merged BitKeeper/deleted/.del-mysqld_error.txt~95f167eb567c789d: Auto merged scripts/Makefile.am: Auto merged scripts/make_win_src_distribution.sh: Auto merged BitKeeper/deleted/.del-texi2html~74632fe370dcec73: Auto merged configure.in: - manual merge support-files/mysql.spec.sh: - manual merge
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mysql.spec.sh14
1 files changed, 6 insertions, 8 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 5c3f68d0328..9568e4b291b 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -363,11 +363,6 @@ fi
(cd libmysql/.libs; tar cf $RBR/shared-libs.tar *.so*)
(cd libmysql_r/.libs; tar rf $RBR/shared-libs.tar *.so*)
-# Save manual to avoid rebuilding
-mv Docs/manual.ps Docs/manual.ps.save
-make clean
-mv Docs/manual.ps.save Docs/manual.ps
-
#
# Only link statically on our i386 build host (which has a specially
# patched static glibc installed) - ia64 and x86_64 run glibc-2.3 (unpatched)
@@ -535,8 +530,6 @@ fi
%defattr(-,root,root,0755)
%doc COPYING README
-%doc Docs/manual.{html,ps,texi,txt}
-%doc Docs/manual_toc.html
%doc support-files/my-*.cnf
%doc support-files/ndb-*.ini
@@ -691,7 +684,12 @@ fi
# The spec file changelog only includes changes made to the spec file
# itself - note that they must be ordered by date (important when
# merging BK trees)
-%changelog
+%changelog
+* Wed Apr 13 2005 Lenz Grimmer <lenz@mysql.com>
+
+- removed the MySQL manual files (html/ps/texi) - they have been removed
+ from the MySQL sources and are now available seperately.
+
* Mon Apr 4 2005 Petr Chardin <petr@mysql.com>
- old mysqlmanager, mysqlmanagerc and mysqlmanager-pwger renamed into