[jhighlight] Update to upstream 1.0.1.

Alexander Kurtakov akurtakov at fedoraproject.org
Thu Mar 5 18:19:00 UTC 2015


commit 4759a2f56dc4c9f40acea9146a3d68bbdec9c3f4
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Thu Mar 5 20:18:49 2015 +0200

    Update to upstream 1.0.1.

 .gitignore      |  1 +
 jhighlight.spec | 59 ++++++++++++++++-----------------------------------------
 servlet31.patch | 16 ++++++++++++++++
 sources         |  2 +-
 4 files changed, 34 insertions(+), 44 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 26a3b0a..034f968 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /jhighlight-1.0.tar.xz
+/jhighlight-1.0.1.tar.gz
diff --git a/jhighlight.spec b/jhighlight.spec
index ea57e78..4d07c6d 100644
--- a/jhighlight.spec
+++ b/jhighlight.spec
@@ -1,31 +1,21 @@
 Name:           jhighlight
-Version:        1.0
-Release:        12%{?dist}
+Version:        1.0.1
+Release:        1%{?dist}
 Summary:        An embeddable pure Java syntax highlighting library
 
 Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://svn.rifers.org/jhighlight
 
-# svn export http://svn.rifers.org/jhighlight/tags/release-1.0/ jhighlight-1.0
-# find jhighlight-1.0/ -name *.jar
-# tar cJf jhighlight-1.0.tar.xz jhighlight-1.0/
-Source0:        %{name}-%{version}.tar.xz
-Source1:        http://central.maven.org/maven2/com/uwyn/%{name}/%{version}/%{name}-%{version}.pom
+Source0:        https://github.com/codelibs/jhighlight/archive/jhighlight-%{version}.tar.gz
+Patch0:         servlet31.patch
 
 BuildArch:      noarch
 
-BuildRequires:  ant
-BuildRequires:  java-devel
-BuildRequires:  jflex
-BuildRequires:  jpackage-utils
-BuildRequires:  javapackages-local
-BuildRequires:  tomcat-servlet-3.1-api
-
-Requires:       java-headless
-Requires:       jflex
-Requires:       jpackage-utils
-Requires:       tomcat-servlet-3.1-api
+BuildRequires:  maven-local
+BuildRequires:  mvn(javax.servlet:servlet-api)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
+BuildRequires:  mvn(org.sonatype.oss:oss-parent:pom:)
 
 %description
 JHighlight is an embeddable pure Java syntax highlighting library that supports
@@ -37,41 +27,22 @@ and the actual marked up source.
 %package javadoc
 Summary:        Javadocs for %{name}
 Group:          Documentation
-Requires:       jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q
-
-find -name '*.class' -delete
-find -name '*.jar' -delete
-
-pushd lib/
-ln -s %{_javadir}/jflex.jar
-ln -s %{_javadir}/tomcat-servlet-3.1-api.jar
-popd
-
-sed -i -e "s/JFlex.anttask.JFlexTask/jflex.anttask.JFlexTask/" build.xml
-
-cp %{SOURCE1} %{name}.pom
-%pom_change_dep javax.servlet:servlet-api org.apache.tomcat:tomcat-servlet-api %{name}.pom
-%mvn_file com.uwyn:jhighlight %{name}
+%setup -q -n %{name}-%{name}-%{version}
+%patch0
 
 %build
-ant
-
-%mvn_artifact %{name}.pom build/dist/%{name}-%{version}.jar
+%mvn_build 
 
 %install
-mkdir javadoc
-unzip build/dist/%{name}-javadocs-%{version}.zip -d javadoc
-
-%mvn_install -J javadoc/docs/api
+%mvn_install
 
 %files -f .mfiles
-%doc README
+%doc README.md
 %doc COPYING
 %doc LICENSE_LGPL.txt
 
@@ -79,8 +50,10 @@ unzip build/dist/%{name}-javadocs-%{version}.zip -d javadoc
 %doc LICENSE_LGPL.txt
 %doc COPYING
 
-
 %changelog
+* Thu Mar 5 2015 Alexander Kurtakov <akurtako at redhat.com> 1.0.1-1
+- Update to upstream 1.0.1.
+
 * Thu Mar 5 2015 Alexander Kurtakov <akurtako at redhat.com> 1.0-12
 - Rebuild for tomcat servlet 3.1 api.
 
diff --git a/servlet31.patch b/servlet31.patch
new file mode 100644
index 0000000..06ae9ef
--- /dev/null
+++ b/servlet31.patch
@@ -0,0 +1,16 @@
+--- src/main/java/com/uwyn/jhighlight/servlet/HighlightFilter.java.sav	2014-10-11 07:51:58.000000000 +0300
++++ src/main/java/com/uwyn/jhighlight/servlet/HighlightFilter.java	2015-03-05 20:11:11.701332059 +0200
+@@ -232,5 +232,13 @@ public final class HighlightFilter imple
+ 		{
+ 			return mOutput.toByteArray();
+ 		}
++		
++		public void setWriteListener(javax.servlet.WriteListener listener) {
++			throw new UnsupportedOperationException("Not implemented yet.");
++		}
++		
++		public boolean isReady() {
++			return false;
++		}
+ 	}
+ }
diff --git a/sources b/sources
index c0ae5a1..8a14c31 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-207a379393f13dba7164eb62c6dad62d  jhighlight-1.0.tar.xz
+75c4d8faff6ad4c46e5a4d9e777a51d7  jhighlight-1.0.1.tar.gz


More information about the scm-commits mailing list