[flyingsaucer] fix Url tag
gil
gil at fedoraproject.org
Fri Mar 13 17:56:09 UTC 2015
commit 923ced81aac9d12453d32ebeabffdd547991d941
Author: gil <puntogil at libero.it>
Date: Fri Mar 13 18:56:02 2015 +0100
fix Url tag
flyingsaucer.spec | 32 ++++++++++++--------------------
1 file changed, 12 insertions(+), 20 deletions(-)
---
diff --git a/flyingsaucer.spec b/flyingsaucer.spec
index 0ab7c4d..f24d9dd 100644
--- a/flyingsaucer.spec
+++ b/flyingsaucer.spec
@@ -1,9 +1,9 @@
Name: flyingsaucer
Version: 8
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: XML/XHTML and CSS 2.1 renderer in pure Java
License: LGPLv2+
-URL: http://code.google.com/p/flying-saucer/
+URL: https://github.com/flyingsaucerproject/flyingsaucer
Source0: http://flying-saucer.googlecode.com/files/%{name}-R%{version}-src.zip
Source1: http://repo1.maven.org/maven2/org/xhtmlrenderer/core-renderer/R%{version}/core-renderer-R%{version}.pom
# remove Pack200Task.jar references
@@ -14,7 +14,7 @@ Patch0: %{name}-R%{version}-build.patch
Patch1: %{name}-R%{version}-pom.patch
BuildRequires: java-devel
-BuildRequires: jpackage-utils
+BuildRequires: javapackages-local
BuildRequires: ant
# main
@@ -23,10 +23,6 @@ BuildRequires: xml-commons-apis
# optional for svg demo
BuildRequires: svgsalamander
-Requires: itext-core
-Requires: xml-commons-apis
-
-Requires: jpackage-utils
Provides: xhtmlrenderer = %{version}-%{release}
BuildArch: noarch
@@ -91,9 +87,9 @@ sed -i 's/Class-Path: joshy-common.jar ss_css2.jar core-renderer.jar xalan.jar//
# lib/dev/Pack200Task.jar !
# lib/dev/jdic_win_30092005/jdic_30092005.jar !
-sed -i 's|<property name="compiler.source" value="1.4"/>|<property name="compiler.source" value="1.5"/>|' \
+sed -i 's|<property name="compiler.source" value="1.4"/>|<property name="compiler.source" value="1.6"/>|' \
etc/build/properties.xml
-sed -i 's|<property name="compiler.target" value="1.4"/>|<property name="compiler.target" value="1.5"/>|' \
+sed -i 's|<property name="compiler.target" value="1.4"/>|<property name="compiler.target" value="1.6"/>|' \
etc/build/properties.xml
%build
@@ -103,9 +99,10 @@ sed -i 's|<property name="compiler.target" value="1.4"/>|<property name="compile
# test
%install
+%mvn_artifact pom.xml build/core-renderer.jar
+%mvn_install -J doc/full/api
+
-mkdir -p %{buildroot}%{_javadir}/%{name}
-install -pm 644 build/core-renderer.jar %{buildroot}%{_javadir}/%{name}/
install -pm 644 build/core-renderer-minimal.jar %{buildroot}%{_javadir}/%{name}/
(
@@ -119,13 +116,6 @@ install -pm 644 build/browser.jar %{buildroot}%{_javadir}/%{name}/
install -pm 644 build/docbook.jar %{buildroot}%{_javadir}/%{name}/
install -pm 644 build/svg.jar %{buildroot}%{_javadir}/%{name}/
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-core-renderer.pom
-%add_maven_depmap JPP.%{name}-core-renderer.pom %{name}/core-renderer.jar
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr doc/full/api/* %{buildroot}%{_javadocdir}/%{name}
-
%files -f .mfiles
%{_javadir}/%{name}/core-renderer-minimal.jar
%{_javadir}/%{name}/xhtmlrenderer.jar
@@ -139,11 +129,13 @@ cp -pr doc/full/api/* %{buildroot}%{_javadocdir}/%{name}
%{_javadir}/%{name}/svg.jar
%license LICENSE*
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%license LICENSE*
%changelog
+* Fri Mar 13 2015 gil cattaneo <puntogil at libero.it> 8-10
+- fix Url tag
+
* Sun Feb 01 2015 gil cattaneo <puntogil at libero.it> 8-9
- introduce license macro
More information about the scm-commits
mailing list