Hello community, here is the log from the commit of package jcip-annotations for openSUSE:Factory checked in at 2013-09-11 13:38:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jcip-annotations (Old) and /work/SRC/openSUSE:Factory/.jcip-annotations.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jcip-annotations" Changes: -------- --- /work/SRC/openSUSE:Factory/jcip-annotations/jcip-annotations.changes 2012-03-01 17:20:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.jcip-annotations.new/jcip-annotations.changes 2013-09-11 13:38:42.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Sep 10 11:36:35 UTC 2013 - [email protected] + +- use add_maven_depmap from javapackages-tools +- drop javadoc build, N/A with gcc-java + +------------------------------------------------------------------- +Mon Sep 9 11:05:58 UTC 2013 - [email protected] + +- Move from jpackage-utils to javapackage-tools + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jcip-annotations.spec ++++++ --- /var/tmp/diff_new_pack.23ziLd/_old 2013-09-11 13:38:42.000000000 +0200 +++ /var/tmp/diff_new_pack.23ziLd/_new 2013-09-11 13:38:42.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package jcip-annotations # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define section free Name: jcip-annotations @@ -31,24 +32,16 @@ BuildArch: noarch BuildRequires: java-devel = 1.5.0 -BuildRequires: jpackage-utils >= 1.7.5 +BuildRequires: javapackages-tools Requires: java >= 1.5.0 -Requires(post): jpackage-utils >= 1.7.4 -Requires(postun): jpackage-utils >= 1.7.4 +Requires(post): javapackages-tools +Requires(postun): javapackages-tools %description Class, field, and method level annotations for describing thread-safety policies. -%package javadoc -Summary: Javadoc for %{name} -Group: Development/Documentation - -%description javadoc -Class, field, and method level annotations for describing thread-safety -policies. - %prep %setup -q -c @@ -66,7 +59,6 @@ %endif $JAVA_HOME/bin/javac ${JFLAGS} -d target/classes $(find src/main/java -name "*.java") -$JAVA_HOME/bin/javadoc -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 @@ -76,39 +68,19 @@ %install # jars -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} +install -d -m 755 %{buildroot}%{_javadir} install -m 644 target/%{name}-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -%add_to_maven_depmap net.jcip jcip-annotations %{version} JPP %{name} -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) + %{buildroot}%{_javadir}/%{name}.jar # pom -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom - -# javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -%update_maven_depmap - -%postun -%update_maven_depmap +install -d -m 755 %{buildroot}%{_mavenpomdir} +install -m 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +%add_maven_depmap %files -%defattr(-,root,root,-) +%defattr(0644,root,root,0755) %{_javadir}/* -%{_datadir}/maven2 +%{_mavenpomdir}/* %config %{_mavendepmapfragdir} -%files javadoc -%defattr(-,root,root,-) -%doc %{_javadocdir}/%{name}-%{version} -%doc %{_javadocdir}/%{name} - %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
