[tomcat/f15] Updated to 7.0.23
by Ivan Afonichev
commit dd9739b92b242e35740ff1cc8629be5f3ac6466a
Author: Ivan Afonichev <ivan.afonichev(a)gmail.com>
Date: Mon Nov 28 21:30:16 2011 +0400
Updated to 7.0.23
sources | 2 +-
tomcat.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/sources b/sources
index 8a177eb..cea4652 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-878bc216d86ce803f3bbc65fd40eb96c apache-tomcat-7.0.22-src.tar.gz
+4d78b1b115a4c3fcd079c388a8bbd0ad apache-tomcat-7.0.23-src.tar.gz
diff --git a/tomcat.spec b/tomcat.spec
index 6601a0a..867bc22 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 22
+%global micro_version 23
%global packdname apache-tomcat-%{version}-src
%global servletspec 3.0
%global elspec 2.2
@@ -585,6 +585,9 @@ fi
%{appdir}/sample
%changelog
+* Mon Nov 28 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.23-1
+- Updated to 7.0.23
+
* Thu Oct 6 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.22-1
- Updated to 7.0.22
12 years, 5 months
[tomcat] Updated to 7.0.23
by Ivan Afonichev
Summary of changes:
4cfe7cc... Updated to 7.0.23 (*)
(*) This commit already existed in another branch; no separate mail sent
12 years, 5 months
[tomcat/f16] Updated to 7.0.23
by Ivan Afonichev
commit 4cfe7cc5cd0f75874001c7a1c0a872192b2c0924
Author: Ivan Afonichev <ivan.afonichev(a)gmail.com>
Date: Mon Nov 28 21:30:16 2011 +0400
Updated to 7.0.23
sources | 2 +-
tomcat.spec | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/sources b/sources
index 8a177eb..cea4652 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-878bc216d86ce803f3bbc65fd40eb96c apache-tomcat-7.0.22-src.tar.gz
+4d78b1b115a4c3fcd079c388a8bbd0ad apache-tomcat-7.0.23-src.tar.gz
diff --git a/tomcat.spec b/tomcat.spec
index 2aed06e..cc6325f 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 22
+%global micro_version 23
%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: 2%{?dist}
+Release: 1%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: System Environment/Daemons
@@ -615,6 +615,9 @@ fi
%{_initrddir}/%{name}
%changelog
+* Mon Nov 28 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.23-1
+- Updated to 7.0.23
+
* Fri Nov 11 2011 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.22-2
- Move tomcat-juli.jar to lib package
- Drop %%update_maven_depmap as in tomcat6
12 years, 5 months
[maven-shared] Fix plugin-testing-harness dependency/obsoletes/provides versions.
by Ville Skyttä
commit eb3c059fd3bdde110b2ccfabd1bd5b0eea7614fe
Author: Ville Skyttä <ville.skytta(a)iki.fi>
Date: Sun Nov 27 23:51:30 2011 +0200
Fix plugin-testing-harness dependency/obsoletes/provides versions.
maven-shared.spec | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/maven-shared.spec b/maven-shared.spec
index 41a387a..2af3268 100644
--- a/maven-shared.spec
+++ b/maven-shared.spec
@@ -43,6 +43,7 @@
%global invoker_version 2.0.12
%global model_converter_version 2.3
%global osgi_version 0.3.0
+%global plugin_testing_harness_version 1.2
#this model is not included in parent pom
%global reporting_api_version 3.0
@@ -66,7 +67,7 @@ Summary: Maven Shared Components
URL: http://maven.apache.org/shared/
Name: maven-shared
Version: 15
-Release: 19%{?dist}
+Release: 20%{?dist}
License: ASL 2.0
Group: Development/Libraries
@@ -626,6 +627,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_javadocdir}/%{name}
%changelog
+* Sun Nov 27 2011 Ville Skyttä <ville.skytta(a)iki.fi> - 15-20
+- Fix plugin-testing-harness dependency/obsoletes/provides versions.
+
* Wed Oct 12 2011 Jaromir Capik <jcapik(a)redhat.com> - 15-19
- aqute-bndlib renamed to aqute-bnd (fixing name conflict)
12 years, 5 months
[maven-skins] Adapt to current guidelines.
by Alexander Kurtakov
commit 36cd9be3b1796182b6a15d2f1fe4f9651a904586
Author: Alexander Kurtakov < <akurtako(a)redhat.com>
Date: Fri Nov 25 14:28:37 2011 +0200
Adapt to current guidelines.
maven-skins.spec | 49 +++++++++++++++----------------------------------
1 files changed, 15 insertions(+), 34 deletions(-)
---
diff --git a/maven-skins.spec b/maven-skins.spec
index b8d6019..353c1b5 100644
--- a/maven-skins.spec
+++ b/maven-skins.spec
@@ -5,7 +5,7 @@
Name: maven-skins
Version: 5
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Maven Skins
Group: Development/Libraries
@@ -14,10 +14,9 @@ URL: http://maven.apache.org/skins/
# svn export http://svn.apache.org/repos/asf/maven/skins/tags/maven-skins-5
# tar caf maven-skins-5-tar.xz maven-skins-5/
Source0: %{name}-%{version}.tar.xz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-install-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-compiler-plugin
@@ -25,8 +24,6 @@ BuildRequires: maven-jar-plugin
BuildRequires: maven-surefire-plugin
BuildRequires: maven-site-plugin
Requires: jpackage-utils
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
Requires: java
%description
@@ -42,61 +39,45 @@ sed -i -e "s|5-SNAPSHOT|5|g" maven-stylus-skin/pom.xml
rm -fr src/site/site.xml
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
- -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- install
+mvn-rpmbuild install
%install
rm -rf %{buildroot}
# jars
install -d -m 0755 %{buildroot}%{_javadir}/%{name}
-install -m 644 maven-application-skin/target/maven-application-skin-%{app_version}.jar %{buildroot}%{_javadir}/%{name}/maven-application-skin-%{app_version}.jar
-install -m 644 maven-default-skin/target/maven-default-skin-%{def_version}.jar %{buildroot}%{_javadir}/%{name}/maven-default-skin-%{def_version}.jar
-install -m 644 maven-classic-skin/target/maven-classic-skin-%{cla_version}.jar %{buildroot}%{_javadir}/%{name}/maven-classic-skin-%{cla_version}.jar
-install -m 644 maven-stylus-skin/target/maven-stylus-skin-%{sty_version}.jar %{buildroot}%{_javadir}/%{name}/maven-stylus-skin-%{sty_version}.jar
-
-(cd %{buildroot}%{_javadir}/%{name} && for jar in *-SNAPSHOT*; \
- do ln -sf ${jar} `echo $jar| sed "s|-[0-9].[0-9]-SNAPSHOT||g"`; done)
-
+install -m 644 maven-application-skin/target/maven-application-skin-%{app_version}.jar %{buildroot}%{_javadir}/%{name}/maven-application-skin.jar
+install -m 644 maven-default-skin/target/maven-default-skin-%{def_version}.jar %{buildroot}%{_javadir}/%{name}/maven-default-skin.jar
+install -m 644 maven-classic-skin/target/maven-classic-skin-%{cla_version}.jar %{buildroot}%{_javadir}/%{name}/maven-classic-skin.jar
+install -m 644 maven-stylus-skin/target/maven-stylus-skin-%{sty_version}.jar %{buildroot}%{_javadir}/%{name}/maven-stylus-skin.jar
# poms
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml \
%{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap org.apache.maven.skins maven-skins %{version} JPP maven-skins
+%add_maven_depmap JPP-%{name}.pom
install -pm 644 maven-application-skin/pom.xml \
%{buildroot}%{_mavenpomdir}/JPP.%{name}-maven-application-skin.pom
-%add_to_maven_depmap org.apache.maven.skins maven-application-skin %{version} JPP/maven-skins maven-application-skin
+%add_maven_depmap JPP.%{name}-maven-application-skin.pom %{name}/maven-application-skin.jar
install -pm 644 maven-default-skin/pom.xml \
%{buildroot}%{_mavenpomdir}/JPP.%{name}-maven-default-skin.pom
-%add_to_maven_depmap org.apache.maven.skins maven-default-skin %{version} JPP/maven-skins maven-default-skin
+%add_maven_depmap JPP.%{name}-maven-default-skin.pom %{name}/maven-default-skin.jar
install -pm 644 maven-classic-skin/pom.xml \
%{buildroot}%{_mavenpomdir}/JPP.%{name}-maven-classic-skin.pom
-%add_to_maven_depmap org.apache.maven.skins maven-classic-skin %{version} JPP/maven-skins maven-classic-skin
+%add_maven_depmap JPP.%{name}-maven-classic-skin.pom %{name}/maven-classic-skin.jar
install -pm 644 maven-stylus-skin/pom.xml \
%{buildroot}%{_mavenpomdir}/JPP.%{name}-maven-stylus-skin.pom
-%add_to_maven_depmap org.apache.maven.skins maven-stylus-skin %{version} JPP/maven-skins maven-stylus-skin
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-%clean
-%{__rm} -rf %{buildroot}
+%add_maven_depmap JPP.%{name}-maven-stylus-skin.pom %{name}/maven-stylus-skin.jar
%files
-%defattr(-,root,root,-)
%{_javadir}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%changelog
+* Fri Nov 25 2011 Alexander Kurtakov <akurtako(a)redhat.com> 5-4
+- Adapt to current guidelines.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
12 years, 5 months
