From d0a85909343d7a6f44fcd76ce4e7f5304a56917b8fba50f06f3829332e9201ef Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 6 Feb 2019 18:39:44 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/jsr-305?expand=0&rev=28

---
 jsr-305.changes |  7 +++++++
 jsr-305.spec    | 39 ++++++++++++++-------------------------
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/jsr-305.changes b/jsr-305.changes
index a98f8f9..9a89bf7 100644
--- a/jsr-305.changes
+++ b/jsr-305.changes
@@ -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>
 
diff --git a/jsr-305.spec b/jsr-305.spec
index af67d65..4d67b42 100644
--- a/jsr-305.spec
+++ b/jsr-305.spec
@@ -26,7 +26,7 @@ Summary:        Correctness annotations for Java code
 # are licensed under CC-BY license, see: $ grep -r Creative .
 License:        BSD-3-Clause
 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
 # repository as of 10 Sep 2013.  Use the following commands to generate the
 # tarball:
@@ -39,13 +39,12 @@ Source2:        NOTICE-CC-BY.txt
 BuildRequires:  ant
 BuildRequires:  dos2unix
 BuildRequires:  fdupes
-BuildRequires:  java-devel
 BuildRequires:  javapackages-local
 BuildArch:      noarch
 
 %package javadoc
 Summary:        Javadoc documentation for %{name}
-Group:          Development/Libraries/Java
+Group:          Documentation/HTML
 
 %description
 This package contains reference implementations, test cases, and other
@@ -74,38 +73,28 @@ popd
 
 %install
 # jars
-mkdir -p %{buildroot}%{_javadir}
-cp -a ri/jsr-305-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -dm 0755 %{buildroot}%{_javadir}
+install -pm 0644 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}/%{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
+install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
+install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{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
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -a ri/javadoc/* %{buildroot}%{_javadocdir}/%{name}
-%fdupes -s %{buildroot}%{_javadocdir}/%{name}
+install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr ri/javadoc/* %{buildroot}%{_javadocdir}/%{name}
+%fdupes -s %{buildroot}%{_javadocdir}
 
-%files
-%defattr(0644,root,root,0755)
-%doc ri/LICENSE NOTICE-CC-BY sampleUses
-%{_javadir}/%{name}.jar
+%files -f .mfiles
+%license ri/LICENSE NOTICE-CC-BY
 %{_javadir}/jsr305.jar
-%{_mavenpomdir}/*
-%if %{defined _maven_repository}
-%{_mavendepmapfragdir}/%{name}
-%else
-%{_datadir}/maven-metadata/%{name}.xml*
-%endif
 
 %files javadoc
-%defattr(0644,root,root,0755)
-%doc ri/LICENSE NOTICE-CC-BY
+%license ri/LICENSE NOTICE-CC-BY
 %{_javadocdir}/%{name}
 
 %changelog