[plexus-archiver] BR maven-surefire-provider-junit4
by Alexander Kurtakov
commit 0ef7a38b599e2dd86be104ce6b8160bbccacbc6c
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Thu Sep 8 11:06:56 2011 +0300
BR maven-surefire-provider-junit4
plexus-archiver.spec | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/plexus-archiver.spec b/plexus-archiver.spec
index e876eee..1b6c352 100644
--- a/plexus-archiver.spec
+++ b/plexus-archiver.spec
@@ -30,7 +30,7 @@
Name: plexus-archiver
Version: 2.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 0
Summary: Plexus Archiver Component
License: MIT and ASL 2.0
@@ -55,7 +55,7 @@ BuildRequires: maven-jar-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-surefire-plugin
-BuildRequires: maven-surefire-provider-junit
+BuildRequires: maven-surefire-provider-junit4
BuildRequires: maven-shared-reporting-impl
BuildRequires: maven-doxia-sitetools
Requires: classworlds >= 0:1.1
@@ -113,6 +113,9 @@ cp -pr target/site/api*/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%doc %{_javadocdir}/%{name}
%changelog
+* Thu Sep 8 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:2.0.1-2
+- BR maven-surefire-provider-junit4.
+
* Thu Sep 8 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:2.0.1-1
- Update to 2.0.1 version.
@@ -170,4 +173,3 @@ cp -pr target/site/api*/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
* Mon Nov 07 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a3.1jpp
- First JPackage build
-
12 years, 7 months
[plexus-archiver] Update to 2.0.1 version.
by Alexander Kurtakov
commit 5fc2556864d0a40acd39497dd0c4e917ad346c04
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Thu Sep 8 10:54:07 2011 +0300
Update to 2.0.1 version.
.gitignore | 1 +
plexus-archiver.spec | 24 ++++++++++++------------
sources | 2 +-
3 files changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1c7f7a3..1938e89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ plexus-archiver-src.tar.gz
plexus-archiver-1.0-alpha-12-src.tar.bz2
plexus-archiver-1.1-src.tar.xz
/plexus-archiver-1.2.tar.xz
+plexus-archiver-2.0.1.tar.xz
diff --git a/plexus-archiver.spec b/plexus-archiver.spec
index 6582fac..e876eee 100644
--- a/plexus-archiver.spec
+++ b/plexus-archiver.spec
@@ -29,16 +29,16 @@
#
Name: plexus-archiver
-Version: 1.2
-Release: 2%{?dist}
+Version: 2.0.1
+Release: 1%{?dist}
Epoch: 0
Summary: Plexus Archiver Component
License: MIT and ASL 2.0
Group: Development/Libraries
URL: http://plexus.codehaus.org/plexus-components/plexus-archiver/
-#svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-archiver-1.2/
-#tar caf plexus-archiver-1.2.tar.xz plexus-archiver-1.2/
-Source0: plexus-archiver-%{version}.tar.xz
+# git clone https://github.com/sonatype/plexus-archiver
+# git archive --format=tar --prefix=plexus-archiver-2.0.1/ plexus-archiver-2.0.1 | xz >plexus-archiver-2.0.1.tar.xz
+Source0: %{name}-%{version}.tar.xz
BuildArch: noarch
@@ -75,7 +75,7 @@ is like a J2EE application server, without all the baggage.
%package javadoc
Summary: Javadoc for %{name}
-Group: Development/Documentation
+Group: Documentation
Requires: jpackage-utils
%description javadoc
@@ -85,25 +85,21 @@ Javadoc for %{name}.
%prep
%setup -q
-#remove not compilint tests
-rm -fr src/test/java/org/codehaus/plexus/archiver/DuplicateFilesTest.java
-
%build
mvn-rpmbuild install javadoc:javadoc
-
%install
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
install -pm 644 target/%{name}-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/plexus/archiver.jar
-%add_to_maven_depmap org.codehaus.plexus %{name} %{version} JPP/plexus archiver
-
# 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 plexus/archiver.jar
+
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr target/site/api*/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -117,6 +113,9 @@ cp -pr target/site/api*/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%doc %{_javadocdir}/%{name}
%changelog
+* Thu Sep 8 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:2.0.1-1
+- Update to 2.0.1 version.
+
* Wed Jul 27 2011 Jaromir Capik <jcapik(a)redhat.com> - 0:1.2-2
- Removal of plexus-maven-plugin dependency (not needed)
- Minor spec file changes according to the latest guidelines
@@ -171,3 +170,4 @@ cp -pr target/site/api*/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
* Mon Nov 07 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a3.1jpp
- First JPackage build
+
diff --git a/sources b/sources
index 9770350..64375ab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d1a1958490201f521d2bfbf865d18c74 plexus-archiver-1.2.tar.xz
+36cfecc86b49513910f043afb0ce09cf plexus-archiver-2.0.1.tar.xz
12 years, 7 months
[plexus-archiver] plexus-maven-plugin removed (not needed)
by Alexander Kurtakov
commit 409195bf55040103953c0170246e349da253f8db
Author: Jaromir Capik <jcapik(a)redhat.com>
Date: Wed Jul 27 14:42:41 2011 +0200
plexus-maven-plugin removed (not needed)
plexus-archiver.spec | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
---
diff --git a/plexus-archiver.spec b/plexus-archiver.spec
index 8970eef..6582fac 100644
--- a/plexus-archiver.spec
+++ b/plexus-archiver.spec
@@ -30,7 +30,7 @@
Name: plexus-archiver
Version: 1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 0
Summary: Plexus Archiver Component
License: MIT and ASL 2.0
@@ -58,7 +58,6 @@ BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-shared-reporting-impl
BuildRequires: maven-doxia-sitetools
-BuildRequires: plexus-maven-plugin
Requires: classworlds >= 0:1.1
Requires: plexus-container-default
Requires: plexus-utils
@@ -84,7 +83,7 @@ Javadoc for %{name}.
%prep
-%setup -q
+%setup -q
#remove not compilint tests
rm -fr src/test/java/org/codehaus/plexus/archiver/DuplicateFilesTest.java
@@ -109,23 +108,19 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}.pom
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr target/site/api*/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
-%defattr(-,root,root,-)
%{_javadir}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
-%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}
%changelog
+* Wed Jul 27 2011 Jaromir Capik <jcapik(a)redhat.com> - 0:1.2-2
+- Removal of plexus-maven-plugin dependency (not needed)
+- Minor spec file changes according to the latest guidelines
+
* Tue May 17 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.2-1
- Update to 1.2.
12 years, 7 months
[plexus-io] Update to 2.0.1 upstream release.
by Alexander Kurtakov
commit f33dd4eab747321634727f5375c59348a364ceb5
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Thu Sep 8 10:08:11 2011 +0300
Update to 2.0.1 upstream release.
.gitignore | 1 +
plexus-io.spec | 16 ++++++++--------
sources | 2 +-
3 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ba4df9e..97c7a3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
plexus-io-1.0-alpha-5.tar.bz2
/plexus-io-1.0.1.tar.xz
+plexus-io-2.0.1.tar.xz
diff --git a/plexus-io.spec b/plexus-io.spec
index 353ab0c..4100826 100644
--- a/plexus-io.spec
+++ b/plexus-io.spec
@@ -1,14 +1,14 @@
Name: plexus-io
-Version: 1.0.1
-Release: 2%{?dist}
+Version: 2.0.1
+Release: 1%{?dist}
Summary: Plexus IO Components
Group: Development/Libraries
License: ASL 2.0
URL: http://plexus.codehaus.org/plexus-components/plexus-io
-#svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-io-1.0.1/
-#tar caf plexus-io-1.0.1.tar.xz plexus-io-1.0.1/
-Source0: plexus-io-%{version}.tar.xz
+# git clone https://github.com/sonatype/plexus-io
+# git archive --format=tar --prefix=plexus-io-2.0.1/ plexus-io-2.0.1 | xz >plexus-io-2.0.1.tar.xz
+Source0: %{name}-%{version}.tar.xz
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
@@ -29,9 +29,6 @@ Requires: jpackage-utils
Requires: plexus-utils
Requires: plexus-container-default
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
-
%description
Plexus IO is a set of plexus components, which are designed for use
in I/O operations.
@@ -79,6 +76,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%{_javadocdir}/%{name}
%changelog
+* Thu Sep 8 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.0.1-1
+- Update to 2.0.1 upstream release.
+
* Wed Jul 27 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.0.1-2
- Use add_maven_depmap macro
diff --git a/sources b/sources
index 815acf2..5ae17ee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bdd7cdef53b5981bdc72338479504ade plexus-io-1.0.1.tar.xz
+ac87c6a33c4204a80081736bf19e17e5 plexus-io-2.0.1.tar.xz
12 years, 7 months
[tomcat/f15] Updated to 7.0.21
by Ivan Afonichev
Summary of changes:
5e7f3de... Updated to 7.0.21 (*)
(*) This commit already existed in another branch; no separate mail sent
12 years, 7 months
[tomcat/f16] Updated to 7.0.21
by Ivan Afonichev
Summary of changes:
5e7f3de... Updated to 7.0.21 (*)
(*) This commit already existed in another branch; no separate mail sent
12 years, 7 months
[tomcat] Updated to 7.0.21
by Ivan Afonichev
commit 5e7f3dea1ba700d695f2eab860311cf9228fba22
Author: Ivan Afonichev <ivan.afonichev(a)gmail.com>
Date: Thu Sep 8 00:14:46 2011 +0400
Updated to 7.0.21
sources | 2 +-
tomcat.spec | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/sources b/sources
index 8b3f4ad..fc75c8f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb13b2910cc71c29e571ea062ad6ab3a apache-tomcat-7.0.20-src.tar.gz
+40d71249a54526ab0145fd5b41008518 apache-tomcat-7.0.21-src.tar.gz
diff --git a/tomcat.spec b/tomcat.spec
index b83e789..35ffb72 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -31,7 +31,7 @@
%global jspspec 2.2
%global major_version 7
%global minor_version 0
-%global micro_version 20
+%global micro_version 21
%global packdname apache-tomcat-%{version}-src
%global servletspec 3.0
%global elspec 2.2
@@ -54,7 +54,7 @@
Name: tomcat
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 3%{?dist}
+Release: 1%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: System Environment/Daemons
@@ -565,6 +565,9 @@ fi
%{appdir}/sample
%changelog
+* Thu Sep 8 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.21-1
+- Updated to 7.0.21
+
* Mon Aug 15 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.20-3
- Require java = 1:1.6.0
12 years, 7 months