diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2013-10-28 11:34:03 +0000 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2013-10-28 11:34:03 +0000 |
| commit | bb20670bb2e145342b7c5ba07dafb4e9b6b4cf82 (patch) | |
| tree | 93d1800b87ca165beb2ef6f951474bf24fa0acc0 /packaging/RPMS | |
| parent | 4163613eb274f851ae0e83038ea0a906491720e5 (diff) | |
| parent | dcb789ec73460ca7339eea8dea6a39d6f0e84ffe (diff) | |
| download | rabbitmq-server-git-bb20670bb2e145342b7c5ba07dafb4e9b6b4cf82.tar.gz | |
Merged bug25826 into stable
Diffstat (limited to 'packaging/RPMS')
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index f2195d848e..ff2d18aa99 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -12,8 +12,8 @@ Source3: rabbitmq-server.logrotate Source4: rabbitmq-server.ocf URL: http://www.rabbitmq.com/ BuildArch: noarch -BuildRequires: erlang >= R12B-3, python-simplejson, xmlto, libxslt -Requires: erlang >= R12B-3, logrotate +BuildRequires: erlang >= R13B-03, python-simplejson, xmlto, libxslt +Requires: erlang >= R13B-03, logrotate BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%{_arch}-root Summary: The RabbitMQ server Requires(post): %%REQUIRES%% @@ -46,9 +46,12 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} +# Note that we pass /tmp to DOC_INSTALL_DIR here because we're using %doc +# to actually install rabbitmq.config.example, so this is just a fake/temp path make install TARGET_DIR=%{_maindir} \ SBIN_DIR=%{buildroot}%{_rabbit_libdir}/bin \ - MAN_DIR=%{buildroot}%{_mandir} + MAN_DIR=%{buildroot}%{_mandir} \ + DOC_INSTALL_DIR=/tmp mkdir -p %{buildroot}%{_localstatedir}/lib/rabbitmq/mnesia mkdir -p %{buildroot}%{_localstatedir}/log/rabbitmq @@ -118,11 +121,15 @@ done %{_initrddir}/rabbitmq-server %config(noreplace) %{_sysconfdir}/logrotate.d/rabbitmq-server %doc LICENSE* +%doc docs/rabbitmq.config.example %clean rm -rf %{buildroot} %changelog +* Wed Oct 23 2013 emile@rabbitmq.com 3.2.0-1 +- New Upstream Release + * Thu Aug 15 2013 simon@rabbitmq.com 3.1.5-1 - New Upstream Release |