Accepting request 672371 from Java:packages

general clean-up of the build

OBS-URL: https://build.opensuse.org/request/show/672371
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jsr-305?expand=0&rev=16
This commit is contained in:
Stephan Kulow 2019-02-24 16:13:07 +00:00 committed by Git OBS Bridge
commit 1268eb82af
3 changed files with 22 additions and 28 deletions

View File

@ -24,7 +24,6 @@
version="true" version="true"
use="true" use="true"
windowtitle="JSR 305: Annotations for Software Defect Detection in Java"> windowtitle="JSR 305: Annotations for Software Defect Detection in Java">
<link href="${java.javadoc}"/>
</javadoc> </javadoc>
</target> </target>

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Feb 6 18:36:28 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Cleanup of spec file
- Do not distribute sampleUses as documentation
- Fix javadoc group
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 31 02:14:05 UTC 2018 - Fridrich Strba <fstrba@suse.com> Wed Oct 31 02:14:05 UTC 2018 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package jsr-305 # spec file for package jsr-305
# #
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -26,7 +26,7 @@ Summary: Correctness annotations for Java code
# are licensed under CC-BY license, see: $ grep -r Creative . # are licensed under CC-BY license, see: $ grep -r Creative .
License: BSD-3-Clause License: BSD-3-Clause
Group: Development/Libraries/Java Group: Development/Libraries/Java
Url: http://code.google.com/p/jsr-305/ URL: http://code.google.com/p/jsr-305/
# There has been no official release yet. This is a snapshot of the Subversion # There has been no official release yet. This is a snapshot of the Subversion
# repository as of 10 Sep 2013. Use the following commands to generate the # repository as of 10 Sep 2013. Use the following commands to generate the
# tarball: # tarball:
@ -39,14 +39,12 @@ Source2: NOTICE-CC-BY.txt
BuildRequires: ant BuildRequires: ant
BuildRequires: dos2unix BuildRequires: dos2unix
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildArch: noarch BuildArch: noarch
%package javadoc %package javadoc
Summary: Javadoc documentation for %{name} Summary: Javadoc documentation for %{name}
Group: Development/Libraries/Java Group: Documentation/HTML
%description %description
This package contains reference implementations, test cases, and other This package contains reference implementations, test cases, and other
@ -75,38 +73,28 @@ popd
%install %install
# jars # jars
mkdir -p %{buildroot}%{_javadir} install -dm 0755 %{buildroot}%{_javadir}
cp -a ri/jsr-305-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar install -pm 0644 ri/jsr-305-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/jsr305.jar ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/jsr305.jar
# poms # poms
mkdir -p %{buildroot}%{_mavenpomdir} install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
cp -a ri/pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
%add_maven_depmap %{name}.pom %{name}.jar -a com.google.code.findbugs:jsr305
mkdir -p %{buildroot}%{_mavenpomdir}/%{name}
cp -a pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
%add_maven_depmap %{name}/%{name}.pom %add_maven_depmap %{name}/%{name}.pom
install -pm 0644 ri/pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
%add_maven_depmap %{name}.pom %{name}.jar -a com.google.code.findbugs:jsr305
# javadoc # javadoc
mkdir -p %{buildroot}%{_javadocdir}/%{name} install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
cp -a ri/javadoc/* %{buildroot}%{_javadocdir}/%{name} cp -pr ri/javadoc/* %{buildroot}%{_javadocdir}/%{name}
%fdupes -s %{buildroot}%{_javadocdir}/%{name} %fdupes -s %{buildroot}%{_javadocdir}
%files %files -f .mfiles
%defattr(0644,root,root,0755) %license ri/LICENSE NOTICE-CC-BY
%doc ri/LICENSE NOTICE-CC-BY sampleUses
%{_javadir}/%{name}.jar
%{_javadir}/jsr305.jar %{_javadir}/jsr305.jar
%{_mavenpomdir}/*
%if %{defined _maven_repository}
%{_mavendepmapfragdir}/%{name}
%else
%{_datadir}/maven-metadata/%{name}.xml*
%endif
%files javadoc %files javadoc
%defattr(0644,root,root,0755) %license ri/LICENSE NOTICE-CC-BY
%doc ri/LICENSE NOTICE-CC-BY
%{_javadocdir}/%{name} %{_javadocdir}/%{name}
%changelog %changelog