[maven-hpi-plugin] Update to upstream version 1.96
by Michal Srb
commit 8b4d24dfc759f88d01674a9e2637ec601049f8c5
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Jun 24 23:02:20 2013 +0200
Update to upstream version 1.96
- Fix directory ownership
.gitignore | 1 +
maven-hpi-plugin.spec | 7 ++++++-
sources | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0b54acd..71cf0c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/maven-hpi-plugin-1.95.tar.gz
/LICENSE-2.0.txt
/LICENSE-MIT.txt
+/maven-hpi-plugin-1.96.tar.gz
diff --git a/maven-hpi-plugin.spec b/maven-hpi-plugin.spec
index 0aab67a..d03e1e8 100644
--- a/maven-hpi-plugin.spec
+++ b/maven-hpi-plugin.spec
@@ -1,5 +1,5 @@
Name: maven-hpi-plugin
-Version: 1.95
+Version: 1.96
Release: 1%{?dist}
Summary: Maven plugin to build Jenkins plugins
@@ -90,12 +90,17 @@ rm src/main/java/org/jenkinsci/maven/plugins/hpi/CreateMojo.java
%files -f .mfiles
+%dir %{_javadir}/%{name}
%doc LICENSE-ASL LICENSE-MIT
%files javadoc -f .mfiles-javadoc
%doc LICENSE-ASL LICENSE-MIT
%changelog
+* Mon Jun 24 2013 Michal Srb <msrb(a)redhat.com> - 1.96-1
+- Update to upstream version 1.96
+- Fix directory ownership
+
* Mon May 06 2013 Michal Srb <msrb(a)redhat.com> - 1.95-1
- Initial package
diff --git a/sources b/sources
index 7b975f7..c8ac681 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-6bdd5d3faf51ae613c0466d3b11fdebd maven-hpi-plugin-1.95.tar.gz
3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
0f3abd1e8ab49fa980c02e7b8e543fc3 LICENSE-MIT.txt
+0a41bfb90eff49e2f2c4f2db5fbfcd9f maven-hpi-plugin-1.96.tar.gz
10 years, 11 months
[owasp-java-html-sanitizer] Update to upstream version 175
by Michal Srb
commit 1ce0ffec09a23795ac4b00ae23552456a35119d5
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Jun 24 23:00:12 2013 +0200
Update to upstream version 175
- Fix directory ownership
- Spec file clean up
.gitignore | 2 ++
owasp-java-html-sanitizer.spec | 26 ++++++++------------------
sources | 4 ++--
3 files changed, 12 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6768014..68f9ae5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
/owasp-java-html-sanitizer-r163.tar.gz
/owasp-java-html-sanitizer-r163.pom
+/owasp-java-html-sanitizer-r175.pom
+/owasp-java-html-sanitizer-r175.tar.gz
diff --git a/owasp-java-html-sanitizer.spec b/owasp-java-html-sanitizer.spec
index d3192d9..007a85b 100644
--- a/owasp-java-html-sanitizer.spec
+++ b/owasp-java-html-sanitizer.spec
@@ -1,5 +1,5 @@
Name: owasp-java-html-sanitizer
-Version: 163
+Version: 175
Release: 1%{?dist}
Summary: A fast HTML Sanitizer written in Java
@@ -8,19 +8,7 @@ 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
-# wget http://%{name}.googlecode.com/files/%{name}-r%{version}.zip
-# unzip %{name}-r%{version}.zip
-# cd %{name}/
-# rm -Rf javadoc/ lib/guava-COPYING lib/jsr305-COPYING
-# mv lib/ %{name}-r%{version}
-# cd %{name}-r${version}
-# mkdir -p src/main/java/
-# unzip %{name}-sources.jar -d src/main/java/
-# find . -name "*.jar" -delete
-# find . -name "*.sh" -delete
-# rm -Rf src/main/java/META-INF
-# cd ../
-# tar czvf %{name}-r%{version}.tar.gz %{name}-r%{version}/
+# ./create-tarball %{version}
Source0: %{name}-r%{version}.tar.gz
Source1: http://repo1.maven.org/maven2/com/googlecode/%{name}/%{name}/r%{version}/...
@@ -49,10 +37,6 @@ This package contains API javadoc documentation for %{name}
cp %{SOURCE1} pom.xml
-# temporary workaround. XMvn <= 0.4.2 doesn't support version ranges
-%pom_xpath_remove "pom:dependency[pom:artifactId[text()='guava']]/pom:version"
-%pom_xpath_remove "pom:dependency[pom:artifactId[text()='jsr305']]/pom:version"
-
%build
%mvn_build
@@ -60,12 +44,18 @@ cp %{SOURCE1} pom.xml
%mvn_install
%files -f .mfiles
+%dir %{_javadir}/%{name}
%doc owasp-java-html-sanitizer-COPYING
%files javadoc -f .mfiles-javadoc
%doc owasp-java-html-sanitizer-COPYING
%changelog
+* Mon Jun 24 2013 Michal Srb <msrb(a)redhat.com> - 175-1
+- Update to upstream version 175
+- Fix directory ownership
+- Spec file clean up
+
* Fri Apr 26 2013 Michal Srb <msrb(a)redhat.com> - 163-1
- Initial package
diff --git a/sources b/sources
index 9c2c05b..3defada 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-3481b3a3a795461b43432542beed7dd2 owasp-java-html-sanitizer-r163.tar.gz
-46cb68545e9704bb46e1933c2a5eaef2 owasp-java-html-sanitizer-r163.pom
+c50052a6f28d6c304bbc3a74038e9ec4 owasp-java-html-sanitizer-r175.pom
+d47d3cfb0b3aa71e3dcd4d5b2a9befa2 owasp-java-html-sanitizer-r175.tar.gz
10 years, 11 months
[maven-timestamp-plugin] Update to current packaging guidelines
by Mikolaj Izdebski
commit 920da34036172c2ceba2e91ef3ee5e2c86d6e983
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Jun 24 21:28:17 2013 +0200
Update to current packaging guidelines
maven-timestamp-plugin.spec | 67 ++++++++----------------------------------
1 files changed, 13 insertions(+), 54 deletions(-)
---
diff --git a/maven-timestamp-plugin.spec b/maven-timestamp-plugin.spec
index 83cfb99..04d5216 100644
--- a/maven-timestamp-plugin.spec
+++ b/maven-timestamp-plugin.spec
@@ -1,9 +1,7 @@
Name: maven-timestamp-plugin
Version: 1.1
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Provides formatted timestamps for maven builds
-
-Group: Development/Libraries
License: ASL 2.0
URL: http://code.google.com/p/maven-timestamp-plugin
### upstream only provides binaries or source without build scripts
@@ -13,23 +11,10 @@ URL: http://code.google.com/p/maven-timestamp-plugin
Source0: maven-timestamp-plugin-1.1.tar.xz
BuildArch: noarch
-BuildRequires: java-devel
-BuildRequires: jpackage-utils
BuildRequires: maven-local
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-source-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-plugin-plugin
-BuildRequires: maven-release-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-site-plugin
-BuildRequires: maven-surefire-plugin
-BuildRequires: maven-surefire-provider-junit4
-
-Requires: java
-Requires: jpackage-utils
+BuildRequires: mvn(org.apache.maven:maven-plugin-api)
+BuildRequires: mvn(org.apache.maven:maven-settings)
+BuildRequires: mvn(org.apache.maven:maven-project)
%description
There are a few ways to get a timestamp in your maven build. Unfortunately
@@ -38,59 +23,33 @@ as simple as 1-2-3 to create a timestamp at your disposal.
Also, it enables you to use the syntax of SimpleDateFormat to form custom
formatted dates.
-
%package javadoc
Summary: Javadocs for %{name}
-Group: Documentation
-Requires: %{name} = %{version}-%{release}
-Requires: jpackage-utils
%description javadoc
This package contains the API documentation for %{name}.
-
%prep
%setup -q -n %{name}
-cat > README << EOT
-%{name}-%{version}
-
-%{description}
-EOT
-
%build
-mvn-rpmbuild install javadoc:javadoc
+%mvn_build
%install
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
+%mvn_install
-# jar
-install -Dp -m 644 target/%{name}-%{version}-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-# javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/ $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# pom
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml \
- $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-%files
-%doc README
+%files -f .mfiles
+%dir %{_javadir}/%{name}
+%doc readme.txt
%doc license.txt
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
-%files javadoc
+%files javadoc -f .mfiles-javadoc
%doc license.txt
-%{_javadocdir}/%{name}
%changelog
+* Mon Jun 24 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.1-8
+- Update to current packaging guidelines
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
10 years, 11 months
[jspc/f19] Initial import (#960720)
by Peter MacKinnon
Summary of changes:
e450742... Initial import (#960720) (*)
(*) This commit already existed in another branch; no separate mail sent
10 years, 11 months
[jspc/f18] Initial import (#960720)
by Peter MacKinnon
Summary of changes:
e450742... Initial import (#960720) (*)
(*) This commit already existed in another branch; no separate mail sent
10 years, 11 months