2121# DISABLE the post-percentinstall java repacking and line number stripping
2222# we need to find a way to just disable the java repacking and line number stripping, but not the autodeps
2323
24- Name: cloud
24+ Name: cloudstack
2525Summary: CloudStack IaaS Platform
2626#http://fedoraproject.org/wiki/PackageNamingGuidelines#Pre-Release_packages
2727%if "%{?_prerelease }" != ""
@@ -54,7 +54,7 @@ BuildRequires: MySQL-python
5454CloudStack is a highly-scalable elastic, open source,
5555intelligent IaaS cloud implementation.
5656
57- %package management-server
57+ %package management
5858Summary: CloudStack management server UI
5959Requires: tomcat6
6060Requires: java >= 1.6.0
@@ -78,41 +78,28 @@ Requires: mkisofs
7878Requires: MySQL-python
7979Requires: python-paramiko
8080Requires: ipmitool
81- Requires: %{name }-setup = 4.1.0
81+ Requires: %{name }-common = 4.1.0
8282Obsoletes: cloud-client < 4.1.0
8383Obsoletes: cloud-client-ui < 4.1.0
8484Obsoletes: cloud-daemonize < 4.1.0
8585Obsoletes: cloud-server < 4.1.0
8686Obsoletes: cloud-test < 4.1.0
8787Provides: cloud-client
8888Group: System Environment/Libraries
89- %description management-server
89+ %description management
9090The CloudStack management server is the central point of coordination,
9191management, and intelligence in CloudStack.
9292
93- %package setup
94- Summary: CloudStack database setup scripts
95- Requires: java >= 1.6.0
96- Requires: python
97- Requires: MySQL-python
98- Requires: %{name }-python = %{_ver }
99- Group: System Environment/Libraries
100- %description setup
101- The scripts and commands used to setup and configure the database
102-
103- %package python
104- Summary: CloudStack Python library
105- # FIXME nuke the archdependency
106- Requires: python
107- Group: System Environment/Libraries
108- %description python
109- The CloudStack Python library contains a few Python modules that the
110- CloudStack uses.
93+ %package common
94+ Summary: Apache CloudStack common files and scripts
95+ Group: System Environment/Libraries
96+ %description common
97+ The Apache CloudStack files shared between agent and management server
11198
11299%package agent
113100Summary: CloudStack Agent for KVM hypervisors
114101Requires: java >= 1.6.0
115- Requires: %{name }-python = %{_ver }
102+ Requires: %{name }-common = %{_ver }
116103Requires: libvirt
117104Requires: bridge-utils
118105Requires: ebtables
@@ -146,6 +133,16 @@ Provides: python-marvin
146133%description cli
147134Apache CloudStack command line interface
148135
136+ %package awsapi
137+ Summary: Apache CloudStack AWS API compatibility wrapper
138+ %description awsapi
139+ Apache Cloudstack AWS API compatibility wrapper
140+
141+ %package docs
142+ Summary: Apache CloudStack documentation
143+ %description docs
144+ Apache CloudStack documentations
145+
149146%prep
150147echo Doing CloudStack build
151148%setup -q -n %{name }-%{_maventag }
@@ -162,44 +159,49 @@ mvn package -Dsystemvm
162159
163160%install
164161[ ${RPM_BUILD_ROOT} != " /" ] && rm -rf ${RPM_BUILD_ROOT}
162+ # Common
163+ mkdir -p ${RPM_BUILD_ROOT} /usr/share/cloudstack-scripts
164+ cp -r scripts/* ${RPM_BUILD_ROOT} /usr/share/cloudstack-scripts
165+
166+ # Management
165167mkdir -p ${RPM_BUILD_ROOT}%{_bindir }
166- mkdir -p ${RPM_BUILD_ROOT} %{_datadir }/%{ name } /setup
167- mkdir -p ${RPM_BUILD_ROOT} /usr/share/%{ name } /management/
168- ln -sf /usr/share/tomcat6/bin ${RPM_BUILD_ROOT} /usr/share/%{ name } /management/bin
169- ln -sf /etc/cloud/management ${RPM_BUILD_ROOT} /usr/share/%{ name } /management/conf
170- ln -sf /usr/share/tomcat6/lib ${RPM_BUILD_ROOT} /usr/share/%{ name } /management/lib
171- ln -sf /var/log/cloud/management ${RPM_BUILD_ROOT} /usr/share/%{ name } /management/logs
172- ln -sf /var/cache/cloud/management/temp ${RPM_BUILD_ROOT} /usr/share/%{ name } /management/temp
173- ln -sf /var/cache/cloud/management/work ${RPM_BUILD_ROOT} /usr/share/%{ name } /management/work
174- mkdir -p ${RPM_BUILD_ROOT} /usr/share/%{ name } /management/webapps/client
175- mkdir -p ${RPM_BUILD_ROOT} /var/log/%{ name } /management
176- mkdir -p ${RPM_BUILD_ROOT} /var/log/%{ name } /agent
177- mkdir -p ${RPM_BUILD_ROOT} /var/log/%{ name } /awsapi
178- mkdir -p ${RPM_BUILD_ROOT} /var/log/%{ name } /ipallocator
179- mkdir -p ${RPM_BUILD_ROOT} /var/cache/%{ name } /management/work
180- mkdir -p ${RPM_BUILD_ROOT} /var/cache/%{ name } /management/temp
181- mkdir -p ${RPM_BUILD_ROOT} /var/lib/%{ name } /mnt
182- mkdir -p ${RPM_BUILD_ROOT} /var/lib/%{ name } /management
183- mkdir -p ${RPM_BUILD_ROOT} /etc/%{ name } /management
184- mkdir -p ${RPM_BUILD_ROOT} /etc/%{ name } /management/Catalina/localhost/client
168+ mkdir -p ${RPM_BUILD_ROOT}%{_datadir }/cloud /setup
169+ mkdir -p ${RPM_BUILD_ROOT}/usr/share/cloud /management/
170+ ln -sf /usr/share/tomcat6/bin ${RPM_BUILD_ROOT}/usr/share/cloud /management/bin
171+ ln -sf /etc/cloud/management ${RPM_BUILD_ROOT}/usr/share/cloud /management/conf
172+ ln -sf /usr/share/tomcat6/lib ${RPM_BUILD_ROOT}/usr/share/cloud /management/lib
173+ ln -sf /var/log/cloud/management ${RPM_BUILD_ROOT}/usr/share/cloud /management/logs
174+ ln -sf /var/cache/cloud/management/temp ${RPM_BUILD_ROOT}/usr/share/cloud /management/temp
175+ ln -sf /var/cache/cloud/management/work ${RPM_BUILD_ROOT}/usr/share/cloud /management/work
176+ mkdir -p ${RPM_BUILD_ROOT}/usr/share/cloud /management/webapps/client
177+ mkdir -p ${RPM_BUILD_ROOT}/var/log/cloud /management
178+ mkdir -p ${RPM_BUILD_ROOT}/var/log/cloud /agent
179+ mkdir -p ${RPM_BUILD_ROOT}/var/log/cloud /awsapi
180+ mkdir -p ${RPM_BUILD_ROOT}/var/log/cloud /ipallocator
181+ mkdir -p ${RPM_BUILD_ROOT}/var/cache/cloud /management/work
182+ mkdir -p ${RPM_BUILD_ROOT}/var/cache/cloud /management/temp
183+ mkdir -p ${RPM_BUILD_ROOT}/var/lib/cloud /mnt
184+ mkdir -p ${RPM_BUILD_ROOT}/var/lib/cloud /management
185+ mkdir -p ${RPM_BUILD_ROOT}/etc/cloud /management
186+ mkdir -p ${RPM_BUILD_ROOT}/etc/cloud /management/Catalina/localhost/client
185187mkdir -p ${RPM_BUILD_ROOT}/etc/rc.d/init.d
186188mkdir -p ${RPM_BUILD_ROOT}/etc/sysconfig
187- mkdir -p ${RPM_BUILD_ROOT} /etc/%{ name } /management/Catalina/localhost/client
189+ mkdir -p ${RPM_BUILD_ROOT}/etc/cloud /management/Catalina/localhost/client
188190
189191install -D client/target/utilities/bin/* ${RPM_BUILD_ROOT}%{_bindir }
190- install -D console-proxy/dist/systemvm.iso ${RPM_BUILD_ROOT}/usr/share/%{ name } /management/webapps/client/WEB-INF/classes/vms/systemvm.iso
191- install -D console-proxy/dist/systemvm.zip ${RPM_BUILD_ROOT}/usr/share/%{ name } /management/webapps/client/WEB-INF/classes/vms/systemvm.zip
192+ install -D console-proxy/dist/systemvm.iso ${RPM_BUILD_ROOT}/usr/share/cloud /management/webapps/client/WEB-INF/classes/vms/systemvm.iso
193+ install -D console-proxy/dist/systemvm.zip ${RPM_BUILD_ROOT}/usr/share/cloud /management/webapps/client/WEB-INF/classes/vms/systemvm.zip
192194
193- cp -r client/target/utilities/scripts/db/* ${RPM_BUILD_ROOT}%{_datadir }/%{ name } /setup
194- cp -r client/target/cloud-client-ui-4.1.0-SNAPSHOT/* ${RPM_BUILD_ROOT}/usr/share/%{ name } /management/webapps/client
195+ cp -r client/target/utilities/scripts/db/* ${RPM_BUILD_ROOT}%{_datadir }/cloud /setup
196+ cp -r client/target/cloud-client-ui-4.1.0-SNAPSHOT/* ${RPM_BUILD_ROOT}/usr/share/cloud /management/webapps/client
195197
196198for name in db.properties log4j-cloud.xml tomcat6-nonssl.conf tomcat6-ssl.conf server-ssl.xml server-nonssl.xml \
197199 catalina.policy catalina.properties db-enc.properties classpath.conf tomcat-users.xml web.xml ; do
198- mv ${RPM_BUILD_ROOT}/usr/share/%{ name } /management/webapps/client/WEB-INF/classes/$name \
199- ${RPM_BUILD_ROOT}/etc/%{ name } /management/$name
200+ mv ${RPM_BUILD_ROOT}/usr/share/cloud /management/webapps/client/WEB-INF/classes/$name \
201+ ${RPM_BUILD_ROOT}/etc/cloud /management/$name
200202done
201- mv ${RPM_BUILD_ROOT}/usr/share/%{ name } /management/webapps/client/WEB-INF/classes/context.xml \
202- ${RPM_BUILD_ROOT}/etc/%{ name } /management/Catalina/localhost/client
203+ mv ${RPM_BUILD_ROOT}/usr/share/cloud /management/webapps/client/WEB-INF/classes/context.xml \
204+ ${RPM_BUILD_ROOT}/etc/cloud /management/Catalina/localhost/client
203205
204206mkdir -p ${RPM_BUILD_ROOT}/usr/lib/python2.6/site-packages/
205207cp -r python/lib/cloudutils ${RPM_BUILD_ROOT}/usr/lib/python2.6/site-packages/
@@ -210,145 +212,152 @@ install python/bindir/cloud-external-ipallocator.py ${RPM_BUILD_ROOT}%{_bindir}/
210212install -D client/target/pythonlibs/jasypt-1.9.0.jar ${RPM_BUILD_ROOT}%{_javadir }/jasypt-1.9.0.jar
211213install -D client/target/pythonlibs/jasypt-1.8.jar ${RPM_BUILD_ROOT}%{_javadir }/jasypt-1.8.jar
212214
213- install -D packaging/centos63/cloud-ipallocator.rc ${RPM_BUILD_ROOT}/etc/rc.d/init.d/%{ name } -ipallocator
214- install -D packaging/centos63/cloud-management.rc ${RPM_BUILD_ROOT}/etc/rc.d/init.d/%{ name } -management
215- install -D packaging/centos63/cloud-management.sysconfig ${RPM_BUILD_ROOT}/etc/sysconfig/%{ name } -management
216-
217- chmod 770 ${RPM_BUILD_ROOT}%{_sysconfdir }/%{ name } /management/Catalina
218- chmod 770 ${RPM_BUILD_ROOT}%{_sysconfdir }/%{ name } /management/Catalina/localhost
219- chmod 770 ${RPM_BUILD_ROOT}%{_sysconfdir }/%{ name } /management/Catalina/localhost/client
220- chmod 770 ${RPM_BUILD_ROOT}%{_sharedstatedir }/%{ name } /mnt
221- chmod 770 ${RPM_BUILD_ROOT}%{_sharedstatedir }/%{ name } /management
222- chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir }/cache/%{ name } /management/work
223- chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir }/cache/%{ name } /management/temp
224- chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir }/log/%{ name } /management
225- chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir }/log/%{ name } /agent
226- chmod -R ugo+x ${RPM_BUILD_ROOT}/usr/share/%{ name } /management/webapps/client/WEB-INF/classes/scripts
215+ install -D packaging/centos63/cloud-ipallocator.rc ${RPM_BUILD_ROOT}/etc/rc.d/init.d/cloud -ipallocator
216+ install -D packaging/centos63/cloud-management.rc ${RPM_BUILD_ROOT}/etc/rc.d/init.d/cloud -management
217+ install -D packaging/centos63/cloud-management.sysconfig ${RPM_BUILD_ROOT}/etc/sysconfig/cloud -management
218+
219+ chmod 770 ${RPM_BUILD_ROOT}%{_sysconfdir }/cloud /management/Catalina
220+ chmod 770 ${RPM_BUILD_ROOT}%{_sysconfdir }/cloud /management/Catalina/localhost
221+ chmod 770 ${RPM_BUILD_ROOT}%{_sysconfdir }/cloud /management/Catalina/localhost/client
222+ chmod 770 ${RPM_BUILD_ROOT}%{_sharedstatedir }/cloud /mnt
223+ chmod 770 ${RPM_BUILD_ROOT}%{_sharedstatedir }/cloud /management
224+ chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir }/cache/cloud /management/work
225+ chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir }/cache/cloud /management/temp
226+ chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir }/log/cloud /management
227+ chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir }/log/cloud /agent
228+ chmod -R ugo+x ${RPM_BUILD_ROOT}/usr/share/cloud /management/webapps/client/WEB-INF/classes/scripts
227229
228230# KVM Agent
229231mkdir -p ${RPM_BUILD_ROOT}/etc/cloud/agent
230232mkdir -p ${RPM_BUILD_ROOT}/var/log/cloud/agent
231- install -D packaging/centos63/cloud-agent.rc ${RPM_BUILD_ROOT}/etc/init.d/%{ name } -agent
233+ install -D packaging/centos63/cloud-agent.rc ${RPM_BUILD_ROOT}/etc/init.d/cloud -agent
232234install -D agent/target/transformed/agent.properties ${RPM_BUILD_ROOT}/etc/cloud/agent/agent.properties
233235install -D agent/target/transformed/environment.properties ${RPM_BUILD_ROOT}/etc/cloud/agent/environment.properties
234236install -D agent/target/transformed/log4j-cloud.xml ${RPM_BUILD_ROOT}/etc/cloud/agent/log4j-cloud.xml
235237install -D agent/target/transformed/cloud-setup-agent ${RPM_BUILD_ROOT}/usr/bin/cloud-setup-agent
236238install -D agent/target/transformed/cloud-ssh ${RPM_BUILD_ROOT}/usr/bin/cloud-ssh
237- install -D plugins/hypervisors/kvm/target/%{ name } -plugin-hypervisor-kvm-%{_maventag }.jar ${RPM_BUILD_ROOT}/usr/share/cloud/java/%{ name } -plugin-hypervisor-kvm-%{_maventag }.jar
239+ install -D plugins/hypervisors/kvm/target/cloud -plugin-hypervisor-kvm-%{_maventag }.jar ${RPM_BUILD_ROOT}/usr/share/cloud/java/cloud -plugin-hypervisor-kvm-%{_maventag }.jar
238240cp plugins/hypervisors/kvm/target/dependencies/* ${RPM_BUILD_ROOT}/usr/share/cloud/java
239- mkdir -p ${RPM_BUILD_ROOT}/usr/share/cloud/scripts
240- cp -r scripts/* ${RPM_BUILD_ROOT}/usr/share/cloud/scripts
241241
242242# Usage server
243- install -D usage/target/%{ name } -usage-%{_maventag }.jar ${RPM_BUILD_ROOT}/usr/share/cloud/usage/java/%{ name } -usage-%{_maventag }.jar
243+ install -D usage/target/cloud -usage-%{_maventag }.jar ${RPM_BUILD_ROOT}/usr/share/cloud/usage/java/cloud -usage-%{_maventag }.jar
244244cp usage/target/dependencies/* ${RPM_BUILD_ROOT}/usr/share/cloud/usage/java
245- install -D packaging/centos63/cloud-usage.rc ${RPM_BUILD_ROOT}/etc/init.d/%{ name } -usage
245+ install -D packaging/centos63/cloud-usage.rc ${RPM_BUILD_ROOT}/etc/init.d/cloud -usage
246246mkdir -p ${RPM_BUILD_ROOT}/var/log/cloud/usage/
247247
248248%clean
249249[ ${RPM_BUILD_ROOT} != " /" ] && rm -rf ${RPM_BUILD_ROOT}
250250
251251
252- %preun management-server
253- /sbin/service %{ name } -management stop || true
252+ %preun management
253+ /sbin/service cloud -management stop || true
254254if [ " $1 " == " 0" ] ; then
255- /sbin/chkconfig --del %{name} -management > /dev/null 2>&1 || true
256- /sbin/service %{name} -management stop > /dev/null 2>&1 || true
255+ /sbin/chkconfig --del cloud -management > /dev/null 2>&1 || true
256+ /sbin/service cloud -management stop > /dev/null 2>&1 || true
257257fi
258258
259- %pre management-server
260- id %{ name } > /dev/null 2>&1 || /usr/sbin/useradd -M -c " CloudStack unprivileged user" \
261- -r -s /bin/sh -d %{_sharedstatedir }/%{ name } /management %{ name } || true
259+ %pre management
260+ id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -c " CloudStack unprivileged user" \
261+ -r -s /bin/sh -d %{_sharedstatedir }/cloud /management cloud || true
262262
263263# set max file descriptors for cloud user to 4096
264264sed -i /"cloud hard nofile"/d /etc/security/limits.conf
265265sed -i /"cloud soft nofile"/d /etc/security/limits.conf
266266echo "cloud hard nofile 4096" >> /etc/security/limits.conf
267267echo "cloud soft nofile 4096" >> /etc/security/limits.conf
268- rm -rf %{_localstatedir }/cache/%{ name }
268+ rm -rf %{_localstatedir }/cache/cloud
269269# user harcoded here, also hardcoded on wscript
270270
271- %post management-server
271+ %post management
272272if [ " $1 " == " 1" ] ; then
273- /sbin/chkconfig --add %{name} -management > /dev/null 2>&1 || true
274- /sbin/chkconfig --level 345 %{name} -management on > /dev/null 2>&1 || true
273+ /sbin/chkconfig --add cloud -management > /dev/null 2>&1 || true
274+ /sbin/chkconfig --level 345 cloud -management on > /dev/null 2>&1 || true
275275fi
276276
277- if [ ! -f %{_datadir }/%{ name } /management/webapps/client/WEB-INF/classes/scripts/scripts/vm/hypervisor/xenserver/vhd-util ] ; then
277+ if [ ! -f %{_datadir }/cloud /management/webapps/client/WEB-INF/classes/scripts/scripts/vm/hypervisor/xenserver/vhd-util ] ; then
278278 echo Please download vhd-util from http://download.cloud.com.s3.amazonaws.com/tools/vhd-util and put it in
279- echo %{_datadir }/%{ name } /management/webapps/client/WEB-INF/classes/scripts/vm/hypervisor/xenserver/
279+ echo %{_datadir }/cloud /management/webapps/client/WEB-INF/classes/scripts/vm/hypervisor/xenserver/
280280fi
281281
282282#No default permission as the permission setup is complex
283- %files management-server
283+ %files management
284284%defattr(-,root,root,-)
285285%doc LICENSE
286286%doc NOTICE
287- %dir %attr(0770,root,%{name}) %{_sysconfdir }/%{name }/management/Catalina
288- %dir %attr(0770,root,%{name}) %{_sysconfdir }/%{name }/management/Catalina/localhost
289- %dir %attr(0770,root,%{name}) %{_sysconfdir }/%{name }/management/Catalina/localhost/client
290- %dir %{_datadir }/%{name }/management
291- %dir %attr(0770,root,%{name}) %{_sharedstatedir }/%{name }/mnt
292- %dir %attr(0770,%{name},%{name}) %{_sharedstatedir }/%{name }/management
293- %dir %attr(0770,root,%{name}) %{_localstatedir }/cache/%{name }/management
294- %dir %attr(0770,root,%{name}) %{_localstatedir }/cache/%{name }/management/work
295- %dir %attr(0770,root,%{name}) %{_localstatedir }/cache/%{name }/management/temp
296- %dir %attr(0770,root,%{name}) %{_localstatedir }/log/%{name }/management
297- %dir %attr(0770,root,%{name}) %{_localstatedir }/log/%{name }/agent
298- %config(noreplace) %{_sysconfdir }/sysconfig/%{name }-management
299- %config(noreplace) %{_sysconfdir }/%{name }/management
300- %config(noreplace) %attr(0640,root,%{name}) %{_sysconfdir }/%{name }/management/db.properties
301- %config(noreplace) %{_sysconfdir }/%{name }/management/log4j-%{name }.xml
302- %config(noreplace) %{_sysconfdir }/%{name }/management/tomcat6-nonssl.conf
303- %config(noreplace) %{_sysconfdir }/%{name }/management/tomcat6-ssl.conf
304- %attr(0755,root,root) %{_initrddir }/%{name }-management
305- %attr(0755,root,root) %{_bindir }/%{name }-setup-management
306- %attr(0755,root,root) %{_bindir }/%{name }-update-xenserver-licenses
307- %{_datadir }/%{name }/management/*
308-
309- %files setup
310- %attr(0755,root,root) %{_bindir }/%{name }-setup-databases
311- %attr(0755,root,root) %{_bindir }/%{name }-migrate-databases
312- %attr(0755,root,root) %{_bindir }/%{name }-set-guest-password
313- %attr(0755,root,root) %{_bindir }/%{name }-set-guest-sshkey
314- %attr(0755,root,root) %{_bindir }/%{name }-sysvmadm
315- %attr(0755,root,root) %{_bindir }/%{name }-setup-encryption
316- %dir %{_datadir }/%{name }/setup
317- %{_datadir }/%{name }/setup/* .sql
318- %{_datadir }/%{name }/setup/db/* .sql
319- %{_datadir }/%{name }/setup/* .sh
320- %{_datadir }/%{name }/setup/server-setup.xml
287+ %dir %attr(0770,root,cloud) %{_sysconfdir }/cloud/management/Catalina
288+ %dir %attr(0770,root,cloud) %{_sysconfdir }/cloud/management/Catalina/localhost
289+ %dir %attr(0770,root,cloud) %{_sysconfdir }/cloud/management/Catalina/localhost/client
290+ %dir %{_datadir }/cloud/management
291+ %dir %attr(0770,root,cloud) %{_sharedstatedir }/cloud/mnt
292+ %dir %attr(0770,cloud,cloud) %{_sharedstatedir }/cloud/management
293+ %dir %attr(0770,root,cloud) %{_localstatedir }/cache/cloud/management
294+ %dir %attr(0770,root,cloud) %{_localstatedir }/cache/cloud/management/work
295+ %dir %attr(0770,root,cloud) %{_localstatedir }/cache/cloud/management/temp
296+ %dir %attr(0770,root,cloud) %{_localstatedir }/log/cloud/management
297+ %dir %attr(0770,root,cloud) %{_localstatedir }/log/cloud/agent
298+ %config(noreplace) %{_sysconfdir }/sysconfig/cloud-management
299+ %config(noreplace) %{_sysconfdir }/cloud/management
300+ %config(noreplace) %attr(0640,root,cloud) %{_sysconfdir }/cloud/management/db.properties
301+ %config(noreplace) %{_sysconfdir }/cloud/management/log4j-cloud.xml
302+ %config(noreplace) %{_sysconfdir }/cloud/management/tomcat6-nonssl.conf
303+ %config(noreplace) %{_sysconfdir }/cloud/management/tomcat6-ssl.conf
304+ %attr(0755,root,root) %{_initrddir }/cloud-management
305+ %attr(0755,root,root) %{_bindir }/cloud-setup-management
306+ %attr(0755,root,root) %{_bindir }/cloud-update-xenserver-licenses
307+ %{_datadir }/cloud/management/*
308+ %attr(0755,root,root) %{_bindir }/cloud-setup-databases
309+ %attr(0755,root,root) %{_bindir }/cloud-migrate-databases
310+ %attr(0755,root,root) %{_bindir }/cloud-set-guest-password
311+ %attr(0755,root,root) %{_bindir }/cloud-set-guest-sshkey
312+ %attr(0755,root,root) %{_bindir }/cloud-sysvmadm
313+ %attr(0755,root,root) %{_bindir }/cloud-setup-encryption
314+ %dir %{_datadir }/cloud/setup
315+ %{_datadir }/cloud/setup/* .sql
316+ %{_datadir }/cloud/setup/db/* .sql
317+ %{_datadir }/cloud/setup/* .sh
318+ %{_datadir }/cloud/setup/server-setup.xml
321319%{_javadir }/jasypt-1.9.0.jar
322320%{_javadir }/jasypt-1.8.jar
323- %doc LICENSE
324- %doc NOTICE
325-
326- %files python
327- %defattr(0644,root,root,0755)
328- %{_prefix }/lib* /python* /site-packages/%{name }*
329321%attr(0755,root,root) %{_bindir }/cloud-external-ipallocator.py
330322%attr(0755,root,root) %{_initrddir }/cloud-ipallocator
331- %dir %attr(0770,root,root) %{_localstatedir }/log/%{ name } /ipallocator
323+ %dir %attr(0770,root,root) %{_localstatedir }/log/cloud /ipallocator
332324%doc LICENSE
333325%doc NOTICE
334326
335327%files agent
336- %attr(0755,root,root) %{_bindir }/%{ name } -setup-agent
337- %attr(0755,root,root) %{_bindir }/%{ name } -ssh
328+ %attr(0755,root,root) %{_bindir }/cloud -setup-agent
329+ %attr(0755,root,root) %{_bindir }/cloud -ssh
338330%attr(0755,root,root) %{_sysconfdir }/init.d/cloud-agent
339331%config(noreplace) %{_sysconfdir }/cloud/agent
340332%dir /var/log/cloud/agent
341333%attr(0644,root,root) /usr/share/cloud/java/* .jar
342- %attr(0755,root,root) /usr/share/cloud/scripts
334+ %doc LICENSE
335+ %doc NOTICE
336+
337+ %files common
338+ %attr(0755,root,root) /usr/share/cloudstack-scripts/
339+ %doc LICENSE
340+ %doc NOTICE
343341
344342%files usage
345343%attr(0755,root,root) %{_sysconfdir }/init.d/cloud-usage
346344%attr(0644,root,root) /usr/share/cloud/usage/java/* .jar
347345%dir /var/log/cloud/usage
346+ %doc LICENSE
347+ %doc NOTICE
348348
349349%files cli
350350%doc LICENSE
351351%doc NOTICE
352+ %{_prefix }/lib* /python* /site-packages/cloud*
353+
354+ %files docs
355+ %doc LICENSE
356+ %doc NOTICE
357+
358+ %files awsapi
359+ %doc LICENSE
360+ %doc NOTICE
352361
353362
354363%changelog
0 commit comments