mirror of
				https://github.com/apache/cloudstack.git
				synced 2025-10-26 08:42:29 +01:00 
			
		
		
		
	remove mysql-connector-java.jar from rpm package
This commit is contained in:
		
							parent
							
								
									6318e88c7d
								
							
						
					
					
						commit
						55980c5338
					
				| @ -115,6 +115,7 @@ CloudStack uses. | |||||||
| %package deps | %package deps | ||||||
| Summary:   CloudStack library dependencies | Summary:   CloudStack library dependencies | ||||||
| Requires: java >= 1.6.0 | Requires: java >= 1.6.0 | ||||||
|  | Requires: mysql-connector-java | ||||||
| Obsoletes: vmops-deps < %{version}-%{release} | Obsoletes: vmops-deps < %{version}-%{release} | ||||||
| Group:     System Environment/Libraries | Group:     System Environment/Libraries | ||||||
| %description deps | %description deps | ||||||
| @ -466,7 +467,6 @@ fi | |||||||
| %{_javadir}/httpcore-4.0.jar | %{_javadir}/httpcore-4.0.jar | ||||||
| %{_javadir}/mail-1.4.jar | %{_javadir}/mail-1.4.jar | ||||||
| %{_javadir}/activation-1.1.jar | %{_javadir}/activation-1.1.jar | ||||||
| %{_javadir}/mysql-connector-java-5.1.21.jar |  | ||||||
| %{_javadir}/xapi-5.6.100-1-SNAPSHOT.jar | %{_javadir}/xapi-5.6.100-1-SNAPSHOT.jar | ||||||
| %{_javadir}/log4j-*.jar | %{_javadir}/log4j-*.jar | ||||||
| %{_javadir}/apache-log4j-extras-1.1.jar | %{_javadir}/apache-log4j-extras-1.1.jar | ||||||
|  | |||||||
| @ -164,7 +164,7 @@ def build_dependences (): | |||||||
| 
 | 
 | ||||||
|         bld.install_files('${JAVADIR}',start_path.ant_glob(["apache-log4j-extras-1.1.jar", "libvirt-0.4.8.jar", "axis2-1.5.1.jar", "jstl-1.2.jar", "commons-discovery-0.5.jar", "commons-codec-1.6.jar", "ejb-api-3.0.jar", "xmlrpc-client-3.1.3.jar", "commons-dbcp-1.4.jar", "commons-pool-1.6.jar", "gson-1.7.1.jar",  |         bld.install_files('${JAVADIR}',start_path.ant_glob(["apache-log4j-extras-1.1.jar", "libvirt-0.4.8.jar", "axis2-1.5.1.jar", "jstl-1.2.jar", "commons-discovery-0.5.jar", "commons-codec-1.6.jar", "ejb-api-3.0.jar", "xmlrpc-client-3.1.3.jar", "commons-dbcp-1.4.jar", "commons-pool-1.6.jar", "gson-1.7.1.jar",  | ||||||
|          "netscaler-1.0.jar", "netscaler-sdx-1.0.jar", "backport-util-concurrent-3.1.jar", "ehcache-1.5.0.jar", "httpcore-4.0.jar", "log4j-1.2.16.jar", "trilead-ssh2-build213-svnkit-1.3-patch.jar", "cglib-nodep-2.2.2.jar", "xmlrpc-common-3.*.jar",  |          "netscaler-1.0.jar", "netscaler-sdx-1.0.jar", "backport-util-concurrent-3.1.jar", "ehcache-1.5.0.jar", "httpcore-4.0.jar", "log4j-1.2.16.jar", "trilead-ssh2-build213-svnkit-1.3-patch.jar", "cglib-nodep-2.2.2.jar", "xmlrpc-common-3.*.jar",  | ||||||
|          "xmlrpc-client-3.*.jar", "axis-1.4.jar", "wsdl4j-1.6.2.jar", "bcprov-jdk16-1.46.jar", "jsch-0.1.42.jar", "jasypt-1.9.0.jar", "commons-configuration-1.8.jar", "commons-lang-2.6.jar",  "mail-1.4.jar", "activation-1.1.jar", "mysql-connector-java-5.1.21.jar", "xapi-5.6.100-1-SNAPSHOT.jar"], excl = excludes), cwd=start_path) |          "xmlrpc-client-3.*.jar", "axis-1.4.jar", "wsdl4j-1.6.2.jar", "bcprov-jdk16-1.46.jar", "jsch-0.1.42.jar", "jasypt-1.9.0.jar", "commons-configuration-1.8.jar", "commons-lang-2.6.jar",  "mail-1.4.jar", "activation-1.1.jar",  "xapi-5.6.100-1-SNAPSHOT.jar"], excl = excludes), cwd=start_path) | ||||||
| 
 | 
 | ||||||
| #def build_console_proxy (): | #def build_console_proxy (): | ||||||
| 	# binary unsubstitutable files: | 	# binary unsubstitutable files: | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user