Merge bug19200 into bug19193

4 files changed, 13 insertions, 19 deletions

diff --git a/packaging/RPMS/Fedora/README.txt b/packaging/RPMS/Fedora/README.txt
index a7db530b24..6f31325970 100644
--- a/packaging/RPMS/Fedora/README.txt
+++ b/packaging/RPMS/Fedora/README.txt
@@ -1,8 +1,7 @@
 Notes on creating rpms for rabbitmq
 
-Assuming that rpm will be built under $TOP_DIR/rpm
-directory the rpm macros configuration file
-would look like:
+Assuming that rpm will be built under $TOP_DIR/rpm,
+the main configuration variables would look like:
 
 %_topdir $TOP_DIR/rpm
 %_tmppath $TOP_DIR/rpm/tmp
@@ -11,11 +10,7 @@ would look like:
 %_includedir /usr/include
 %_mandir /usr/share/man
 
-Where $TOP_DIR can be any directory (usually $HOME)
-However this configuration has to be under the following
-path:
-$HOME/.rpmmacros
-since this is a fixed place where rpmbuild looks for macros.
+Where $TOP_DIR can be any directory (default is $HOME).
 
 The $TOP_DIR/rpm directory has following structure:
 
@@ -24,14 +19,14 @@ rpm
  +---- SOURCES	// where source tarballs are put
  +---- SPECS	// directory containing specs
  +---- SRPMS	// rpmbuild puts here srpms
- +---- RPMS		// rpmbuils puts here rpms
- +---- tmp		// where rpm packages are built
+ +---- RPMS     // rpmbuils puts here rpms
+ +---- tmp      // where rpm packages are built
  
 Makefile will copy the source tarball from fixed directory
 specified by $TARBALL_DIR to SOURCES directory and 
 similarly specs from $SPEC_DIR to SPECS directory.
  
-'make rpms' should create both client and server rabbitmq.
+'make rpms' should create rabbitmq-server package.
 If there are any errors reported by rpmbuild this is
 possibly due to incorrect name of the packages
 (if all dependencies are satisifed) - different distros
@@ -39,15 +34,16 @@ can have slightly different names.
 
 rpms and srpms are placed in their respective directories.
 
-'make prepare' will create the necessary structure and
-create the rpmmacros file. Change top variables to adjust
-it to your system. Note that it will *overwrite* any current
-rpmmacros configuration file.
+'make prepare' will create the necessary structure.
+Change main configuration variables specified in the 'DEFINES'
+variable in the Makefile to adjust it to your system.
+Note that it will *overwrite* any current rpmmacros
+configurations.
 
 The first thing to do for building rpms is to create you own
 source tarball of AMQ. In the spec files two top variables
 determine the name of the tarball. Adjust it to you needs.
-The final name has to match the *Source* tag in specs' headers.
+The final name has to match the *Source* tag in spec's headers.
 
 For information on how to sign the package see:
 http://fedoranews.org/tchung/gpg/
diff --git a/packaging/debs/Debian/debian/control b/packaging/debs/Debian/debian/control
index 0696eca7cb..bc691bc7b6 100644
--- a/packaging/debs/Debian/debian/control
+++ b/packaging/debs/Debian/debian/control
@@ -12,4 +12,4 @@ Description: An AMQP server written in Erlang
  RabbitMQ is an implementation of AMQP, the emerging standard for high
  performance enterprise messaging. The RabbitMQ server is a robust and
  scalable implementation of an AMQP broker.
-  Homepage: http://www.rabbitmq.com/
+Homepage: http://www.rabbitmq.com/
diff --git a/packaging/debs/Debian/debian/dirs b/packaging/debs/Debian/debian/dirs
index 1b15b0c34f..74f8631437 100644
--- a/packaging/debs/Debian/debian/dirs
+++ b/packaging/debs/Debian/debian/dirs
@@ -1,7 +1,6 @@
 usr/lib/erlang/lib
 usr/sbin
 usr/share/man
-usr/share/linda/overrides
 var/lib/rabbitmq/mnesia
 var/log/rabbitmq
 etc/logrotate.d
diff --git a/packaging/debs/Debian/debian/rules b/packaging/debs/Debian/debian/rules
index 606bbfd1d1..39af711c13 100644
--- a/packaging/debs/Debian/debian/rules
+++ b/packaging/debs/Debian/debian/rules
@@ -17,4 +17,3 @@ install/rabbitmq-server::
 	cp debian/rabbitmq-server.logrotate $(DEB_DESTDIR)etc/logrotate.d/rabbitmq-server
 	cp $(DEB_DESTDIR)usr/share/man/man1/rabbitmqctl.1.gz $(DEB_DESTDIR)usr/share/man/man1/rabbitmqctl_real.1.gz
 	chmod a+x $(DEB_DESTDIR)usr/sbin/rabbitmqctl
-	echo "Tag: usr-lib-in-arch-all" > $(DEB_DESTDIR)usr/share/linda/overrides/rabbitmq-server