commit e9f23cad4c4d09eb30571d26b7f3e2b5bc218e32
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Sep 2 12:04:33 2013 +0200
Update to upstream version 198
- Add create-tarball.sh script to SRPM
.gitignore | 2 ++
create-tarball => create-tarball.sh | 7 ++-----
owasp-java-html-sanitizer.spec | 11 ++++++++---
sources | 4 ++--
4 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 68f9ae5..756e59f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
/owasp-java-html-sanitizer-r163.pom
/owasp-java-html-sanitizer-r175.pom
/owasp-java-html-sanitizer-r175.tar.gz
+/owasp-java-html-sanitizer-r198.pom
+/owasp-java-html-sanitizer-r198.tar.gz
diff --git a/create-tarball b/create-tarball.sh
similarity index 89%
rename from create-tarball
rename to create-tarball.sh
index 73bc661..483c71e 100755
--- a/create-tarball
+++ b/create-tarball.sh
@@ -1,11 +1,8 @@
#!/bin/bash
-if [ $# -lt 1 ]; then
- echo "Usage: ./create-tarball version"
- exit 1
-fi
-VERSION=${1#r}
+VERSION=`grep Version: *spec | sed -e 's/Version:\s*\(.*\)/\1/'`
+echo $VERSION
wget
http://owasp-java-html-sanitizer.googlecode.com/files/owasp-java-html-san...
if [ $? -ne 0 ]; then
diff --git a/owasp-java-html-sanitizer.spec b/owasp-java-html-sanitizer.spec
index aadf941..138ac17 100644
--- a/owasp-java-html-sanitizer.spec
+++ b/owasp-java-html-sanitizer.spec
@@ -1,6 +1,6 @@
Name: owasp-java-html-sanitizer
-Version: 175
-Release: 2%{?dist}
+Version: 198
+Release: 1%{?dist}
Summary: A fast HTML Sanitizer written in Java
# New BSD License
@@ -8,9 +8,10 @@ License: BSD
URL:
http://code.google.com/p/owasp-java-html-sanitizer/
# Upstream uses Makefile, doesn't provide any sane source tarball,
# there are no tags in svn repository
-# ./create-tarball %{version}
+# ./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
BuildRequires: mvn(com.google.code.findbugs:jsr305)
@@ -51,6 +52,10 @@ cp %{SOURCE1} pom.xml
%changelog
+* Mon Sep 02 2013 Michal Srb <msrb(a)redhat.com> - 198-1
+- Update to upstream version 198
+- Add create-tarball.sh script to SRPM
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
175-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 3defada..d794f8d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-c50052a6f28d6c304bbc3a74038e9ec4 owasp-java-html-sanitizer-r175.pom
-d47d3cfb0b3aa71e3dcd4d5b2a9befa2 owasp-java-html-sanitizer-r175.tar.gz
+15984894e0e19c558ac0dacf09bf832b owasp-java-html-sanitizer-r198.pom
+6c2fad5a6f3614bdec6fc98da103a3f0 owasp-java-html-sanitizer-r198.tar.gz