commit 6b45e06d659db03275dc0740928e4fdf94c0ba4f
Author: Michal Srb <msrb(a)redhat.com>
Date: Tue Mar 4 09:51:03 2014 +0100
Update to upstream version 223
.gitignore | 1 +
create-tarball.sh | 41 ++++++++++++++-------------------------
owasp-java-html-sanitizer.spec | 12 +++++-----
sources | 3 +-
4 files changed, 23 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index af7397d..a60b4db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/owasp-java-html-sanitizer-r198.tar.gz
/owasp-java-html-sanitizer-r209.tar.gz
/owasp-java-html-sanitizer-r209.pom
+/owasp-java-html-sanitizer-r223.tar.gz
diff --git a/create-tarball.sh b/create-tarball.sh
index 483c71e..5fcb761 100755
--- a/create-tarball.sh
+++ b/create-tarball.sh
@@ -1,30 +1,19 @@
-#!/bin/bash
+#!/bin/bash -e
+name=owasp-java-html-sanitizer
+version=`grep Version: *spec | sed -e 's/Version:\s*\(.*\)/\1/'`
+echo $version
-VERSION=`grep Version: *spec | sed -e 's/Version:\s*\(.*\)/\1/'`
-echo $VERSION
+wget
http://repo1.maven.org/maven2/com/googlecode/${name}/${name}/r${version}/...
+wget http://${name}.googlecode.com/svn/trunk/COPYING
+wget
http://repo1.maven.org/maven2/com/googlecode/${name}/${name}/r${version}/...
-wget
http://owasp-java-html-sanitizer.googlecode.com/files/owasp-java-html-san...
-if [ $? -ne 0 ]; then
- echo "Unable to download archive"
- exit 1
-fi
-rm -Rf tar czvf owasp-java-html-sanitizer-r${VERSION}.tar.gz
-unzip owasp-java-html-sanitizer-r${VERSION}.zip
-rm owasp-java-html-sanitizer-r${VERSION}.zip
-cd owasp-java-html-sanitizer/
-rm -Rf javadoc/
-cd lib/
-rm guava-COPYING jsr305-COPYING
-mkdir -p src/main/java/
-unzip owasp-java-html-sanitizer-sources.jar -d src/main/java/
-find . -name "*.jar" -delete
-find . -name "*.sh" -delete
-rm -Rf src/main/java/META-INF
-cd ../
-mv lib/ owasp-java-html-sanitizer-r${VERSION}
-tar czvf owasp-java-html-sanitizer-r${VERSION}.tar.gz
owasp-java-html-sanitizer-r${VERSION}/
-mv owasp-java-html-sanitizer-r${VERSION}.tar.gz ../
-cd ../
-rm -Rf owasp-java-html-sanitizer/
+unpackdir=${name}-r${version}/src/main/java/
+mkdir -p ${unpackdir}
+unzip ${name}-r${version}-sources.jar -d ${unpackdir}
+rm ${name}-r${version}-sources.jar
+mv COPYING ${name}-r${version}
+mv ${name}-r${version}.pom ${name}-r${version}/pom.xml
+
+tar czvf ${name}-r${version}.tar.gz ${name}-r${version}/
diff --git a/owasp-java-html-sanitizer.spec b/owasp-java-html-sanitizer.spec
index f513f63..3d3a844 100644
--- a/owasp-java-html-sanitizer.spec
+++ b/owasp-java-html-sanitizer.spec
@@ -1,5 +1,5 @@
Name: owasp-java-html-sanitizer
-Version: 209
+Version: 223
Release: 1%{?dist}
Summary: A fast HTML Sanitizer written in Java
@@ -10,7 +10,6 @@ URL:
http://code.google.com/p/owasp-java-html-sanitizer/
# there are no tags in svn repository
# ./create-tarball.sh
Source0: %{name}-r%{version}.tar.gz
-Source1:
http://repo1.maven.org/maven2/com/googlecode/%{name}/%{name}/r%{version}/...
Source2: create-tarball.sh
BuildRequires: maven-local
@@ -36,8 +35,6 @@ This package contains API javadoc documentation for %{name}
%prep
%setup -q -n %{name}-r%{version}
-cp %{SOURCE1} pom.xml
-
%build
%mvn_build
@@ -46,12 +43,15 @@ cp %{SOURCE1} pom.xml
%files -f .mfiles
%dir %{_javadir}/%{name}
-%doc owasp-java-html-sanitizer-COPYING
+%doc COPYING
%files javadoc -f .mfiles-javadoc
-%doc owasp-java-html-sanitizer-COPYING
+%doc COPYING
%changelog
+* Tue Mar 04 2014 Michal Srb <msrb(a)redhat.com> - 223-1
+- Update to upstream version 223
+
* Wed Sep 11 2013 Michal Srb <msrb(a)redhat.com> - 209-1
- Update to upstream version 209
diff --git a/sources b/sources
index 9431f4f..6bdd51c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-e0ccdd61875e7fbbe2121ff3e197ae89 owasp-java-html-sanitizer-r209.tar.gz
-66f039047141482be23f31169c297bd7 owasp-java-html-sanitizer-r209.pom
+4027619fc33f82c926dafc4e2bf9253b owasp-java-html-sanitizer-r223.tar.gz