[xmlenc] Update to 0.53

gil gil at fedoraproject.org
Sat Nov 3 07:52:44 UTC 2012


commit 104496e018507857d024149f91df2665b36b7842
Author: gil <puntogil at libero.it>
Date:   Sat Nov 3 08:52:30 2012 +0100

    Update to 0.53

 .gitignore  |    1 +
 sources     |    2 +-
 xmlenc.spec |   65 ++++++++++++++++++++++++++++++++++------------------------
 3 files changed, 40 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9f17cf6..c44094f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 xmlenc-0.52.tgz
+/xmlenc-0.53-src-git.tar.xz
diff --git a/sources b/sources
index 5208a6f..33a31b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-32f631dca735574c9ad8164ee05dc05f  xmlenc-0.52.tgz
+fa453d6ed025e2e06fec125f360601bf  xmlenc-0.53-src-git.tar.xz
diff --git a/xmlenc.spec b/xmlenc.spec
index 146455f..214ae0d 100644
--- a/xmlenc.spec
+++ b/xmlenc.spec
@@ -1,21 +1,32 @@
 Name:          xmlenc
-Version:       0.52
-Release:       11%{?dist}
+Version:       0.53
+Release:       1%{?dist}
 Summary:       Light-weight XML output library for Java
 Group:         Development/Libraries
 License:       BSD
-URL:           http://xmlenc.sourceforge.net/
-Source0:       http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz
-Source1:       http://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom
-# set javac target/source to 1.5
-Patch0:        %{name}-%{version}-build.patch
+#  http://xmlenc.sourceforge.net/
+URL:           https://github.com/znerd/xmlenc/
+# git clone git://github.com/znerd/xmlenc.git xmlenc-0.53
+# (cd xmlenc-0.53/ && git archive --format=tar --prefix=xmlenc-0.53/ xmlenc-0.53 | xz > ../xmlenc-0.53-src-git.tar.xz)
+Source0:       %{name}-%{version}-src-git.tar.xz
 
 BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: jpackage-utils
-BuildRequires: ant
-BuildRequires: ant-junit
+BuildRequires: znerd-oss-parent
+
+# test deps
 BuildRequires: junit
 
+BuildRequires: maven
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-enforcer-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-surefire-plugin
+BuildRequires: maven-surefire-provider-junit4
+
 Requires:      java >= 1:1.6.0
 Requires:      jpackage-utils
 BuildArch:     noarch
@@ -25,7 +36,7 @@ This library is a fast stream-based XML output library for Java.
 Main design goals are performance, simplicity and pureness. 
 
 %package javadoc
-Summary:       Javadocs for %{name}
+Summary:       Javadoc for %{name}
 Group:         Documentation
 Requires:      jpackage-utils
 
@@ -34,41 +45,41 @@ This package contains the API documentation for %{name}
 
 %prep
 %setup -q
-find -name '*.jar' -o -name '*.class' -delete
-rm -Rf build/*
-%patch0 -p0
+find . -name "*.class" -delete
+find . -name ".*" -delete
+find . -name "*.jar" -type f -delete
 
 %build
 
-%ant all
+mvn-rpmbuild install javadoc:aggregate
 
 %install
 
-install -d -m 755 %{buildroot}%{_javadir}/
-install -m 644 build/%{name}.jar %{buildroot}%{_javadir}/
+mkdir -p %{buildroot}%{_javadir}
+install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+mkdir -p %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "%{name}:%{name}"
 
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pR build/javadoc/* %{buildroot}%{_javadocdir}/%{name}/
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
 
 %files
 %{_javadir}/%{name}.jar
 %{_mavenpomdir}/JPP-%{name}.pom
 %{_mavendepmapfragdir}/%{name}
-%doc CHANGES COPYRIGHT README THANKS
-
-%pre javadoc
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
+%doc CHANGES.txt COPYRIGHT.txt README.txt THANKS.txt
 
 %files javadoc
 %{_javadocdir}/%{name}
-%doc COPYRIGHT
+%doc COPYRIGHT.txt
 
 %changelog
+* Sat Sep 29 2012 gil cattaneo <puntogil at libero.it> 0.53-1
+- Update to 0.53
+- Moved to maven build
+
 * Tue Sep 25 2012 gil <puntogil at libero.it> 0.52-11
 - Adapted to current guideline
 - Added maven pom


More information about the scm-commits mailing list