summaryrefslogtreecommitdiff
path: root/packaging/RPMS
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2011-02-25 12:40:09 +0000
committerMatthew Sackman <matthew@rabbitmq.com>2011-02-25 12:40:09 +0000
commitd272bdb9ad30ebe50bc91d86df85ae459c2ab057 (patch)
treeabd63101f19786e8b7f2a6c65df24271e5678bb6 /packaging/RPMS
parente8aef51c0c033eccc863f2659fb5fd2618da8f36 (diff)
parent4a9207a8016351dc70ae9a48156f4d112a272650 (diff)
downloadrabbitmq-server-git-d272bdb9ad30ebe50bc91d86df85ae459c2ab057.tar.gz
Merging default to bug23483
Diffstat (limited to 'packaging/RPMS')
-rw-r--r--packaging/RPMS/Fedora/rabbitmq-server.spec10
1 files changed, 2 insertions, 8 deletions
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index 009d52998e..ae9b205950 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -64,12 +64,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/rabbitmq
rm %{_maindir}/LICENSE %{_maindir}/LICENSE-MPL-RabbitMQ %{_maindir}/INSTALL
#Build the list of files
-rm -f %{_builddir}/%{name}.files
-echo '%defattr(-,root,root, -)' >> %{_builddir}/%{name}.files
-(cd %{buildroot}; \
- find . -type f ! -regex '\.%{_sysconfdir}.*' \
- ! -regex '\.\(%{_rabbit_erllibdir}\|%{_rabbit_libdir}\).*' \
- | sed -e 's/^\.//' >> %{_builddir}/%{name}.files)
+echo '%defattr(-,root,root, -)' >%{_builddir}/%{name}.files
+find %{buildroot} -path %{buildroot}%{_sysconfdir} -prune -o '!' -type d -printf "/%%P\n" >>%{_builddir}/%{name}.files
%pre
@@ -116,8 +112,6 @@ done
%attr(0750, rabbitmq, rabbitmq) %dir %{_localstatedir}/lib/rabbitmq
%attr(0750, rabbitmq, rabbitmq) %dir %{_localstatedir}/log/rabbitmq
%dir %{_sysconfdir}/rabbitmq
-%{_rabbit_erllibdir}
-%{_rabbit_libdir}
%{_initrddir}/rabbitmq-server
%config(noreplace) %{_sysconfdir}/logrotate.d/rabbitmq-server
%doc LICENSE LICENSE-MPL-RabbitMQ