packages: rabbitmq-server/rabbitmq-server.spec - cleanup

[zbyniu]

Author: zbyniu                       Date: Mon Apr 11 20:41:08 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cleanup

---- Files affected:
packages/rabbitmq-server:
   rabbitmq-server.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/rabbitmq-server/rabbitmq-server.spec
diff -u packages/rabbitmq-server/rabbitmq-server.spec:1.2 packages/rabbitmq-server/rabbitmq-server.spec:1.3
--- packages/rabbitmq-server/rabbitmq-server.spec:1.2	Mon Jan 24 03:09:02 2011
+++ packages/rabbitmq-server/rabbitmq-server.spec	Mon Apr 11 22:41:03 2011
@@ -35,32 +35,39 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-		TARGET_DIR=$RPM_BUILD_ROOT/%{_datadir}/%{name} \
-		SBIN_DIR=$RPM_BUILD_ROOT/%{_sbindir} \
-		MAN_DIR=$RPM_BUILD_ROOT/%{_mandir} \
+	TARGET_DIR=$RPM_BUILD_ROOT/%{_datadir}/%{name} \
+	SBIN_DIR=$RPM_BUILD_ROOT%{_sbindir} \
+	MAN_DIR=$RPM_BUILD_ROOT%{_mandir}
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/rabbitmq/
 install -d $RPM_BUILD_ROOT/var/lib/rabbitmq
 install -d $RPM_BUILD_ROOT/var/log/rabbitmq
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rabbitmq/rabbitmq.conf
-install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rabbitmq/rabbitmq.conf
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-%groupadd -r -g %{gid} rabbitmq
-%useradd -r -u %{uid} -s /bin/sh -d /var/lib/rabbitmq -g rabbitmq -c "RabbitMQ Server" rabbitmq
+%groupadd -g %{gid} rabbitmq
+%useradd -u %{uid} -s /bin/sh -d /var/lib/rabbitmq -g rabbitmq -c "RabbitMQ Server" rabbitmq
 
 %post
-/sbin/chkconfig --add rabbitmq-server
+/sbin/chkconfig --add %{name}
+%service %{name} restart
+
+%preun
+if [ "$1" = "0" ]; then
+	%service %{name} stop
+	/sbin/chkconfig --del %{name}
+fi
 
 %files
 %defattr(644,root,root,755)
-%doc LICENSE README LICENSE-MPL-RabbitMQ
+%doc README
 %config(noreplace) %verify(not md5 mtime size) /etc/rabbitmq/rabbitmq.conf
-%attr(755,root,root) %{_sysconfdir}/rc.d/init.d/%{name}
+%attr(754,root,root) %{_sysconfdir}/rc.d/init.d/%{name}
 %attr(755,root,root) %{_sbindir}/*
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/ebin
@@ -82,9 +89,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2011/04/11 20:41:03  zbyniu
+- cleanup
+
 Revision 1.2  2011/01/24 02:09:02  sparky
 - BR: erlang, python, python-modules
 
 Revision 1.1  2010/10/25 21:34:23  emes
 - initial release, 2.1.1
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rabbitmq-server/rabbitmq-server.spec?r1=1.2&r2=1.3&f=u