Hello community, here is the log from the commit of package jcip-annotations for openSUSE:Factory checked in at 2017-09-20 17:09:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jcip-annotations (Old) and /work/SRC/openSUSE:Factory/.jcip-annotations.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jcip-annotations" Wed Sep 20 17:09:52 2017 rev:13 rq:527147 version:1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/jcip-annotations/jcip-annotations.changes 2017-05-22 10:48:34.231721256 +0200 +++ /work/SRC/openSUSE:Factory/.jcip-annotations.new/jcip-annotations.changes 2017-09-20 17:09:53.709169051 +0200 @@ -1,0 +2,8 @@ +Mon Sep 18 22:08:24 UTC 2017 - [email protected] + +- Specify java source and target 1.6: build with all java-devel + providers until jdk9 +- Resurect the javadoc package +- Fix rpmlint error and clean spec file + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jcip-annotations.spec ++++++ --- /var/tmp/diff_new_pack.zeLHqF/_old 2017-09-20 17:09:54.233095298 +0200 +++ /var/tmp/diff_new_pack.zeLHqF/_new 2017-09-20 17:09:54.237094735 +0200 @@ -25,17 +25,26 @@ Url: http://www.jcip.net/ Source0: http://www.jcip.net/jcip-annotations-src.jar Source1: http://repo1.maven.org/maven/livetribe/maven/m2/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.pom -BuildRequires: java-devel = 1.5.0 +BuildRequires: fdupes +BuildRequires: java-devel >= 1.6.0 BuildRequires: javapackages-local BuildRequires: javapackages-tools -Requires: java >= 1.5.0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: unzip +Requires: java >= 1.6.0 BuildArch: noarch %description Class, field, and method level annotations for describing thread-safety policies. +%package javadoc +Summary: Javadoc for %{name} +Group: Development/Libraries/Java + +%description javadoc +Class, field, and method level annotations for describing thread-safety +policies. + %prep %setup -q -c mkdir -p target/site/apidocs/ @@ -44,10 +53,9 @@ mv net src/main/java %build -export JAVA_HOME=%{_jvmdir}/java-1.5.0 -export JFLAGS=-C - -$JAVA_HOME/bin/javac ${JFLAGS} -d target/classes $(find src/main/java -name "*.java") +export JAVA_HOME=%{_jvmdir}/java +$JAVA_HOME/bin/javac -source 1.6 -target 1.6 -d target/classes $(find src/main/java -name "*.java") +$JAVA_HOME/bin/javadoc -source 1.6 -d target/site/apidocs -sourcepath src/main/java net.jcip.annotations for f in $(find aQute/ -type f -not -name "*.class"); do cp $f target/classes/$f done @@ -66,10 +74,19 @@ install -m 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %add_maven_depmap +# javadoc +install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version} +%fdupes -s %{buildroot}%{_javadocdir}/%{name}-%{version} +ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} # ghost symlink + %files -%defattr(0644,root,root,0755) %{_javadir}/* %{_mavenpomdir}/* %{_datadir}/maven-metadata/%{name}.xml +%files javadoc +%doc %{_javadocdir}/%{name}-%{version} +%doc %{_javadocdir}/%{name} + %changelog
