packages: glassfish/glassfish.spec - move domain1 config to /etc and domain...

[pawelz]

Author: pawelz                       Date: Mon Dec 28 16:30:35 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- move domain1 config to /etc and domain1 logs to /var/log

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

---- Diffs:

================================================================
Index: packages/glassfish/glassfish.spec
diff -u packages/glassfish/glassfish.spec:1.2 packages/glassfish/glassfish.spec:1.3
--- packages/glassfish/glassfish.spec:1.2	Mon Dec 28 16:06:46 2009
+++ packages/glassfish/glassfish.spec	Mon Dec 28 17:30:30 2009
@@ -38,19 +38,25 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sysconfdir}/%{name},/etc/rc.d/init.d,%{_sbindir},/var/lib/%{name}/domains}
+install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sbindir}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},/etc/rc.d/init.d,%{_sbindir}}
+install -d $RPM_BUILD_ROOT{/var/lib/%{name}/domains,/var/log/%{name}}
 
 cp -a glassfish/{bin,lib,modules,osgi} $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -a glassfish/config/* $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+cp -a glassfish/config $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config
 cp -a glassfish/domains/* $RPM_BUILD_ROOT/var/lib/%{name}/domains
+mv $RPM_BUILD_ROOT/var/lib/%{name}/domains/domain1/config $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/domain1
+mv $RPM_BUILD_ROOT/var/lib/%{name}/domains/domain1/logs $RPM_BUILD_ROOT/var/log/%{name}/domain1
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir}/%{name}
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 
 sed -i 's, at DATADIR@,%{_datadir},' $RPM_BUILD_ROOT%{_sbindir}/%{name}
 
-ln -s %{_sysconfdir}/%{name} $RPM_BUILD_ROOT%{_datadir}/%{name}/config
+ln -s %{_sysconfdir}/%{name}/config $RPM_BUILD_ROOT%{_datadir}/%{name}/config
 ln -s /var/lib/%{name}/domains $RPM_BUILD_ROOT%{_datadir}/%{name}/domains
+ln -s %{_sysconfdir}/%{name}/domain1 $RPM_BUILD_ROOT/var/lib/%{name}/domains/domain1/config
+ln -s /var/log/%{name}/domain1 $RPM_BUILD_ROOT/var/lib/%{name}/domains/domain1/logs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -79,12 +85,14 @@
 %defattr(644,root,root,755)
 %doc glassfish/docs glassfish/legal
 %{_datadir}/%{name}
-%dir %config(noreplace) %attr(770,root,glassfish) %verify(not md5 mtime size) %{_sysconfdir}/%{name}
-%config(noreplace) %attr(660,root,glassfish) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*
+%attr(770,root,glassfish) %dir %{_sysconfdir}/%{name}
+%attr(770,root,glassfish) %dir %{_sysconfdir}/%{name}/*
+%config(noreplace) %attr(660,root,glassfish) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*/*
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %attr(755,root,root) %{_sbindir}/%{name}
 %defattr(660,root,glassfish,770)
 /var/lib/%{name}
+%attr(770,root,glassfish) /var/log/%{name}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -92,6 +100,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2009/12/28 16:30:30  pawelz
+- move domain1 config to /etc and domain1 logs to /var/log
+
 Revision 1.2  2009/12/28 15:06:46  pawelz
 - mistake: mod 660 for files, 770 for directories.
 
================================================================

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