Merged default into 18776

9 files changed, 30 insertions, 29 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/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index ca0b6b8e40..25213816dd 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -20,6 +20,7 @@ scalable implementation of an AMQP broker.
 
 %define _libdir /usr/lib/erlang
 %define _docdir /usr/share/doc
+%define _mandir /usr/share/man
 %define _maindir $RPM_BUILD_ROOT%{_libdir}/lib/rabbitmq_server-%{main_version}
 %define package_name rabbitmq-server-dist
 
@@ -36,8 +37,10 @@ fi
 %build
 mkdir %{package_name}
 mkdir %{package_name}/sbin
+mkdir %{package_name}/man
 make install TARGET_DIR=`pwd`/%{package_name} \
              SBIN_DIR=`pwd`/%{package_name}/sbin \
+             MAN_DIR=`pwd`/%{package_name}/man
              VERSION=%{main_version}
 
 %install
@@ -45,6 +48,7 @@ mkdir -p %{_maindir}
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/rabbitmq-server
 mkdir -p $RPM_BUILD_ROOT/etc/init.d
 mkdir -p $RPM_BUILD_ROOT/usr/sbin
+mkdir -p $RPM_BUILD_ROOT%{_mandir}
 
 mkdir -p $RPM_BUILD_ROOT/var/lib/rabbitmq/mnesia
 mkdir -p $RPM_BUILD_ROOT/var/log/rabbitmq
@@ -55,6 +59,7 @@ cp -r %{package_name}/src %{_maindir}
 cp -r %{package_name}/include %{_maindir}
 chmod 755  %{package_name}/sbin/*
 cp %{package_name}/sbin/* $RPM_BUILD_ROOT/usr/sbin/
+cp -r %{package_name}/man/* $RPM_BUILD_ROOT%{_mandir}/
 
 cp ../init.d $RPM_BUILD_ROOT/etc/init.d/rabbitmq-server
 chmod 775 $RPM_BUILD_ROOT/etc/init.d/rabbitmq-server
@@ -63,6 +68,8 @@ mv $RPM_BUILD_ROOT/usr/sbin/rabbitmqctl $RPM_BUILD_ROOT/usr/sbin/rabbitmqctl_rea
 cp ../rabbitmqctl_wrapper $RPM_BUILD_ROOT/usr/sbin/rabbitmqctl
 chmod 755 $RPM_BUILD_ROOT/usr/sbin/rabbitmqctl
 
+cp %{buildroot}%{_mandir}/man1/rabbitmqctl.1.gz %{buildroot}%{_mandir}/man1/rabbitmqctl_real.1.gz
+
 %post
 # create rabbitmq group
 if ! getent group rabbitmq >/dev/null; then
@@ -107,10 +114,8 @@ fi
 %defattr(-,root,root)
 %{_libdir}/lib/rabbitmq_server-%{main_version}/
 %{_docdir}/rabbitmq-server/
-/usr/sbin/rabbitmq-server
-/usr/sbin/rabbitmq-multi
-/usr/sbin/rabbitmqctl
-/usr/sbin/rabbitmqctl_real
+%{_mandir}
+/usr/sbin
 /var/lib/rabbitmq
 /var/log/rabbitmq
 /etc/init.d/rabbitmq-server
@@ -119,7 +124,7 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Wed Jul 9 2008 Tony Garnock-Jones <tonyg@lshift.net> 1.4.0
+* Thu Jul 24 2008 Tony Garnock-Jones <tonyg@lshift.net> 1.4.0
 - New upstream release
 
 * Mon Mar 3 2008 Adrien Pierard <adrian@lshift.net> 1.3.0
diff --git a/packaging/debs/Debian/Makefile b/packaging/debs/Debian/Makefile
index b49094e2a7..aeb958a7c3 100644
--- a/packaging/debs/Debian/Makefile
+++ b/packaging/debs/Debian/Makefile
@@ -20,7 +20,7 @@ package: clean
 	cp -r debian $(UNPACKED_DIR)
 	chmod -R a+x $(UNPACKED_DIR)/debian
 	UNOFFICIAL_RELEASE=$(UNOFFICIAL_RELEASE) VERSION=$(VERSION) ./check-changelog.sh rabbitmq-server $(UNPACKED_DIR)
-	cd $(UNPACKED_DIR); dpkg-buildpackage -rfakeroot $(SIGNING)
+	cd $(UNPACKED_DIR); GNUPGHOME=$(GNUPG_PATH)/.gnupg dpkg-buildpackage -rfakeroot $(SIGNING)
 	rm -rf $(UNPACKED_DIR)
 
 clean:
diff --git a/packaging/debs/Debian/debian/changelog b/packaging/debs/Debian/debian/changelog
index e6b129371e..07f5a8dd41 100644
--- a/packaging/debs/Debian/debian/changelog
+++ b/packaging/debs/Debian/debian/changelog
@@ -2,7 +2,7 @@ rabbitmq-server (1.4.0-1) testing; urgency=low
 
   * New Upstream Release
 
- -- Tony Garnock-Jones <tonyg@lshift.net>  Wed, 09 Jul 2008 14:31:23 +0100
+ -- Tony Garnock-Jones <tonyg@lshift.net>  Thu, 24 Jul 2008 13:21:48 +0100
 
 rabbitmq-server (1.3.0-1) testing; urgency=low
 
diff --git a/packaging/debs/Debian/debian/control b/packaging/debs/Debian/debian/control
index ae698e1edb..df9a330be8 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 74ff60e236..0b3f55b955 100644
--- a/packaging/debs/Debian/debian/dirs
+++ b/packaging/debs/Debian/debian/dirs
@@ -1,6 +1,6 @@
 usr/lib/erlang/lib
 usr/sbin
-usr/share/linda/overrides
+usr/share/man
 var/lib/rabbitmq/mnesia
 var/log/rabbitmq
 
diff --git a/packaging/debs/Debian/debian/rules b/packaging/debs/Debian/debian/rules
index 15b0d50a83..6edf27c15a 100644
--- a/packaging/debs/Debian/debian/rules
+++ b/packaging/debs/Debian/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/class/makefile.mk
 
 RABBIT_LIB=$(DEB_DESTDIR)usr/lib/erlang/lib/rabbitmq_server-$(DEB_UPSTREAM_VERSION)
 
-DEB_MAKE_INSTALL_TARGET := install TARGET_DIR=$(RABBIT_LIB)/ SBIN_DIR=$(DEB_DESTDIR)usr/sbin
+DEB_MAKE_INSTALL_TARGET := install TARGET_DIR=$(RABBIT_LIB)/ SBIN_DIR=$(DEB_DESTDIR)usr/sbin MAN_DIR=$(DEB_DESTDIR)usr/share/man
 
 DOCDIR=$(DEB_DESTDIR)usr/share/doc/rabbitmq-server/
 
@@ -14,5 +14,5 @@ install/rabbitmq-server::
 	rm $(RABBIT_LIB)/LICENSE*
 	mv $(DEB_DESTDIR)usr/sbin/rabbitmqctl $(DEB_DESTDIR)usr/sbin/rabbitmqctl_real
 	cp debian/rabbitmqctl_wrapper $(DEB_DESTDIR)usr/sbin/rabbitmqctl
+	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
diff --git a/packaging/generic-unix/Makefile b/packaging/generic-unix/Makefile
index 132575226c..b398869693 100644
--- a/packaging/generic-unix/Makefile
+++ b/packaging/generic-unix/Makefile
@@ -7,11 +7,10 @@ dist:
 	make -C ../.. VERSION=$(VERSION) srcdist
 	tar -zxvf ../../dist/$(SOURCE_DIR).tar.gz
 
-	mkdir $(TARGET_DIR)
-	mkdir $(TARGET_DIR)/sbin
 	make -C $(SOURCE_DIR) \
 		TARGET_DIR=`pwd`/$(TARGET_DIR) \
 		SBIN_DIR=`pwd`/$(TARGET_DIR)/sbin \
+		MAN_DIR=`pwd`/$(TARGET_DIR)/share/man \
 			install
 
 	tar -zcf $(TARGET_TARBALL).tar.gz $(TARGET_DIR)
diff --git a/packaging/windows/Makefile b/packaging/windows/Makefile
index 077461c5e0..f9437da7ca 100644
--- a/packaging/windows/Makefile
+++ b/packaging/windows/Makefile
@@ -15,6 +15,7 @@ dist:
 	rm -rf $(SOURCE_DIR)/scripts
 	rm -rf $(SOURCE_DIR)/codegen* $(SOURCE_DIR)/Makefile
 	rm -f $(SOURCE_DIR)/BUILD
+	rm -rf $(SOURCE_DIR)/docs
 
 	mv $(SOURCE_DIR) $(TARGET_DIR)
 	zip -r $(TARGET_ZIP).zip $(TARGET_DIR)