Browse Source

fixed macros

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1766 ec354946-7b23-47d6-9f5a-488ba84defc7
owa 14 years ago
parent
commit
0e01b55189
1 changed files with 9 additions and 5 deletions
  1. 9 5
      j/java-1.6.0-openjdk/java-1.6.0-openjdk-vl.spec

+ 9 - 5
j/java-1.6.0-openjdk/java-1.6.0-openjdk-vl.spec

@@ -62,10 +62,10 @@
 %define archinstall sparcv9
 %define buildoutputdir openjdk/build/linux-sparcv9
 %endif
-#%ifnarch %{jit_arches}
-#%define archbuild %{_arch}
-#%define archinstall %{_arch}
-#%endif
+#%%ifnarch %{jit_arches}
+#%%define archbuild %{_arch}
+#%%define archinstall %{_arch}
+#%%endif
 
 # Reduce build time from 27 hours to 12 hours by only running test
 # suites on JIT architectures.
@@ -148,7 +148,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 1.%{openjdkver}%{?_dist_release}
+Release: 2.%{openjdkver}%{?_dist_release}
 
 Summary: OpenJDK Runtime Environment
 Summary(ja): OpenJDK ランタイム環境
@@ -404,6 +404,7 @@ The OpenJDK web browser plugin.
 #cp %{SOURCE7} .
 #cp %{SOURCE8} .
 
+
 %build
 unset which
 # Build IcedTea and OpenJDK.
@@ -998,6 +999,9 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Sat Sep  4 2010 Shu KONNO <owa@bg.wakwak.com> - 1.6.0.0-2.b18
+- fixed: archbuild, archinstall are overwritten
+
 * Sat Sep  4 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.6.0.0-1.b18
 - Initial build for Vine Linux