bzr commit into mysql-5.4 branch (joerg:2874)

[Joerg Bruehe]

#At file:///MySQL/REPO/V54/bug33248-5.4/ based on revid:joerg@stripped

 2874 Joerg Bruehe	2009-08-20 [merge]
      Upmerge step 5 of the spec file algnment from 5.1 into 5.4
      
      Work in progress, not yet to be pushed.

    modified:
      support-files/mysql.spec.sh
=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh	2009-08-17 21:23:22 +0000
+++ b/support-files/mysql.spec.sh	2009-08-20 11:12:51 +0000
@@ -50,7 +50,6 @@
 # http://www.redhat.com/archives/rpm-list/2003-February/msg00275.html
 # http://www.redhat.com/archives/rhl-devel-list/2004-January/msg01546.html
 # http://lists.opensuse.org/archive/opensuse-commit/2006-May/1171.html
-
 %define __os_install_post /usr/lib/rpm/brp-compress
 
 # ------------------------------------------------------------------------------
@@ -79,9 +78,12 @@
 %else
 %define release 0.glibc23
 %endif
-%define mysql_license GPL
+
 %define server_suffix   -standard
 
+%define mysql_license GPL
+%define src_dir mysql-%{mysql_version}
+
 ##############################################################################
 # Main spec file section
 ##############################################################################
@@ -92,7 +94,7 @@ Group:		Applications/Databases
 Version:	@MYSQL_NO_DASH_VERSION@
 Release:	%{release}
 License:	Copyright 2000-2008 MySQL AB, @MYSQL_COPYRIGHT_YEAR@ Sun Microsystems, Inc.  All rights reserved.  Use is subject to license terms.  Under %{mysql_license} license as shown in the Description field.
-Source:		http://www.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/mysql-%{mysql_version}.tar.gz
+Source:		http://www.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz
 URL:		http://www.mysql.com/
 Packager:	%{mysql_vendor}: MySQL Release Engineering Team <build@stripped>
 Vendor:		%{mysql_vendor}
@@ -281,10 +283,10 @@ client/server version.
 
 %prep
 # We unpack the source two times, for 'debug' and 'release' build.
-%setup -T -a 0 -c -n mysql-%{mysql_version}
-mv mysql-%{mysql_version} mysql-debug-%{mysql_version}
-%setup -D -T -a 0 -n mysql-%{mysql_version}
-mv mysql-%{mysql_version} mysql-release-%{mysql_version}
+%setup -T -a 0 -c -n %{src_dir}
+mv %{src_dir} mysql-debug-%{mysql_version}
+%setup -D -T -a 0 -n %{src_dir}
+mv %{src_dir} mysql-release-%{mysql_version}
 
 ##############################################################################
 # The actual build
@@ -348,6 +350,7 @@ sh -c  "PATH=\"${MYSQL_BUILD_PATH:-$PATH
 	    "
  make
 }
+# end of function definition "BuildMySQL"
 
 # Use our own copy of glibc
 
@@ -454,7 +457,7 @@ fi
 
 %install
 RBR=$RPM_BUILD_ROOT
-MBD=$RPM_BUILD_DIR/mysql-%{mysql_version}/mysql-release-%{mysql_version}
+MBD=$RPM_BUILD_DIR/%{src_dir}/mysql-release-%{mysql_version}
 
 # Ensure that needed directories exists
 install -d $RBR%{_sysconfdir}/{logrotate.d,init.d}
@@ -492,7 +495,7 @@ rm -fr $RBR%{_datadir}/sql-bench
 
 # Create a symlink "rcmysql", pointing to the init.script. SuSE users
 # will appreciate that, as all services usually offer this.
-ln -s %{_sysconfdir}/init.d/mysql $RPM_BUILD_ROOT%{_sbindir}/rcmysql
+ln -s %{_sysconfdir}/init.d/mysql $RBR%{_sbindir}/rcmysql
 
 # Touch the place where the my.cnf config file and mysqlmanager.passwd
 # (MySQL Instance Manager password file) might be located
@@ -577,12 +580,12 @@ fi
 if test -x %{_sysconfdir}/init.d/mysql
 then
   %{_sysconfdir}/init.d/mysql stop > /dev/null 2>&1
-  echo "Giving mysqld a couple of seconds to exit nicely"
+  echo "Giving mysqld 5 seconds to exit nicely"
   sleep 5
 elif test -x %{_sysconfdir}/rc.d/init.d/mysql
 then
   %{_sysconfdir}/rc.d/init.d/mysql stop > /dev/null 2>&1
-  echo "Giving mysqld a couple of seconds to exit nicely"
+  echo "Giving mysqld 5 seconds to exit nicely"
   sleep 5
 fi
 
@@ -591,9 +594,7 @@ mysql_datadir=%{mysqldatadir}
 
 # ------------------------------------------------------------------------------
 # Create data directory if needed
-if test ! -d $mysql_datadir; then mkdir -m 755 $mysql_datadir; fi
-if test ! -d $mysql_datadir/mysql; then mkdir $mysql_datadir/mysql; fi
-if test ! -d $mysql_datadir/test; then mkdir $mysql_datadir/test; fi
+mkdir -m 755 -p $mysql_datadir/mysql $mysql_datadir/test
 
 # ------------------------------------------------------------------------------
 # Make MySQL start/shutdown automatically when the machine does it.
@@ -650,10 +651,9 @@ sleep 2
 
 %if %{CLUSTER_BUILD}
 %post ndb-storage
-mysql_clusterdir=/var/lib/mysql-cluster
 
 # Create cluster directory if needed
-if test ! -d $mysql_clusterdir; then mkdir -m 755 $mysql_clusterdir; fi
+mkdir -m 755 -p /var/lib/mysql-cluster
 %endif
 
 %preun server
@@ -706,11 +706,15 @@ fi
 %doc %attr(644, root, man) %{_mandir}/man1/myisamchk.1*
 %doc %attr(644, root, man) %{_mandir}/man1/myisamlog.1*
 %doc %attr(644, root, man) %{_mandir}/man1/myisampack.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_convert_table_format.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_fix_extensions.1*
 %doc %attr(644, root, man) %{_mandir}/man8/mysqld.8*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqld_multi.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqld_safe.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql_fix_privilege_tables.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql_install_db.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_secure_installation.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_setpermission.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql_upgrade.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqlhotcopy.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqlman.1*
@@ -722,6 +726,8 @@ fi
 %doc %attr(644, root, man) %{_mandir}/man1/mysqlbug.1*
 %doc %attr(644, root, man) %{_mandir}/man1/perror.1*
 %doc %attr(644, root, man) %{_mandir}/man1/replace.1*
+%doc %attr(644, root, man) %{_mandir}/man1/resolve_stack_dump.1*
+%doc %attr(644, root, man) %{_mandir}/man1/resolveip.1*
 
 %ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf
 %ghost %config(noreplace,missingok) %{_sysconfdir}/mysqlmanager.passwd
@@ -756,6 +762,7 @@ fi
 %attr(755, root, root) %{_sbindir}/mysqld-debug
 %attr(755, root, root) %{_sbindir}/mysqlmanager
 %attr(755, root, root) %{_sbindir}/rcmysql
+%attr(644, root, root) %{_libdir}/mysql/mysqld-debug.sym
 
 %attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql
 %attr(755, root, root) %{_sysconfdir}/init.d/mysql
@@ -780,6 +787,7 @@ fi
 %doc %attr(644, root, man) %{_mandir}/man1/msql2mysql.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysql_find_rows.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_waitpid.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqlaccess.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqladmin.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqlbinlog.1*
@@ -906,13 +914,15 @@ fi
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog
-* Thu Aug 13 2009 - Mon Aug 17 2009 Joerg Bruehe <joerg.bruehe@stripped>
+* Thu Aug 13 2009 - Thu Aug 20 2009 Joerg Bruehe <joerg.bruehe@stripped>
 
 - Start a general spec file cleanup, to avoid unnecessary differences:
   - Eliminate trailing blanks.
   - Use "tab" for indenting build options.
   - Let MYSQL_BUILD_CC override CC (similar for CXX).
   - Add marker blocks for various sections.
+  - Handle some "unpackaged files".
+  - Introduce variable "%{srcdir}".
 
 * Fri Nov 07 2008 Joerg Bruehe <joerg@stripped>
 


Attachment: [text/bzr-bundle] bzr/[e-mail]