SPECS: scalix.spec - place all subpackages in /scalix directory

[paszczus]

Author: paszczus                     Date: Thu Apr  2 07:41:59 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- place all subpackages in /scalix directory

---- Files affected:
SPECS:
   scalix.spec (1.31 -> 1.32) 

---- Diffs:

================================================================
Index: SPECS/scalix.spec
diff -u SPECS/scalix.spec:1.31 SPECS/scalix.spec:1.32
--- SPECS/scalix.spec:1.31	Thu Apr  2 09:23:26 2009
+++ SPECS/scalix.spec	Thu Apr  2 09:41:54 2009
@@ -148,27 +148,28 @@
 install scalix-installer/dist/scalix-installer $RPM_BUILD_ROOT%{_sbindir}/scalix-installer
 
 # Mobile
-install -d $RPM_BUILD_ROOT%{_datadir}/scalix/scalix-mobile
+install -d $RPM_BUILD_ROOT%{_datadir}/scalix/mobile
 install %{SOURCE5} $RPM_BUILD_ROOT%{_sharedstatedir}/tomcat/conf/Catalina/localhost/scalix-mobile.xml
-cp -a scalix-mobile/build/war $RPM_BUILD_ROOT%{_datadir}/scalix/scalix-mobile
+cp -a scalix-mobile/build/war/* $RPM_BUILD_ROOT%{_datadir}/scalix/mobile
 
 # Platform
-install -d $RPM_BUILD_ROOT%{_datadir}/scalix/scalix-platform
+install -d $RPM_BUILD_ROOT%{_datadir}/scalix/platform
 install %{SOURCE6} $RPM_BUILD_ROOT%{_sharedstatedir}/tomcat/conf/Catalina/localhost/scalix-platform.xml
-cp -a scalix-platform/build/war $RPM_BUILD_ROOT%{_datadir}/scalix/scalix-platform
+cp -a scalix-platform/build/war/* $RPM_BUILD_ROOT%{_datadir}/scalix/platform
 
 # SAC
-install -d $RPM_BUILD_ROOT%{_datadir}/scalix/{caa-services,scalix-admin-console,scalix-res}
+install -d $RPM_BUILD_ROOT%{_datadir}/scalix/{caa-services,admin-console,res}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sharedstatedir}/tomcat/conf/Catalina/localhost/scalix-caa-services.xml
 install %{SOURCE3} $RPM_BUILD_ROOT%{_sharedstatedir}/tomcat/conf/Catalina/localhost/scalix-admin-console.xml
 install %{SOURCE4} $RPM_BUILD_ROOT%{_sharedstatedir}/tomcat/conf/Catalina/localhost/scalix-res.xml
 install scalix-sac/caa/dist/caa-services.war $RPM_BUILD_ROOT%{_datadir}/scalix/caa-services
-install scalix-sac/console/scalix-admin-console.war $RPM_BUILD_ROOT%{_datadir}/scalix/scalix-admin-console
-install scalix-sac/res/dist/scalix-res.war $RPM_BUILD_ROOT%{_datadir}/scalix/scalix-res
+install scalix-sac/console/scalix-admin-console.war $RPM_BUILD_ROOT%{_datadir}/scalix/admin-console
+install scalix-sac/res/dist/scalix-res.war $RPM_BUILD_ROOT%{_datadir}/scalix/res
 
 # SIS
+install -d  $RPM_BUILD_ROOT%{_datadir}/scalix/sis
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sharedstatedir}/tomcat/conf/Catalina/localhost/scalix-sis.xml
-cp -a scalix-sis/build/war $RPM_BUILD_ROOT%{_datadir}/scalix/scalix-sis
+cp -a scalix-sis/build/war/* $RPM_BUILD_ROOT%{_datadir}/scalix/sis
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -184,12 +185,12 @@
 %files mobile
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sharedstatedir}/tomcat/conf/Catalina/localhost/scalix-mobile.xml
-%{_datadir}/scalix/scalix-mobile
+%{_datadir}/scalix/mobile
 
 %files platform
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sharedstatedir}/tomcat/conf/Catalina/localhost/scalix-platform.xml
-%{_datadir}/scalix/scalix-platform
+%{_datadir}/scalix/platform
 
 %files sac
 %defattr(644,root,root,755)
@@ -197,13 +198,13 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sharedstatedir}/tomcat/conf/Catalina/localhost/scalix-admin-console.xml
 %config(noreplace) %verify(not md5 mtime size) %{_sharedstatedir}/tomcat/conf/Catalina/localhost/scalix-res.xml
 %{_datadir}/scalix/caa-services
-%{_datadir}/scalix/scalix-admin-console
-%{_datadir}/scalix/scalix-res
+%{_datadir}/scalix/admin-console
+%{_datadir}/scalix/res
 
 %files sis
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sharedstatedir}/tomcat/conf/Catalina/localhost/scalix-sis.xml
-%{_datadir}/scalix/scalix-sis
+%{_datadir}/scalix/sis
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -211,11 +212,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2009/04/02 07:41:54  paszczus
+- place all subpackages in /scalix directory
+
 Revision 1.31  2009/04/02 07:23:26  paszczus
 - use uncompressed files instead of war files
 
 Revision 1.30  2009/04/01 18:18:16  paszczus
-- all packages are now builds! rel 0.2
+- all packages now builds! rel 0.2
 
 Revision 1.29  2009/04/01 12:44:42  paszczus
 - fixed typos
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/scalix.spec?r1=1.31&r2=1.32&f=u