[nekohtml] Add pom.xml and adapt to current guidelines.

Tue Nov 1 19:41:09 UTC 2011

commit 02e02c33c45bb82aea319159afb117e8c9b370b1
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date:   Tue Nov 1 21:40:34 2011 +0200

    Add pom.xml and adapt to current guidelines.

 nekohtml-1.9.14.pom |   41 ++++++++++++++++++++++++++++++++++++
 nekohtml.spec       |   57 +++++++++++++++++++++++---------------------------
 2 files changed, 67 insertions(+), 31 deletions(-)
---

diff --git a/nekohtml-1.9.14.pom b/nekohtml-1.9.14.pom
new file mode 100644
index 0000000..afd2149
--- /dev/null
+++ b/nekohtml-1.9.14.pom
@@ -0,0 +1,41 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>net.sourceforge.nekohtml</groupId>
+  <artifactId>nekohtml</artifactId>
+  <name>Neko HTML</name>
+  <version>1.9.14</version>
+  <url>http://nekohtml.sourceforge.net/</url>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <scm>
+    <url>http://nekohtml.svn.sourceforge.net/viewvc/nekohtml/</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.9.1</version>
+    </dependency>
+  </dependencies>
+    <distributionManagement>
+        <repository>
+            <id>nekohtml-m2-repo</id>
+            <url>
+                sftp://web.sourceforge.net/home/groups/n/ne/nekohtml/htdocs/m2-repo
+            </url>
+            <name>NekoHTML Maven 2 Repository</name>
+        </repository>
+        <snapshotRepository>
+            <id>nekohtml-m2-repo-snapshots</id>
+            <url>
+                sftp://web.sourceforge.net/home/groups/n/ne/nekohtml/htdocs/m2-repo-snapshots
+            </url>
+            <name>NekoHTML Maven 2 Snapshots Repository</name>
+        </snapshotRepository>
+    </distributionManagement>
+</project>
diff --git a/nekohtml.spec b/nekohtml.spec
index f8cfa90..df36245 100644
--- a/nekohtml.spec
+++ b/nekohtml.spec
@@ -30,7 +30,7 @@
 
 Name:           nekohtml
 Version:        1.9.14
-Release:        4%{?dist}
+Release:        6%{?dist}
 Epoch:          0
 Summary:        HTML scanner and tag balancer
 License:        ASL 2.0
@@ -39,27 +39,26 @@ Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.
 # http://www.jpackage.org/cgi-bin/viewvc.cgi/*checkout*/rpms/devel/nekohtml/nekohtml-filter.sh?root=jpackage&content-type=text%2Fplain
 Source1:        %{name}-filter.sh
 Source2:        nekohtml-component-info.xml
+Source3:        http://repo1.maven.org/maven2/net/sourceforge/nekohtml/nekohtml/1.9.14/nekohtml-1.9.14.pom
 Patch0:         %{name}-crosslink.patch
 Patch1:         %{name}-jars.patch
-Group:          Development/Libraries/Java
+Group:          Development/Libraries
 Requires:       bcel
 Requires:       jpackage-utils >= 0:1.6
 Requires:       xerces-j2 >= 0:2.7.1
-Requires:       xml-commons-jaxp-1.3-apis
+Requires:       xml-commons-apis
 BuildRequires:  jpackage-utils
 BuildRequires:  ant
 BuildRequires:  ant-junit
-BuildRequires:  ant-nodeps
 BuildRequires:  java-javadoc
 BuildRequires:  bcel
 BuildRequires:  bcel-javadoc
 BuildRequires:  xerces-j2 >= 0:2.7.1
 BuildRequires:  xerces-j2-javadoc-xni
 BuildRequires:  xerces-j2-javadoc-impl
-BuildRequires:  xml-commons-jaxp-1.3-apis
+BuildRequires:  xml-commons-apis
 BuildArch:      noarch
 BuildRequires:  java-devel >= 1.6.0
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 NekoHTML is a simple HTML scanner and tag balancer that enables
@@ -76,14 +75,14 @@ rewriting code.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
+Group:          Documentation
 
 %description javadoc
 Javadoc for %{name}.
 
 %package demo
 Summary:        Demo for %{name}
-Group:          Development/Libraries/Java
+Group:          Development/Libraries
 Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description demo
@@ -99,13 +98,12 @@ Demonstrations and samples for %{name}.
 
 %build
 export CLASSPATH=$(build-classpath bcel xerces-j2)
-export OPT_JAR_LIST="`%{__cat} %{_sysconfdir}/ant.d/junit` ant/ant-nodeps xalan-j2 xalan-j2-serializer"
 %{ant} \
     -Dbuild.sysclasspath=first \
     -Dlib.dir=%{_javadir} \
-    -Djar.file=%{name}-%{version}.jar \
-    -Djar.xni.file=%{name}-xni-%{version}.jar \
-    -Djar.samples.file=%{name}-samples-%{version}.jar \
+    -Djar.file=%{name}.jar \
+    -Djar.xni.file=%{name}-xni.jar \
+    -Djar.samples.file=%{name}-samples.jar \
     -Dbcel.javadoc=%{_javadocdir}/bcel \
     -Dj2se.javadoc=%{_javadocdir}/java \
     -Dxni.javadoc=%{_javadocdir}/xerces-j2-xni \
@@ -114,46 +112,43 @@ export OPT_JAR_LIST="`%{__cat} %{_sysconfdir}/ant.d/junit` ant/ant-nodeps xalan-
 # test - disabled because it makes the build failing
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # Jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 644 %{name}{,-samples,-xni}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-ln -s %{name}-samples-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-samples.jar
-ln -s %{name}-xni-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-xni.jar
+install -p -m 644 %{name}{,-samples,-xni}.jar $RPM_BUILD_ROOT%{_javadir}/
 
 # Scripts
 install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}-filter
 
-# Javadocs
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -a build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+# POM
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+# Javadocs
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -a build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %files
-%defattr(-,root,root,-)
 %doc LICENSE.txt README.txt doc/*.html
 %attr(755,root,root) %{_bindir}/%{name}-filter
-%{_javadir}/%{name}-%{version}.jar
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
 %{_javadir}/%{name}.jar
-%{_javadir}/%{name}-xni-%{version}.jar
 %{_javadir}/%{name}-xni.jar
 
 %files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %files demo
-%defattr(-,root,root,-)
-%{_javadir}/%{name}-samples-%{version}.jar
 %{_javadir}/%{name}-samples.jar
 
 %changelog
+* Tue Nov 1 2011 Alexander Kurtakov <akurtako at redhat.com> 0:1.9.14-6
+- Adapt to current guidelines.
+
+* Mon Oct 10 2011 Andy Grimm <agrimm at gmail.com> - 0:1.9.14-5
+- Add POM file (BZ #735521)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.9.14-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
