diff options
| author | David Wragg <david@rabbitmq.com> | 2011-02-20 00:11:18 +0000 |
|---|---|---|
| committer | David Wragg <david@rabbitmq.com> | 2011-02-20 00:11:18 +0000 |
| commit | dfb0d30bde61730a5b6ddd5a51a98a39d447cba6 (patch) | |
| tree | 30f3ce644712e6d888f58442e90d7774570a0729 | |
| parent | 1f3f3b0c6c9d5aa181b3bb9306e383b22ea1d9f1 (diff) | |
| download | rabbitmq-server-bug23278.tar.gz | |
Fix "File listed twice" warnings when building RPMsbug23278
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index 5d573bde..79c9607c 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -65,12 +65,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 @@ -117,8 +113,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 |