[exec-maven-plugin] Clean up BuildRequires
by Stanislav Ochotnicky
commit d939ebc9612d9cab8831d23cfd78b835650fb791
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Jun 5 11:02:34 2013 +0200
Clean up BuildRequires
exec-maven-plugin.spec | 21 ++++-----------------
1 files changed, 4 insertions(+), 17 deletions(-)
---
diff --git a/exec-maven-plugin.spec b/exec-maven-plugin.spec
index f3849ea..98e5dda 100644
--- a/exec-maven-plugin.spec
+++ b/exec-maven-plugin.spec
@@ -1,6 +1,6 @@
Name: exec-maven-plugin
Version: 1.2.1
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Exec Maven Plugin
Group: Development/Libraries
@@ -14,23 +14,8 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
BuildArch: noarch
BuildRequires: maven-local
-BuildRequires: plexus-utils
-BuildRequires: maven-shared-plugin-testing-harness
-BuildRequires: maven-remote-resources-plugin
-BuildRequires: maven-plugin-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-surefire-plugin
-BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-plugin-cobertura
-BuildRequires: mojo-signatures
BuildRequires: maven-invoker-plugin
BuildRequires: apache-commons-exec
-BuildRequires: plexus-containers-container-default
Obsoletes: maven-plugin-exec < %{version}-%{release}
Provides: maven-plugin-exec = %{version}-%{release}
@@ -72,6 +57,9 @@ cp -p %{SOURCE1} .
%doc LICENSE.txt LICENSE-2.0.txt
%changelog
+* Wed Jun 5 2013 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.2.1-11
+- Clean up BuildRequires
+
* Thu Feb 14 2013 Michal Srb <msrb(a)redhat.com> - 1.2.1-10
- Disable animal-sniffer plugin
@@ -112,4 +100,3 @@ cp -p %{SOURCE1} .
* Fri Sep 11 2009 Alexander Kurtakov <akurtako(a)gmail.com> 1.1-1
- Initial package.
-
10 years, 10 months
[joda-time/f19] (3 commits) ...Update to latest upstream and tzdata
by Stanislav Ochotnicky
Summary of changes:
9a83bea... Enable testsuite (*)
2ab6518... Disable testcase failing on koji and add comments a bit (*)
4cc5e0e... Update to latest upstream and tzdata (*)
(*) This commit already existed in another branch; no separate mail sent
10 years, 10 months
[joda-time] Update to latest upstream and tzdata
by Stanislav Ochotnicky
commit 4cc5e0e76aba480fc86486392084b5b33e17db90
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Jun 5 10:29:59 2013 +0200
Update to latest upstream and tzdata
- Install NOTICE.txt
.gitignore | 2 ++
joda-time.spec | 21 +++++++++++----------
sources | 4 ++--
3 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ea2e93b..919b4b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ tzdata2008i.tar.gz
/joda-time-2.1-dist.tar.gz
/tzdata2012g.tar.gz
/tzdata2012h.tar.gz
+/tzdata2013c.tar.gz
+/joda-time-2.2-dist.tar.gz
diff --git a/joda-time.spec b/joda-time.spec
index c29da47..6da62ce 100644
--- a/joda-time.spec
+++ b/joda-time.spec
@@ -1,8 +1,8 @@
-%global tzversion tzdata2012h
+%global tzversion tzdata2013c
Name: joda-time
-Version: 2.1
-Release: 5.%{tzversion}%{?dist}
+Version: 2.2
+Release: 1.%{tzversion}%{?dist}
Summary: Java date and time API
License: ASL 2.0
@@ -14,6 +14,7 @@ BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: maven-local
BuildRequires: joda-convert
+BuildRequires: exec-maven-plugin
%description
@@ -35,8 +36,8 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n %{name}-%{version}
sed -i 's/\r//' LICENSE.txt
+sed -i 's/\r//' NOTICE.txt
sed -i 's/\r//' RELEASE-NOTES.txt
-sed -i 's/\r//' ToDo.txt
# all java binaries must be removed from the sources
find . -name '*.jar' -exec rm -f '{}' \;
@@ -48,10 +49,6 @@ tar -xzf %{SOURCE1} -C src/main/java/org/joda/time/tz/src/
# compat filename
%mvn_file : %{name}
-# test failing on koji
-sed -i '/testSetInto_Object/,/}/ {d}' \
- src/test/java/org/joda/time/convert/TestReadableDurationConverter.java
-
%build
%mvn_build
@@ -59,12 +56,16 @@ sed -i '/testSetInto_Object/,/}/ {d}' \
%mvn_install
%files -f .mfiles
-%doc LICENSE.txt RELEASE-NOTES.txt ToDo.txt
+%doc LICENSE.txt RELEASE-NOTES.txt NOTICE.txt
%files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt
+%doc LICENSE.txt NOTICE.txt
%changelog
+* Wed Jun 5 2013 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2-1.tzdata2013c
+- Update to latest upstream and tzdata
+- Install NOTICE.txt
+
* Tue Jun 4 2013 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.1-5.tzdata2012h
- Enable testsuite
- Update to lates packaging guidelines
diff --git a/sources b/sources
index 9ec1b00..7f2baa7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-3d4017b2945d885bb1e658fca00e46a5 joda-time-2.1-dist.tar.gz
-b937335e087fb85b7f8e3ce33e69184b tzdata2012h.tar.gz
+b5062217a2dea6823dd69b4dda97b249 tzdata2013c.tar.gz
+fbe59dd0349deeffd3bf27942c1f55b6 joda-time-2.2-dist.tar.gz
10 years, 10 months
[cargo-resources] update to 1.4.2
by gil
commit 5a0c182b84a90878a83dd534c814ebf6e105ebb6
Author: gil <puntogil(a)libero.it>
Date: Wed Jun 5 08:25:46 2013 +0200
update to 1.4.2
.gitignore | 1 +
cargo-resources.spec | 26 +++++++++-----------------
sources | 2 +-
3 files changed, 11 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bee72c2..5332188 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/cargo-resources-1.2.4-src-svn.tar.gz
/cargo-resources-1.3.1-src-svn.tar.gz
+/cargo-resources-1.4.2-src-svn.tar.gz
diff --git a/cargo-resources.spec b/cargo-resources.spec
index 6c840f8..6fd7559 100644
--- a/cargo-resources.spec
+++ b/cargo-resources.spec
@@ -1,20 +1,17 @@
%global oname cargo
Name: cargo-resources
-Version: 1.3.1
-Release: 4%{?dist}
+Version: 1.4.2
+Release: 1%{?dist}
Summary: Cargo Shared Resources
Group: Development/Libraries
License: ASL 2.0
Url: http://cargo.codehaus.org/
-# svn export http://svn.codehaus.org/cargo/resources/tags/cargo-resources-1.2.4
-# tar czf cargo-resources-1.2.4-src-svn.tar.gz cargo-resources-1.2.4
+# svn export http://svn.codehaus.org/cargo/resources/tags/cargo-resources-1.4.2
+# tar czf cargo-resources-1.4.2-src-svn.tar.gz cargo-resources-1.4.2
Source0: %{name}-%{version}-src-svn.tar.gz
-# force tomcat 7.x apis use
-Source1: %{name}-1.2.2-depmap
BuildRequires: cargo-parent
BuildRequires: java-devel
-BuildRequires: jpackage-utils
BuildRequires: felix-osgi-core
BuildRequires: geronimo-ejb
@@ -24,16 +21,10 @@ BuildRequires: javamail
BuildRequires: tomcat-servlet-3.0-api
BuildRequires: maven-local
-BuildRequires: maven-compiler-plugin
BuildRequires: maven-ear-plugin
BuildRequires: maven-ejb-plugin
BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
BuildRequires: maven-plugin-bundle
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
BuildRequires: maven-war-plugin
Requires: felix-osgi-core
@@ -42,7 +33,6 @@ Requires: javamail
Requires: tomcat-servlet-3.0-api
Requires: java
-Requires: jpackage-utils
BuildArch: noarch
%description
@@ -51,7 +41,6 @@ Cargo Shared Resources (License files, Checkstyle configuration files, etc).
%package javadoc
Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
This package contains javadoc for %{name}.
@@ -73,8 +62,8 @@ sed -i "s|<version>4.0.0</version>|<version>1.4.0</version>|" testdata/simple-bu
sed -i "s|<artifactId>geronimo-j2ee_1.4_spec|<artifactId>geronimo-ejb_3.1_spec|" testdata/simple-ejb/pom.xml
%build
-
-mvn-rpmbuild -Dmaven.local.depmap.file="%{SOURCE1}" install javadoc:aggregate
+# force tomcat 7.x apis use
+mvn-rpmbuild -Dmaven.local.depmap.file="%{_mavendepmapfragdir}/tomcat-tomcat-servlet-api" package javadoc:aggregate
%install
@@ -148,6 +137,9 @@ cp -p build-tools/NOTICE .
%doc LICENSE NOTICE
%changelog
+* Wed Jun 05 2013 gil cattaneo <puntogil(a)libero.it> 1.4.2-1
+- Update to 1.4.2
+
* Sun Feb 17 2013 gil cattaneo <puntogil(a)libero.it> 1.3.1-4
- added missing BR geronimo-parent-poms
diff --git a/sources b/sources
index d7a76e4..896e785 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c604d4ab4f67d84e6d283e29d4590d77 cargo-resources-1.3.1-src-svn.tar.gz
+4abf5aede71316d27649f4ca5e2d9da6 cargo-resources-1.4.2-src-svn.tar.gz
10 years, 10 months