diff options
| author | Hubert Plociniczak <hubert@lshift.net> | 2009-06-10 14:24:10 +0100 |
|---|---|---|
| committer | Hubert Plociniczak <hubert@lshift.net> | 2009-06-10 14:24:10 +0100 |
| commit | 979810d2346ae31350e2a5d08d4cf48db36451c2 (patch) | |
| tree | 8e3ebaaf4df079f2ef8cdaa5579dd512bb576601 | |
| parent | 29243c8295239285398a46c492613d0da70ff0a7 (diff) | |
| parent | 3b8c7ad5f73d075514d5a1fc6dd5ee9ee2d901d3 (diff) | |
| download | rabbitmq-server-git-979810d2346ae31350e2a5d08d4cf48db36451c2.tar.gz | |
Merge bug20801 into default
| -rw-r--r-- | packaging/RPMS/Fedora/Makefile | 6 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile index 9fe91b98d2..c74d453361 100644 --- a/packaging/RPMS/Fedora/Makefile +++ b/packaging/RPMS/Fedora/Makefile @@ -13,12 +13,10 @@ endif ifeq "x$(RPM_OS)" "xsuse" REQUIRES=/sbin/chkconfig /sbin/service -OS_DEFINES=--define '_initrddir /etc/init.d' -RELEASE_OS=.suse +OS_DEFINES=--define '_initrddir /etc/init.d' --define 'dist .suse' else REQUIRES=chkconfig initscripts OS_DEFINES=--define '_initrddir /etc/rc.d/init.d' -RELEASE_OS= endif rpms: clean server @@ -27,7 +25,7 @@ prepare: mkdir -p BUILD SOURCES SPECS SRPMS RPMS tmp cp $(TOP_DIR)/$(TARBALL) SOURCES cp rabbitmq-server.spec SPECS - sed -i 's|%%VERSION%%|$(VERSION)|;s|%%REQUIRES%%|$(REQUIRES)|;s|%%RELEASE_OS%%|$(RELEASE_OS)|' \ + sed -i 's|%%VERSION%%|$(VERSION)|;s|%%REQUIRES%%|$(REQUIRES)|' \ SPECS/rabbitmq-server.spec cp init.d SOURCES/rabbitmq-server.init diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index 3c3be609ce..875381e807 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -2,7 +2,7 @@ Name: rabbitmq-server Version: %%VERSION%% -Release: 1%%RELEASE_OS%% +Release: 1%{?dist} License: MPLv1.1 Group: Development/Libraries Source: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{version}.tar.gz |