diff --git a/jsr-305.changes b/jsr-305.changes index 69a666d..ffa9fec 100644 --- a/jsr-305.changes +++ b/jsr-305.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri May 19 10:53:24 UTC 2017 - dziolkowski@suse.com + +- New build dependency: javapackages-local +- removed "section free" tag +- spec cleaned using spec-cleaner + ------------------------------------------------------------------- Wed Mar 18 09:46:15 UTC 2015 - tchvatal@suse.com diff --git a/jsr-305.spec b/jsr-305.spec index 1761bb8..e29f9f1 100644 --- a/jsr-305.spec +++ b/jsr-305.spec @@ -1,7 +1,7 @@ # # spec file for package jsr-305 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,15 +16,13 @@ # -%define section free - Name: jsr-305 Version: 0.1 Release: 0 Summary: JSR 305: Annotations for Software Defect Detection in Java +# http://groups.google.com/group/jsr-305/browse_thread/thread/8105869a258c8c4f License: BSD-3-Clause Group: Development/Libraries/Java -# http://groups.google.com/group/jsr-305/browse_thread/thread/8105869a258c8c4f Url: http://code.google.com/p/jsr-305/ # svn export -r20080806 http://jsr-305.googlecode.com/svn/trunk/ jsr-305-0.1 # tar cjf jsr-305-0.1.bz2 jsr-305-0.1 @@ -33,13 +31,13 @@ Source1: jsr-305-ri-build.xml # bnc#653551 # The URL reffers to New BSD License - used == Bill Pugh, == 2008 Source2: license -Provides: jsr305 = %{version}-%{release} -Requires: javapackages-tools BuildRequires: ant BuildRequires: java-devel +BuildRequires: javapackages-local BuildRequires: javapackages-tools -BuildArch: noarch +Provides: jsr305 = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description This project contains reference implementations, test cases, and other @@ -59,8 +57,8 @@ group: http://groups.google.com/group/jsr-305. %prep %setup -q -%{__cp} -a %{SOURCE1} ri/build.xml -%{__cp} %{SOURCE2} . +cp -a %{SOURCE1} ri/build.xml +cp %{SOURCE2} . %build export OPT_JAR_LIST=: @@ -72,18 +70,18 @@ popd %install # jars -%{__mkdir_p} %{buildroot}%{_javadir} -%{__cp} -a ri/jsr-305-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar -%{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/jsr305.jar +mkdir -p %{buildroot}%{_javadir} +cp -a ri/jsr-305-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/jsr305.jar # poms -%{__mkdir_p} %{buildroot}%{_mavenpomdir} -%{__cp} -a ri/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +mkdir -p %{buildroot}%{_mavenpomdir} +cp -a ri/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %add_maven_depmap # javadoc -%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name} -%{__cp} -a ri/javadoc/* %{buildroot}%{_javadocdir}/%{name} +mkdir -p %{buildroot}%{_javadocdir}/%{name} +cp -a ri/javadoc/* %{buildroot}%{_javadocdir}/%{name} %files %defattr(0644,root,root,0755)