2014-11-15 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* java-1.5.0-gcj, sinjdoc: rebuilt on VineSeed
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9088 ec354946-7b23-47d6-9f5a-488ba84defc7

j/java-1.5.0-gcj/java-1.5.0-gcj-vl.spec

@@ -8,7 +8,7 @@
 
 # resolve circular dependency between sinjdoc and java-1.5.0-gcj.
 # define to 1 if sinjdoc has not been built yet.
-%define bootstrap 1
+%define bootstrap 0
 
 # the plugin subpackage is disabled because libgcj's security
 # infrastructure isn't ready to run untrusted applets.
@@ -17,7 +17,7 @@
 # the naming suffix for the gcc rpms we require (e.g., gcc4, libgcj4)
 %define gccsuffix       %{nil}
 # the version-release string for the gcj rpms we require
-%define gccver          4.4.3-9
+%define gccver          4.8.2-1
 # the version string for the java-gcj-compat release we require
 %define jgcver          1.0.79
 
@@ -56,7 +56,7 @@
 Name:    %{name}
 Summary: JPackage runtime compatibility layer for GCJ
 Version: %{javaver}.%{buildver}
-Release: 36%{?_dist_release}
+Release: 37%{?_dist_release}
 Group:   Development/Languages
 # The LICENSE file has the classpath exception, but nothing in this package
 # seems to use or even need it.
@@ -81,7 +81,7 @@ BuildRequires: openssl-devel
 BuildRequires: python-devel
 %if !%{bootstrap}
 # required for javadoc
-BuildRequires: java-1.6.0-openjdk-devel
+BuildRequires: java-1.7.0-openjdk-devel
 %endif
 BuildRequires: unzip
 # required for abs2rel
@@ -110,10 +110,10 @@ Requires(postun): alternatives
 Requires(postun): libgcj%{gccsuffix}
 Requires(postun): findutils
 # triggerin requires alternatives to install tool alternatives
-Requires(triggerin): alternatives
+Requires: alternatives
-Requires(triggerin): libgcj%{gccsuffix}
+Requires: libgcj%{gccsuffix}
 # triggerin requires jpackage-utils for abs2rel
-Requires(triggerin): jpackage-utils >= 1.7.5-1
+Requires: jpackage-utils >= 1.7.5-1
 
 # standard JPackage base provides
 Provides: jre-%{javaver}-%{origin} = %{version}-%{release}
@@ -151,7 +151,7 @@ links to simulate a JPackage-compatible runtime environment with GCJ.
 
 %package devel
 Summary: JPackage development compatibility layer for GCJ
-Group:   Development/Tools
+Group:   Development/Languages
 
 # FIXME: require libgcj-src for tools.jar symlink
 Requires:         libgcj%{gccsuffix}-src >= %{gccver}
@@ -170,11 +170,11 @@ Requires(post):   gcc-java
 # postun requires alternatives to uninstall tool alternatives
 Requires(postun): alternatives
 # triggerin requires gij to retrieve gcc version
-Requires(triggerin): libgcj%{gccsuffix}
+Requires: libgcj%{gccsuffix}
 # triggerin requires gcj to retrieve gcj header file locations
-Requires(triggerin): gcc-java
+Requires: gcc-java
 # triggerin requires jpackage-utils for abs2rel
-Requires(triggerin): jpackage-utils >= 1.7.5-1
+Requires: jpackage-utils >= 1.7.5-1
 
 # standard JPackage devel provides
 Provides: java-sdk-%{javaver}-%{origin} = %{version}
@@ -200,12 +200,12 @@ Summary: Source files for libgcj
 Summary: libgcj のソースファイル
 Group:   Development/Libraries
 
-Requires:       %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
-Requires:       libgcj%{gccsuffix}-src >= %{gccver}
+Requires: libgcj%{gccsuffix}-src >= %{gccver}
 Requires(post): libgcj%{gccsuffix}
-Requires(triggerin): libgcj%{gccsuffix}
+Requires: libgcj%{gccsuffix}
 # triggerin requires jpackage-utils for abs2rel
-Requires(triggerin): jpackage-utils >= 1.7.5-1
+Requires: jpackage-utils >= 1.7.5-1
 
 # java-gcj-compat src provides
 Provides: java-1.4.2-gcj-compat-src > 1.4.2.0-40jpp.111
@@ -286,15 +286,17 @@ plugin for applets.
 %setup -q -n java-gcj-compat-%{jgcver}
 
 # fix cert.pem path
-sed -i -e 's:/etc/pki/tls:/usr/share/ssl:g' generate-cacerts.pl
+#sed -i -e 's:/etc/pki/tls:/usr/share/ssl:g' generate-cacerts.pl
 
 %build
 # Print kernel version in logs.
 uname -a
-%configure --disable-symlinks --with-arch-directory=%{_arch} \
+%configure \
-  --with-os-directory=linux
+    --disable-symlinks \
+    --with-arch-directory=%{_arch} \
+    --with-os-directory=linux \
+    --with-security-directory=%{_sysconfdir}/java/security/security.d
 make
-#  --with-security-directory=%{_sysconfdir}/java/security/security.d
 
 # the python compiler encodes the source file's timestamp in the .pyc
 # and .pyo headers.  since aotcompile.py is generated by configure,
@@ -546,7 +548,7 @@ fi
 } || :
 
 %postun
-if [ $1 -eq 0 ]; then
+if ! [ -e "%{jrebindir}/java" ]; then
     GIJ_VERSION=$(gij%{gccsuffix} --version | head -n 2 | tail -n 1 \
 	| awk '{ print $5 }')
     /sbin/update-alternatives --remove java %{jrebindir}/java
@@ -565,7 +567,7 @@ fi
 	| awk '{ print $5 }')
 
   # Rebuild the list of security providers in classpath.security
-  suffix=security/classpath.security-$GIJ_VERSION
+  suffix=security/classpath.security
   secfiles="/usr/lib/$suffix /usr/lib64/$suffix"
 
   for secfile in $secfiles
@@ -651,14 +653,13 @@ fi
 } || :
 
 %postun devel
-if [ $1 -eq 0 ]
+if ! [ -e "%{sdkbindir}/javac" ]; then
-then
     /sbin/update-alternatives --remove javac %{sdkbindir}/javac
     /sbin/update-alternatives --remove java_sdk_%{origin} %{_jvmdir}/%{sdklnk}
     /sbin/update-alternatives --remove java_sdk_%{javaver} %{_jvmdir}/%{sdklnk}
-    /sbin/update-alternatives --auto javac
+#    /sbin/update-alternatives --auto javac
-    /sbin/update-alternatives --auto java_sdk_%{origin}
+#    /sbin/update-alternatives --auto java_sdk_%{origin}
-    /sbin/update-alternatives --auto java_sdk_%{javaver}
+#    /sbin/update-alternatives --auto java_sdk_%{javaver}
 fi
 
 %triggerin src -- libgcj%{gccsuffix}-src >= %{gccver}
@@ -672,23 +673,6 @@ fi
 } || :
 
 
-%if !%{bootstrap}
-%post javadoc
-/sbin/update-alternatives \
-  --install %{_javadocdir}/java javadocdir %{_javadocdir}/%{name} %{priority}
-
-# fix broken symlink if it's there
-if [ ! -f %{_javadocdir}/java ] ; then
-    /sbin/update-alternatives --auto javadocdir
-fi
-
-%postun javadoc
-if [ $1 -eq 0 ]; then
-    /sbin/update-alternatives --remove javadocdir %{_javadocdir}/%{name}
-    /sbin/update-alternatives --auto javadocdir
-fi
-%endif
-
 %if %{enable_plugin}
 %triggerin plugin -- libgcj%{gccsuffix} >= %{gccver}
 {
@@ -700,8 +684,7 @@ fi
 } || :
 
 %postun plugin
-if [ $1 -eq 0 ]
+if [ $1 -eq 0 ]; then
-then
   GIJ_VERSION=$(gij%{gccsuffix} --version | head -n 2 | tail -n 1 \
     | awk '{ print $5 }')
   /sbin/update-alternatives --remove libjavaplugin.so \
@@ -839,6 +822,9 @@ fi
 %endif
 
 %changelog
+* Fri Nov 14 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 1.5.0.0-37
+- rebuilt on current VineSeed
+
 * Sun Sep 19 2010 Ryoichi INAGAKI <ryo1@bc.wakwka.com> - 1.5.0.0-36
 - updated %%post, %%postun section to run update-alternatives --auto
 - updated classpath.security handling

s/sinjdoc/sinjdoc-vl.spec

@@ -1,20 +1,23 @@
 Name:           sinjdoc
 Summary:        Documentation generator for Java source code
+Summary(ja):    Java ソースコードからドキュメントを生成するためのツール
 Version:        0.5
-Release:        10%{?_dist_release}
+Release:        12%{?_dist_release}
 
-Group:          Development/Tools
 # No version given.
 License:        GPL+
+Group:          Development/Tools
 URL:            http://cscott.net/Projects/GJ/sinjdoc-latest/
+
 Source0:        http://cscott.net/Projects/GJ/sinjdoc-latest/sinjdoc-0.5.tar.gz
 Patch0:         sinjdoc-annotations.patch
 Patch1:         sinjdoc-autotools-changes.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
-BuildRequires: autoconf
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
-BuildRequires: automake16
+BuildRequires: autoconf automake
 BuildRequires: ecj >= 3.2.1
+# /usr/bin/fastjar
+BuildRequires: libgcj
 BuildRequires: gcc-java >= 4.0.2
 BuildRequires: java-gcj-compat-devel >= 1.0.70
 BuildRequires: java_cup >= 0.10
@@ -36,8 +39,10 @@ documentation from Java source code
 %patch1 -p0
 
 %build
-automake-1.6
+aclocal
+automake
 autoconf
+
 %configure
 make %{?_smp_mflags}
 
@@ -54,8 +59,8 @@ install -m 655 sinjdoc $RPM_BUILD_ROOT%{_bindir}/sinjdoc
 install -d 755 $RPM_BUILD_ROOT%{_javadir}
 install -D -m 644 sinjdoc.jar $RPM_BUILD_ROOT%{_javadir}/sinjdoc.jar
 
-rm -rf aot-compile-rpm
+#rm -rf aot-compile-rpm
-aot-compile-rpm
+#aot-compile-rpm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,9 +80,18 @@ fi
 %doc AUTHORS ChangeLog COPYING README
 %{_bindir}/sinjdoc
 %{_javadir}/sinjdoc.jar
-%{_libdir}/gcj/%{name}
+#{_libdir}/gcj/%{name}
 
 %changelog
+* Fri Nov 14 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 0.5-12
+- rebuilt on current VineSeed
+- BR: libgcj instead of fastjar
+- stopped to run aot-compile-rpm
+
+* Sat Jun  2 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.5-11
+- rebuilt with rpm-4.8.1-3
+- added BR: fastjar
+
 * Sat Sep  4 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.5-10
 - Initial build for Vine Linux