[boilerpipe] fix Url tag

gil gil at fedoraproject.org
Sun Mar 15 19:05:32 UTC 2015


commit 49b58841fa35cd59574ba9aecb27d2ad47f815e8
Author: gil <puntogil at libero.it>
Date:   Sun Mar 15 20:05:17 2015 +0100

    fix Url tag

 boilerpipe.spec | 35 +++++++++++++----------------------
 1 file changed, 13 insertions(+), 22 deletions(-)
---
diff --git a/boilerpipe.spec b/boilerpipe.spec
index db13221..d987115 100644
--- a/boilerpipe.spec
+++ b/boilerpipe.spec
@@ -1,9 +1,9 @@
 Name:          boilerpipe
 Version:       1.2.0
-Release:       4%{?dist}
+Release:       5%{?dist}
 Summary:       Boilerplate Removal and Fulltext Extraction from HTML pages
 License:       ASL 2.0
-Url:           http://code.google.com/p/boilerpipe/
+Url:           https://github.com/kohlschutter/boilerpipe
 Source0:       http://boilerpipe.googlecode.com/files/%{name}-%{version}-src.tar.gz
 Source1:       http://boilerpipe.googlecode.com/svn/repo/de/l3s/%{name}/%{name}/%{version}/%{name}-%{version}.pom
 # use system libraries
@@ -11,17 +11,12 @@ Patch0:        %{name}-1.2.0-libdir-patch
 # remove embedded nekohtml
 Patch1:        %{name}-1.2.0-nekohtml-patch
 
-BuildRequires: java-devel
-BuildRequires: javapackages-tools
-
 BuildRequires: ant
+BuildRequires: java-devel
+BuildRequires: javapackages-local
 BuildRequires: nekohtml
 BuildRequires: xerces-j2
 
-Requires:      nekohtml
-
-Requires:      java-headless
-Requires:      javapackages-tools
 BuildArch:     noarch
 
 %description
@@ -119,32 +114,28 @@ done
 
 %build
 
-ant
+ant -Dapp.javaversion=1.6
 
 %install
+%mvn_artifact pom.xml dist/%{name}-%{version}.jar
+%mvn_file de.l3s.%{name}:%{name} %{name}
+%mvn_install -J javadoc/1.2
 
-mkdir -p %{buildroot}%{_javadir}
-install -m 644 dist/%{name}-%{version}.jar \
-  %{buildroot}%{_javadir}/%{name}.jar
 install -m 644 dist/%{name}-demo-%{version}.jar \
   %{buildroot}%{_javadir}/%{name}-demo.jar
-  
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -rp javadoc/*/* %{buildroot}%{_javadocdir}/%{name}
 
 %files -f .mfiles
 %{_javadir}/%{name}-demo.jar
 %license LICENSE.txt NOTICE.txt
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %license LICENSE.txt NOTICE.txt
 
 %changelog
+* Sun Mar 15 2015 gil cattaneo <puntogil at libero.it> 1.2.0-5
+- fix Url tag
+- use newer javapackages macros
+
 * Thu Jan 29 2015 gil cattaneo <puntogil at libero.it> 1.2.0-4
 - introduce license macro
 


More information about the scm-commits mailing list