[slf4j] Convert patches to POM macros

Mikolaj Izdebski mizdebsk at fedoraproject.org
Wed Jul 11 21:12:12 UTC 2012


commit ada4b6f015f119dd22f95839a7903ef9a5f56bb3
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Wed Jul 11 22:49:36 2012 +0200

    Convert patches to POM macros

 slf4j-1.6.1-crosslink.patch   |   16 ----------------
 slf4j-1.6.1-srcencoding.patch |   13 -------------
 slf4j-pom_xml.patch           |   39 ---------------------------------------
 slf4j.spec                    |   21 ++++++++++++++-------
 4 files changed, 14 insertions(+), 75 deletions(-)
---
diff --git a/slf4j.spec b/slf4j.spec
index e5b68bb..cc0aa31 100644
--- a/slf4j.spec
+++ b/slf4j.spec
@@ -37,9 +37,6 @@ Group:          Development/Libraries
 License:        MIT
 URL:            http://www.slf4j.org/
 Source0:        http://www.slf4j.org/dist/%{name}-%{version}.tar.gz
-Patch0:         %{name}-pom_xml.patch
-Patch1:         %{name}-1.6.1-srcencoding.patch
-Patch2:         %{name}-1.6.1-crosslink.patch
 Requires(post): jpackage-utils >= 0:1.7.5
 Requires(postun): jpackage-utils >= 0:1.7.5
 BuildRequires:  jpackage-utils >= 0:1.7.5
@@ -100,13 +97,23 @@ Manual for %{name}.
 
 %prep
 %setup -q
-%patch0 -p0  -b .sav
-%patch1 -p1
-%patch2 -p1
 find . -name "*.jar" | xargs rm
 
-sed -i -e "s|ant<|org.apache.ant<|g" integration/pom.xml
+%pom_disable_module integration
+%pom_remove_plugin :maven-source-plugin
 
+# Because of a non-ASCII comment in slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java
+%pom_xpath_inject "pom:project/pom:properties" "
+    <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>"
+
+# Fix javadoc links
+%pom_xpath_remove "pom:links"
+%pom_xpath_inject "pom:plugin[pom:artifactId[text()='maven-javadoc-plugin']]/pom:configuration" "
+    <detectJavaApiLink>false</detectJavaApiLink>
+    <isOffline>false</isOffline>
+    <links><link>/usr/share/javadoc/java</link></links>"
+
+# dos2unix
 %{_bindir}/find -name "*.css" -o -name "*.js" -o -name "*.txt" | \
     %{_bindir}/xargs -t %{__perl} -pi -e 's/\r$//g'
 


More information about the scm-commits mailing list