diff options
| author | Hubert Plociniczak <hubert@lshift.net> | 2008-09-15 12:55:07 +0100 |
|---|---|---|
| committer | Hubert Plociniczak <hubert@lshift.net> | 2008-09-15 12:55:07 +0100 |
| commit | 3c462730fe27e219e3b57ddecfeea95c35640e14 (patch) | |
| tree | be705cf982d9ebd9eb989c722deb7376c2a74e28 | |
| parent | cd0fef826c1d78c99f770c144572ded2f21be1be (diff) | |
| download | rabbitmq-server-3c462730fe27e219e3b57ddecfeea95c35640e14.tar.gz | |
Apply rpm-specific files as a patch,
instead of directly changing the source tarball
| -rw-r--r-- | packaging/RPMS/Fedora/Makefile | 20 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 2 |
2 files changed, 13 insertions, 9 deletions
diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile index 92c11c9c..a1430432 100644 --- a/packaging/RPMS/Fedora/Makefile +++ b/packaging/RPMS/Fedora/Makefile @@ -2,11 +2,12 @@ VERSION=0.0.0 SOURCE_TARBALL_DIR=../../../dist -TARBALL=$(SOURCE_TARBALL_DIR)/rabbitmq-server-$(VERSION).tar.gz +PACKAGE_VERSION_NAME=rabbitmq-server-$(VERSION) +TARBALL=$(SOURCE_TARBALL_DIR)/$(PACKAGE_VERSION_NAME).tar.gz TOP_DIR=$(shell pwd) RPM_VERSION=$(shell echo $(VERSION) | tr - _) DEFINES=--define '_topdir $(TOP_DIR)' --define '_tmppath $(TOP_DIR)/tmp' --define 'main_version $(VERSION)' --define 'rpm_version $(RPM_VERSION)' -RPM_SOURCE_DIR=rabbitmq-server-$(VERSION)/rpm +RPM_SOURCE_DIR=$(PACKAGE_VERSION_NAME)/rpm rpms: clean server @@ -15,16 +16,17 @@ prepare: mkdir -p BUILD SOURCES SPECS SRPMS RPMS tmp cp $(TOP_DIR)/$(TARBALL) SOURCES cp rabbitmq-server.spec SPECS - - mkdir -p tmp/$(RPM_SOURCE_DIR) + + rm -rf tmp/$(PACKAGE_VERSION_NAME)* + tar -zxf $(TOP_DIR)/$(TARBALL) -C tmp + cp -r tmp/$(PACKAGE_VERSION_NAME) tmp/$(PACKAGE_VERSION_NAME)-orig + + mkdir tmp/$(RPM_SOURCE_DIR) cp init.d tmp/$(RPM_SOURCE_DIR) cp rabbitmqctl_wrapper tmp/$(RPM_SOURCE_DIR) cp rabbitmq-server.logrotate tmp/$(RPM_SOURCE_DIR) - - gunzip SOURCES/rabbitmq-server-$(VERSION).tar.gz - (cd tmp; tar -rf ../SOURCES/rabbitmq-server-$(VERSION).tar $(RPM_SOURCE_DIR)/) - gzip SOURCES/rabbitmq-server-$(VERSION).tar - rm -rf tmp/rabbitmq-server* + - (cd tmp; diff -aurN $(PACKAGE_VERSION_NAME)-orig $(PACKAGE_VERSION_NAME) \ + > ../SOURCES/rpm.patch ) server: prepare rpmbuild -ba SPECS/rabbitmq-server.spec $(DEFINES) --target noarch diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index b06a88d6..b642b1fe 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -8,6 +8,7 @@ URL: http://www.rabbitmq.com/ Vendor: LShift Ltd., Cohesive Financial Technologies LLC., Rabbit Technlogies Ltd. Requires: erlang, logrotate Packager: Hubert Plociniczak <hubert@lshift.net> +Patch0: rpm.patch BuildRoot: %{_tmppath}/%{name}-%{main_version}-%{release}-root Summary: The RabbitMQ server Requires(post): chkconfig @@ -34,6 +35,7 @@ fi %prep %setup -n %{name}-%{main_version} +%patch -p1 %build make |