[apache-commons-compress] Update to new upstream version 1.3
by Sandro "red" Mathys
commit 6e53eafa2a0a32caf3b348ca08c592545a69494c
Author: Sandro Mathys <red(a)fedoraproject.org>
Date: Tue Nov 1 13:54:01 2011 +0100
Update to new upstream version 1.3
.gitignore | 1 +
apache-commons-compress.spec | 9 +++++++--
sources | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 79a35b7..19344a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
commons-compress-1.0-src.tar.gz
/commons-compress-1.1-src.tar.gz
/commons-compress-1.2-src.tar.gz
+/commons-compress-1.3-src.tar.gz
diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec
index 07658b9..a1711be 100644
--- a/apache-commons-compress.spec
+++ b/apache-commons-compress.spec
@@ -2,8 +2,8 @@
%global short_name commons-%{base_name}
Name: apache-%{short_name}
-Version: 1.2
-Release: 2%{?dist}
+Version: 1.3
+Release: 1%{?dist}
Summary: Java API for working with tar, zip and bzip2 files
Group: Development/Libraries
License: ASL 2.0
@@ -14,6 +14,8 @@ BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
BuildRequires: apache-commons-parent
+BuildRequires: junit4
+BuildRequires: maven-surefire-provider-junit4
Requires: java >= 1:1.6.0
Requires: jpackage-utils
Requires(post): jpackage-utils
@@ -87,6 +89,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%changelog
+* Tue Nov 01 2011 Sandro Mathys <red at fedoraproject.org> - 1.3-1
+- Updated to 1.3
+
* Thu Aug 04 2011 Sandro Mathys <red at fedoraproject.org> - 1.2-2
- Fixing mistake where different versions of the spec file got mixed up
diff --git a/sources b/sources
index ede1c5a..439e78f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a5120dae12019ec0acceab50d7aae835 commons-compress-1.2-src.tar.gz
+48a61d99daa255e4cc86f54542e3de44 commons-compress-1.3-src.tar.gz
12 years, 6 months
[maven-shade-plugin] Update to new upstream release.
by Alexander Kurtakov
commit 1c88eaf43523851b2514ca85b9f1e21862198b34
Author: Alexander Kurtakov < <akurtako(a)redhat.com>
Date: Tue Nov 1 10:30:47 2011 +0200
Update to new upstream release.
.gitignore | 1 +
maven-shade-plugin.spec | 26 +++++++++++---------------
sources | 2 +-
3 files changed, 13 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2962b2a..5e213d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
maven-shade-plugin-1.3.3.tar.xz
/maven-shade-plugin-1.4.tar.xz
/maven-shade-plugin-1.4-source-release.zip
+maven-shade-plugin-1.5-source-release.zip
diff --git a/maven-shade-plugin.spec b/maven-shade-plugin.spec
index 4b07ad2..9460064 100644
--- a/maven-shade-plugin.spec
+++ b/maven-shade-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-shade-plugin
-Version: 1.4
-Release: 4%{?dist}
+Version: 1.5
+Release: 1%{?dist}
Summary: This plugin provides the capability to package the artifact in an uber-jar
Group: Development/Libraries
@@ -33,8 +33,6 @@ Requires: maven
Requires: jpackage-utils
Requires: java >= 1:1.6.0
Requires: jdependency >= 0.6
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
Obsoletes: maven2-plugin-shade <= 0:2.0.8
Provides: maven2-plugin-shade = 1:%{version}-%{release}
@@ -54,14 +52,12 @@ Requires: jpackage-utils
%{summary}.
%prep
-%setup -q #You may need to update this according to your Source0
+%setup -q
rm src/test/jars/plexus-utils-1.4.1.jar
ln -s $(build-classpath plexus/utils) src/test/jars/plexus-utils-1.4.1.jar
%build
-mvn-rpmbuild \
- -Dmaven.test.failure.ignore=true \
- install javadoc:javadoc
+mvn-rpmbuild install javadoc:javadoc
%install
# jars
@@ -70,27 +66,27 @@ install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}
# poms
install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap org.apache.maven.plugins %{name} %{version} JPP %{name}
+%add_to_maven_depmap JPP-%{name}.pom %{name}.jar
# javadoc
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
%{_javadir}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
+%doc LICENSE NOTICE
+
%files javadoc
%{_javadocdir}/%{name}
+%doc LICENSE
%changelog
+* Tue Nov 1 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.5-1
+- Update to upstream 1.5 release.
+
* Thu Jun 9 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.4-4
- Build with maven 3.x.
- Use upstream source.
diff --git a/sources b/sources
index 13ef007..2356972 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4f9a2f31806f882d159383121d5f4030 maven-shade-plugin-1.4-source-release.zip
+4cb42d96fede5f9cf97902c87fd03dd4 maven-shade-plugin-1.5-source-release.zip
12 years, 6 months
[maven-antrun-plugin] Update to latest upstream release.
by Alexander Kurtakov
commit 94a81d1d2d0215185a6a5bb2987a053d1d9675ad
Author: Alexander Kurtakov < <akurtako(a)redhat.com>
Date: Tue Nov 1 10:04:34 2011 +0200
Update to latest upstream release.
.gitignore | 1 +
fix-ant-1.8.2.patch | 13 -------------
fix-deps.patch | 30 ++++++++++--------------------
maven-antrun-plugin.spec | 26 +++++++++-----------------
sources | 2 +-
5 files changed, 21 insertions(+), 51 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b275842..c660df7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
maven-antrun-plugin-1.4.tar.xz
maven-antrun-plugin-1.5-source-release.zip
+maven-antrun-plugin-1.7-source-release.zip
diff --git a/fix-deps.patch b/fix-deps.patch
index 9eb0910..db16e0b 100644
--- a/fix-deps.patch
+++ b/fix-deps.patch
@@ -1,24 +1,14 @@
---- pom.xml.sav 2010-05-25 19:35:37.000000000 +0300
-+++ pom.xml 2010-08-31 06:29:27.741235987 +0300
-@@ -75,6 +75,21 @@ under the License.
- <artifactId>ant-nodeps</artifactId>
- <version>1.8.1</version>
+--- pom.xml.orig 2011-10-28 20:00:32.000000000 +0300
++++ pom.xml 2011-11-01 09:52:35.921717462 +0200
+@@ -71,6 +71,11 @@ under the License.
+ <version>${mavenVersion}</version>
</dependency>
-+ <dependency>
-+ <groupId>org.codehaus.plexus</groupId>
-+ <artifactId>plexus-container-default</artifactId>
-+ <version>1.5.4</version>
-+ </dependency>
-+ <dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
-+ <artifactId>maven-model</artifactId>
-+ <version>1.0</version>
++ <artifactId>maven-compat</artifactId>
++ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
-+ <groupId>org.apache.ant</groupId>
-+ <artifactId>ant-launcher</artifactId>
-+ <version>1.8.1</version>
-+ </dependency>
- </dependencies>
-
- <profiles>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>2.0.5</version>
diff --git a/maven-antrun-plugin.spec b/maven-antrun-plugin.spec
index c8350dc..e5fd9da 100644
--- a/maven-antrun-plugin.spec
+++ b/maven-antrun-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-antrun-plugin
-Version: 1.6
-Release: 4%{?dist}
+Version: 1.7
+Release: 1%{?dist}
Summary: Maven AntRun Plugin
Group: Development/Libraries
@@ -8,7 +8,6 @@ License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-antrun-plugin/
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
Patch0: fix-deps.patch
-Patch1: fix-ant-1.8.2.patch
BuildArch: noarch
@@ -28,8 +27,6 @@ Requires: ant
Requires: maven
Requires: jpackage-utils
Requires: java
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
Obsoletes: maven2-plugin-antrun <= 0:2.0.8
Provides: maven2-plugin-antrun = 1:%{version}-%{release}
@@ -45,11 +42,10 @@ Requires: jpackage-utils
%description javadoc
API documentation for %{name}.
-
%prep
%setup -q
%patch0
-%patch1
+#%patch1
%build
mvn-rpmbuild install javadoc:javadoc
@@ -59,23 +55,16 @@ mvn-rpmbuild install javadoc:javadoc
install -d -m 0755 %{buildroot}%{_javadir}
install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-%add_to_maven_depmap org.apache.maven.plugins maven-antrun-plugin %{version} JPP maven-antrun-plugin
-
# poms
install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml \
- %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
%doc LICENSE NOTICE
%{_javadir}/*
@@ -87,6 +76,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%{_javadocdir}/%{name}
%changelog
+* Tue Nov 1 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.7-1
+- Update to 1.7 upstream release.
+
* Wed Jun 8 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.6-4
- Build with maven 3.x.
diff --git a/sources b/sources
index f51e810..07e1e02 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-26799f9f89c2a0397dc4750de344a62d maven-antrun-plugin-1.6-source-release.zip
+2d9aff265a1db57a742b1e82ff400b21 maven-antrun-plugin-1.7-source-release.zip
12 years, 6 months