[Bug 1312015] Review Request: javadocofflinesearch - Tool for offline searching in your docs via browser

[bugzilla at redhat.com]

https://bugzilla.redhat.com/show_bug.cgi?id=1312015



--- Comment #12 from jiri vanek <jvanek at redhat.com> ---
--- /home/jvanek/git/javadocofflinesearch/javadocofflinesearch.spec-old
+++ /home/jvanek/git/javadocofflinesearch/javadocofflinesearch.spec
@@ -6,18 +6,17 @@
 Summary:        Tool for offline searching in your docs via browser
 BuildArch:      noarch

-License:        GPLv2
-URL:            https://github.com/judovana/JavadocOfflineSearch
-Source0:       
https://github.com/judovana/JavadocOfflineSearch/releases/tag/%{srcname}-2.2/%{srcname}-%{srcname}-%{version}.tar.gz
+License:        GPLv3
+URL:            https://github.com/judovana/%{srcname}
+Source0:       
https://github.com/judovana/%{srcname}/releases/tag/%{srcname}-2.2/%{srcname}-%{srcname}-%{version}.tar.gz
+# already fixed in upstream
https://github.com/judovana/JavadocOfflineSearch/commit/853285f3105506b860c762f534e1a7c2733a2c61
 Patch1:         javadocFixes.patch

-BuildRequires:  jpackage-utils
-BuildRequires:  java-devel
 BuildRequires:  ant
 BuildRequires:  tagsoup
 BuildRequires:  lucene-core
 #BuildRequires:  lucene-analyzers-common hidden in
-BuildRequires:   lucene-analysis
+BuildRequires:  lucene-analysis
 BuildRequires:  lucene-queries
 BuildRequires:  lucene-queryparser
 BuildRequires:  apache-commons-cli
@@ -26,12 +25,12 @@
 BuildRequires:  apache-commons-logging
 BuildRequires:  fontbox

-Requires:       jpackage-utils
-Requires:       java
+Requires:  jpackage-utils
+Requires:  java-headless
 Requires:  tagsoup
 Requires:  lucene-core
 #Requires:  lucene-analyzers-common hidden in
-Requires:   lucene-analysis
+Requires:  lucene-analysis
 Requires:  lucene-queries
 Requires:  lucene-queryparser
 Requires:  apache-commons-cli
@@ -39,8 +38,10 @@
 #Recommends:  apache-commons-logging-api included in:
 Recommends:  apache-commons-logging
 Recommends:  fontbox 
+
 %description
-Tool for offline searching in your docs via browser
+The goal of this project was to make searching in your (java)docs as easy and
+ comfortable as when you are browsing them online.

 %package javadoc
 Summary:        Javadocs for %{name}
@@ -54,8 +55,7 @@

 %prep
 %setup -q -n %{srcname}-%{srcname}-%{version}
-find -name '*.class' -exec rm -f '{}' \;
-find -name '*.jar' -exec rm -f '{}' \;
+find -print -name '*.class' -or -name '*.jar'  -delete
 %patch1 -p1


@@ -68,11 +68,12 @@
 popd

 %install
-mkdir -p $RPM_BUILD_ROOT/%{_javadir}
-mkdir -p $RPM_BUILD_ROOT/%{_javadocdir}/
+install -m0644  dist/%{name}.jar -D $RPM_BUILD_ROOT/%{_javadir}/%{name}.jar
+
+mkdir -p $RPM_BUILD_ROOT/%{_javadocdir}
+cp -r  dist/javadoc  $RPM_BUILD_ROOT/%{_javadocdir}/%{name}
+
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-cp dist/%{name}.jar $RPM_BUILD_ROOT/%{_javadir}
-cp -r  dist/javadoc  $RPM_BUILD_ROOT/%{_javadocdir}/%{name}

 cat <<EOF > $RPM_BUILD_ROOT/%{_bindir}/%{name}
 #!/bin/bash
@@ -99,16 +100,14 @@


 %files
-%defattr(-,root,root,-)
 %{_javadir}/*
-%doc LICENSE
+%license LICENSE
 %attr(755,root,root) %{_bindir}/%{name}


 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}
-%doc LICENSE
+%license LICENSE


 %changelog

-- 
You are receiving this mail because:
You are on the CC list for the bug.
You are always notified about changes to this product and component