List:Commits« Previous MessageNext Message »
From:kent Date:March 3 2006 2:28am
Subject:bk commit into 5.0 tree (kent:1.2098) BUG#15769
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2098 06/03/03 03:27:27 kent@stripped +1 -0
  mysql.spec.sh:
    Don't create empty embedded RPM, bug#15769

  support-files/mysql.spec.sh
    1.132 06/03/03 03:26:21 kent@stripped +24 -20
    Don't create empty embedded RPM, bug#15769

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	c-524072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.0-release

--- 1.131/support-files/mysql.spec.sh	2006-02-10 18:07:09 +01:00
+++ 1.132/support-files/mysql.spec.sh	2006-03-03 03:26:21 +01:00
@@ -204,24 +204,24 @@
 
 Please note that this is a dynamically linked binary!
 
-%package embedded
-Requires: %{name}-devel
-Summary: MySQL - embedded library
-Group: Applications/Databases
-Obsoletes: mysql-embedded
-
-%description embedded
-This package contains the MySQL server as an embedded library.
-
-The embedded MySQL server library makes it possible to run a
-full-featured MySQL server inside the client application.
-The main benefits are increased speed and more simple management
-for embedded applications.
-
-The API is identical for the embedded MySQL version and the
-client/server version.
-
-%{see_base}
+#%package embedded
+#Requires: %{name}-devel
+#Summary: MySQL - embedded library
+#Group: Applications/Databases
+#Obsoletes: mysql-embedded
+#
+#%description embedded
+#This package contains the MySQL server as an embedded library.
+#
+#The embedded MySQL server library makes it possible to run a
+#full-featured MySQL server inside the client application.
+#The main benefits are increased speed and more simple management
+#for embedded applications.
+#
+#The API is identical for the embedded MySQL version and the
+#client/server version.
+#
+#%{see_base}
 
 %prep
 %setup -n mysql-%{mysql_version}
@@ -712,14 +712,18 @@
 %attr(755, root, root) %{_sbindir}/mysqld-max
 %attr(644, root, root) %{_libdir}/mysql/mysqld-max.sym
 
-%files embedded
-%defattr(-, root, root, 0755)
+#%files embedded
+#%defattr(-, root, root, 0755)
 # %attr(644, root, root) %{_libdir}/mysql/libmysqld.a
 
 # 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 
+* Fri Mar 03 2006 Kent Boortz <kent@stripped>
+
+- Don't output an embedded package as it is empty
+
 * Fri Jan 10 2006 Joerg Bruehe <joerg@stripped>
 
 - Use "-i" on "make test-force";
Thread
bk commit into 5.0 tree (kent:1.2098) BUG#15769kent3 Mar