From 1d296abdabc9f8f2a677a02859b02e40b345c457 Mon Sep 17 00:00:00 2001
From: Hubert Plociniczak <hubert@lshift.net>
Date: Tue, 6 Jan 2009 12:34:17 +0100
Subject: RPM %files section only lists files that are not under
 /usr/lib/erlang/lib/rabbitmq-server-$VERSION$, /usr/lib/rabbitmq and /etc.
 The first two are handled by only listing the directories and rpms checks
 them recursively.

---
 packaging/RPMS/Fedora/rabbitmq-server.spec | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index 13cfb037..aac28003 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -31,10 +31,10 @@ scalable implementation of an AMQP broker.
   %define _defaultlibdir /usr/lib
 %endif
 
-%define _erllibdir %{_defaultlibdir}/erlang/lib
-%define _rabbitbindir %{_defaultlibdir}/rabbitmq/bin
+%define _rabbit_erllibdir %{_defaultlibdir}/erlang/lib/rabbitmq_server-%{version}
+%define _rabbit_libdir %{_defaultlibdir}/rabbitmq
 
-%define _maindir %{buildroot}%{_erllibdir}/rabbitmq_server-%{version}
+%define _maindir %{buildroot}%{_rabbit_erllibdir}
 
 %pre
 if [ $1 -gt 1 ]; then
@@ -53,7 +53,7 @@ make
 rm -rf %{buildroot}
 
 make install TARGET_DIR=%{_maindir} \
-             SBIN_DIR=%{buildroot}%{_rabbitbindir} \
+             SBIN_DIR=%{buildroot}%{_rabbit_libdir}/bin \
              MAN_DIR=%{buildroot}%{_mandir}
 
 mkdir -p %{buildroot}/var/lib/rabbitmq/mnesia
@@ -81,8 +81,10 @@ rm %{_maindir}/LICENSE %{_maindir}/LICENSE-MPL-RabbitMQ %{_maindir}/INSTALL
 #Build the list of files
 rm -f %{_builddir}/filelist.%{name}.rpm
 echo '%defattr(-,root,root, -)' >> %{_builddir}/filelist.%{name}.rpm 
-(cd %{buildroot}; find . ! -regex '\./etc.*' \
-       -type f | sed -e 's/^\.//' >> %{_builddir}/filelist.%{name}.rpm)
+(cd %{buildroot}; \
+    find . -type f ! -regex '\./etc.*' \
+    	! -regex '\.\(%{_rabbit_erllibdir}\|%{_rabbit_libdir}\).*' \
+        | sed -e 's/^\.//' >> %{_builddir}/filelist.%{name}.rpm)
 
 %post
 # create rabbitmq group
@@ -116,6 +118,8 @@ fi
 %defattr(-,root,root,-)
 %dir /var/lib/rabbitmq
 %dir /var/log/rabbitmq
+%{_rabbit_erllibdir}
+%{_rabbit_libdir}
 /etc/rc.d/init.d/rabbitmq-server
 %config(noreplace) /etc/logrotate.d/rabbitmq-server
 %doc LICENSE LICENSE-MPL-RabbitMQ INSTALL
-- 
cgit v1.2.1


From 513a626ceeb9b139b137bb0b5b9d859890c057ea Mon Sep 17 00:00:00 2001
From: Hubert Plociniczak <hubert@lshift.net>
Date: Tue, 6 Jan 2009 13:33:04 +0100
Subject: Fix spaces

---
 packaging/RPMS/Fedora/rabbitmq-server.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index aac28003..5efff331 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -83,7 +83,7 @@ rm -f %{_builddir}/filelist.%{name}.rpm
 echo '%defattr(-,root,root, -)' >> %{_builddir}/filelist.%{name}.rpm 
 (cd %{buildroot}; \
     find . -type f ! -regex '\./etc.*' \
-    	! -regex '\.\(%{_rabbit_erllibdir}\|%{_rabbit_libdir}\).*' \
+        ! -regex '\.\(%{_rabbit_erllibdir}\|%{_rabbit_libdir}\).*' \
         | sed -e 's/^\.//' >> %{_builddir}/filelist.%{name}.rpm)
 
 %post
-- 
cgit v1.2.1