[Bug 663711] New: Migrate maven-doxia-sitetools from tomcat5 to tomcat6
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: Migrate maven-doxia-sitetools from tomcat5 to tomcat6
https://bugzilla.redhat.com/show_bug.cgi?id=663711
Summary: Migrate maven-doxia-sitetools from tomcat5 to tomcat6
Product: Fedora
Version: rawhide
Platform: Unspecified
OS/Version: Linux
Status: NEW
Keywords: Triaged
Severity: medium
Priority: medium
Component: maven-doxia-sitetools
AssignedTo: akurtako(a)redhat.com
ReportedBy: orion(a)cora.nwra.com
QAContact: extras-qa(a)fedoraproject.org
CC: dbhole(a)redhat.com, akurtako(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org
Blocks: 640397
Classification: Fedora
We want to transition from tomcat5 to tomcat6. This package currently depends
on tomcat5 via one of the items tomcat5 provides, e.g.:
* jsp_2_0_api
* servlet24
* servlet_2_4_api
* servlet5
* servletapi5
* tomcat5
* tomcat5-jsp-2.0-api
* tomcat5-servlet-2.4-api
Please migrate this package to tomcat6, and use one of the standard provides:
* jsp21
* servlet25
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
13 years, 4 months
[maven-doxia-sitetools] Adapt to current guidelines.
by Alexander Kurtakov
commit 640d09698cbc7db39f961a57b48d67f779dc1ce2
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Dec 17 12:47:15 2010 +0200
Adapt to current guidelines.
maven-doxia-sitetools.spec | 44 ++++++++++++++++++--------------------------
1 files changed, 18 insertions(+), 26 deletions(-)
---
diff --git a/maven-doxia-sitetools.spec b/maven-doxia-sitetools.spec
index 56a53b6..5abeef8 100644
--- a/maven-doxia-sitetools.spec
+++ b/maven-doxia-sitetools.spec
@@ -33,7 +33,7 @@
Name: %{parent}-%{subproj}
Version: 1.1.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Doxia content generation framework
License: ASL 2.0
Group: Development/Tools
@@ -50,8 +50,6 @@ Source1: maven-doxia-depmap.xml
Patch0: %{name}-clirr.patch
Patch1: %{name}-disablehtmlunit.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
BuildRequires: itext >= 2.1.7
BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: maven2
@@ -69,30 +67,28 @@ BuildRequires: plexus-maven-plugin >= 0:1.2-2
BuildRequires: modello-maven-plugin >= 0:1.0-0.a8.3
BuildRequires: plexus-xmlrpc >= 0:1.0-0.b4.3
BuildRequires: classworlds
-BuildRequires: jakarta-commons-collections
-BuildRequires: jakarta-commons-configuration
+BuildRequires: apache-commons-collections
+BuildRequires: apache-commons-configuration
BuildRequires: apache-commons-logging
-BuildRequires: jakarta-commons-validator
+BuildRequires: apache-commons-validator
BuildRequires: junit
-BuildRequires: oro
+BuildRequires: jakarta-oro
BuildRequires: plexus-container-default
BuildRequires: plexus-containers-container-default
BuildRequires: plexus-containers-component-javadoc
BuildRequires: plexus-i18n
BuildRequires: plexus-utils >= 1.5.7
BuildRequires: plexus-velocity
-BuildRequires: tomcat5
-BuildRequires: tomcat5-servlet-2.4-api
BuildRequires: velocity
Requires: classworlds
-Requires: jakarta-commons-collections
-Requires: jakarta-commons-configuration
-Requires: jakarta-commons-logging
-Requires: jakarta-commons-validator
+Requires: apache-commons-collections
+Requires: apache-commons-configuration
+Requires: apache-commons-logging
+Requires: apache-commons-validator
Requires: junit
Requires: maven-doxia
-Requires: oro
+Requires: jakarta-oro
Requires: plexus-container-default
Requires: plexus-containers-container-default
Requires: plexus-i18n
@@ -173,21 +169,14 @@ install -m 644 -p doxia-doc-renderer/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.
install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{parent}
install -m 644 -p doxia-decoration-model/target/doxia-decoration-model-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{parent}/decoration-model-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{parent}/decoration-model.jar
install -m 644 -p doxia-site-renderer/target/doxia-site-renderer-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{parent}/site-renderer-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{parent}/site-renderer.jar
install -m 644 -p doxia-doc-renderer/target/doxia-doc-renderer-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{parent}/doc-renderer-%{version}.jar
-
-(cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+ $RPM_BUILD_ROOT%{_javadir}/%{parent}/doc-renderer.jar
-install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%files
%defattr(-,root,root,-)
@@ -200,6 +189,9 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_javadocdir}/*
%changelog
+* Fri Dec 17 2010 Alexander Kurtakov <akurtako(a)redhat.com> 1.1.3-2
+- Adapt to current guidelines.
+
* Tue Sep 7 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.1.3-1
- Update to 1.1.3
- Enable javadoc generation again
13 years, 4 months
[maven-plugin-cobertura] Update to 2.4.
by Alexander Kurtakov
commit 2dc28156e9994c71cb5cfb2797b1a088a358ab06
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Dec 17 12:16:32 2010 +0200
Update to 2.4.
Adapt to current guidelines.
.gitignore | 1 +
maven-plugin-cobertura.spec | 44 ++++++++++++++++++++----------------------
sources | 2 +-
3 files changed, 23 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 788db93..deefcc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
maven-plugin-cobertura-2.3.tar.bz2
+cobertura-maven-plugin-2.4-source-release.zip
diff --git a/maven-plugin-cobertura.spec b/maven-plugin-cobertura.spec
index f391995..24a2bb3 100644
--- a/maven-plugin-cobertura.spec
+++ b/maven-plugin-cobertura.spec
@@ -1,38 +1,35 @@
Name: maven-plugin-cobertura
-Version: 2.3
-Release: 3%{?dist}
+Version: 2.4
+Release: 1%{?dist}
Summary: Plugin providing the features of Cobertura within Maven
Group: Development/Libraries
License: ASL 2.0 and GPLv2 and GPLv2+
URL: http://mojo.codehaus.org/cobertura-maven-plugin/
-# The source tarball has been generated from upstream VCS:
-# svn export https://svn.codehaus.org/mojo/tags/cobertura-maven-plugin-%{version}
-# %{name}-%{version}
-# tar cjvf %{name}-%{version}.tar.bz2} %{name}-%{version}
-# (exported revision 10628)
-Source0: %{name}-%{version}.tar.bz2
+Source0: http://repo2.maven.org/maven2/org/codehaus/mojo/cobertura-maven-plugin/2....
# Fix compile with our doxia.
Patch0: maven-plugin-cobertura-2.3-SiteRenderer.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: maven2
-BuildRequires: maven2-plugin-plugin
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-javadoc
+BuildRequires: maven-plugin-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-invoker-plugin
+BuildRequires: maven-javadoc-plugin
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-shared-plugin-testing-harness
+BuildRequires: maven-plugin-testing-harness
+BuildRequires: maven-plugin-cobertura
BuildRequires: gnu-getopt >= 0:1.0.13
-BuildRequires: tomcat5
BuildRequires: cobertura
+BuildRequires: mojo-parent
Requires: maven2
Requires: cobertura
+Requires: mojo-parent
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
@@ -53,14 +50,14 @@ Requires: jpackage-utils
This package contains the API documentation for %{name}.
%prep
-%setup -q
+%setup -q -n cobertura-maven-plugin-%{version}
%patch0 -p1
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
-mvn-jpp -Dmaven.test.skip=true -Dmaven.repo.local=$MAVEN_REPO_LOCAL install javadoc:javadoc
+mvn-jpp -Dmaven.test.skip=true -Dmaven.repo.local=$MAVEN_REPO_LOCAL package javadoc:javadoc
%install
@@ -69,10 +66,7 @@ rm -rf $RPM_BUILD_ROOT
# jar
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -p -m 644 target/cobertura-maven-plugin-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/maven-plugin-cobertura-%{version}.jar
-pushd $RPM_BUILD_ROOT%{_javadir}
-ln -s maven-plugin-cobertura-%{version}.jar maven-plugin-cobertura.jar
-popd
+ $RPM_BUILD_ROOT%{_javadir}/maven-plugin-cobertura.jar
# pom
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
@@ -106,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Dec 17 2010 Alexander Kurtakov <akurtako(a)redhat.com> 2.4-1
+- Update to 2.4.
+- Adapt to current guidelines.
+
* Thu Sep 10 2009 Alexander Kurtakov <akurtako(a)redhat.com> 2.3-3
- Fix license and changelog.
- Add comment for patch.
diff --git a/sources b/sources
index 93bcf25..6ff3271 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e7d10ff9e251f8c618be65cdfc52cca3 maven-plugin-cobertura-2.3.tar.bz2
+bd09f32b260b3cd54beb8cc8349b63a2 cobertura-maven-plugin-2.4-source-release.zip
13 years, 4 months
[plexus-mail-sender] Add maven metadata
by Stanislav Ochotnicky
commit 53d4371508e680fd8496f182880a92e076fb7276
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Dec 16 17:19:22 2010 +0100
Add maven metadata
plexus-mail-sender.spec | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 insertions(+), 13 deletions(-)
---
diff --git a/plexus-mail-sender.spec b/plexus-mail-sender.spec
index f9d5038..f5910fc 100644
--- a/plexus-mail-sender.spec
+++ b/plexus-mail-sender.spec
@@ -32,7 +32,7 @@
Name: plexus-mail-sender
Version: 1.0
-Release: 0.a2.16%{?dist}
+Release: 0.a2.17%{?dist}
Epoch: 0
Summary: Plexus Mail Sender
License: MIT and ASL 1.1
@@ -67,9 +67,13 @@ BuildRequires: saxon
BuildRequires: saxon-scripts
BuildRequires: java-devel >= 1:1.6.0
+Requires: java
+Requires: jpackage-utils
+Requires(post): jpackage-utils
+Requires(postun):jpackage-utils
+
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
The Plexus project seeks to create end-to-end developer tools for
@@ -92,6 +96,10 @@ Javadoc for %{name}.
%setup -q -n %{name}-%{version}-a2
%patch0 -p3
+# fix groupIds of plexus to org.codehaus.plexus
+# mainly to
+find . -name release-pom.xml -exec \
+ sed -i 's:<groupId>plexus</groupId>:<groupId>org.codehaus.plexus</groupId>:' \{\} \;
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
@@ -105,21 +113,28 @@ mvn-jpp \
install javadoc:aggregate
%install
-rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+pushd plexus-mail-senders
+for mod in javamail simple test;do
+ pushd %{name}-$mod
+ install -pm 644 target/%{name}-$mod-%{namedversion}-SNAPSHOT.jar \
+ $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-$mod.jar
+ install -pm 644 release-pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.plexus-mail-sender-$mod.pom
+ %add_to_maven_depmap org.codehaus.plexus %{name}-$mod %{version} JPP/plexus mail-sender-$mod
+ %add_to_maven_depmap plexus %{name}-$mod %{version} JPP/plexus mail-sender-$mod
+ popd
+done
+popd
+
install -pm 644 \
- plexus-mail-senders/plexus-mail-sender-javamail/target/%{name}-javamail-%{namedversion}-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-javamail.jar
-install -pm 644 \
- plexus-mail-senders/plexus-mail-sender-simple/target/%{name}-simple-%{namedversion}-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-simple.jar
-install -pm 644 \
- plexus-mail-senders/plexus-mail-sender-test/target/%{name}-test-%{namedversion}-SNAPSHOT.jar \
- $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-test.jar
-install -pm 644 \
- plexus-mail-sender-api/target/%{name}-api-%{namedversion}-SNAPSHOT.jar \
+ %{name}-api/target/%{name}-api-%{namedversion}-SNAPSHOT.jar \
$RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-api.jar
+install -pm 644 %{name}-api/release-pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.plexus-mail-sender-api.pom
+%add_to_maven_depmap org.codehaus.plexus %{name}-api %{version} JPP/plexus mail-sender-api
+%add_to_maven_depmap plexus %{name}-api %{version} JPP/plexus mail-sender-api
+
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -128,6 +143,8 @@ cp -pr target/site/apidocs/* \
%files
%defattr(-,root,root,-)
+%{_mavendepmapfragdir}/%{name}
+%{_mavenpomdir}/*pom
%{_javadir}/*
%files javadoc
@@ -135,6 +152,9 @@ cp -pr target/site/apidocs/* \
%{_javadocdir}/*
%changelog
+* Thu Dec 16 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.0-0.a2.17
+- Add maven metadata
+
* Mon Dec 13 2010 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.0-0.a2.16
- Fix FTBFS.
- Adapt to current guidelines.
13 years, 4 months
[apache-commons-logging] Bring back commons-logging* symlinks.
by Alexander Kurtakov
commit 81e53d9dff0311b0a7fbe91fa0fd0b70b8333d23
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Thu Dec 16 23:26:37 2010 +0200
Bring back commons-logging* symlinks.
apache-commons-logging.spec | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index ddd9880..70f1d15 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,7 +4,7 @@
Name: apache-%{short_name}
Version: 1.1.1
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: Apache Commons Logging
License: ASL 2.0
Group: Development/Libraries
@@ -87,6 +87,12 @@ install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
install -p -m 644 target/%{short_name}-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-api.jar
install -p -m 644 target/%{short_name}-adapters-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-adapters.jar
+pushd $RPM_BUILD_ROOT%{_javadir}
+for jar in %{name}*; do
+ ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
+done
+popd
+
# pom
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom
@@ -139,6 +145,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
# -----------------------------------------------------------------------------
%changelog
+* Thu Dec 16 2010 Alexander Kurtakov <akurtako(a)redhat.com> 1.1.1-14
+- Bring back commons-logging* symlinks.
+
* Thu Dec 16 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.1.1-13
- Replace tomcat6 BR with servlet25 only
- Cleanups according to new packaging guidelines
13 years, 4 months
[plexus-utils] Add compatibility depmap
by Stanislav Ochotnicky
commit 2cf299b9b4cbb16d5b057371caca4893bd63bd24
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Dec 16 17:05:37 2010 +0100
Add compatibility depmap
- Use new maven plugin names
- Use versionless jars/javadocs
plexus-utils.spec | 50 +++++++++++++++++++++++++++-----------------------
1 files changed, 27 insertions(+), 23 deletions(-)
---
diff --git a/plexus-utils.spec b/plexus-utils.spec
index bd4d1bc..3493675 100644
--- a/plexus-utils.spec
+++ b/plexus-utils.spec
@@ -33,7 +33,7 @@
Name: plexus-utils
Version: 2.0.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Plexus Common Utilities
License: ASL 1.1 and ASL 2.0 and MIT
Group: Development/Libraries
@@ -42,20 +42,18 @@ Source0: plexus-utils-%{version}.tar.gz
# svn export http://svn.codehaus.org/plexus/plexus-utils/tags/plexus-utils-2.0.1/
Patch0: plexus-utils-remove-release-plugin.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.6
Requires: jpackage-utils
Requires(postun): jpackage-utils
BuildRequires: maven2
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-surefire
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-surefire-provider-junit
@@ -92,25 +90,22 @@ mvn-jpp \
install javadoc:javadoc
%install
-rm -rf $RPM_BUILD_ROOT
# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{parent}
install -pm 644 target/%{name}-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/plexus/utils-%{version}.jar
-%add_to_maven_depmap org.codehaus.plexus %{name} %{version} JPP/%{parent} %{subname}
-(cd $RPM_BUILD_ROOT%{_javadir}/plexus && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+ $RPM_BUILD_ROOT%{_javadir}/plexus/utils.jar
# pom
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%add_to_maven_depmap org.codehaus.plexus %{name} %{version} JPP/%{parent} %{subname}
+# compatibility depmap
+%add_to_maven_depmap plexus %{name} %{version} JPP/%{parent} %{subname}
-%clean
-rm -rf $RPM_BUILD_ROOT
+# javadoc
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%post
%update_maven_depmap
@@ -118,6 +113,11 @@ rm -rf $RPM_BUILD_ROOT
%postun
%update_maven_depmap
+%pre javadoc
+# workaround for rpm bug, can be removed in F-17
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
+
%files
%defattr(-,root,root,-)
%{_javadir}/*
@@ -126,10 +126,14 @@ rm -rf $RPM_BUILD_ROOT
%files javadoc
%defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}
%changelog
+* Thu Dec 16 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.0.5-2
+- Use versionless jars/javadocs
+- Use new maven plugin names
+- Add compatibility depmap
+
* Wed May 5 2010 Mary Ellen Foster <mefoster at gmail.com> 2.0.5-1
- Update to 2.0.5
13 years, 4 months
[apache-commons-logging] Replace tomcat6 BR with servlet25 only
by Stanislav Ochotnicky
commit 7db8532dbe645a57dd3cb050858b04e119d1d830
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Dec 16 16:37:14 2010 +0100
Replace tomcat6 BR with servlet25 only
- Cleanups according to new packaging guidelines
- Install maven metadata for -api jar
- Versionless jars/javadocs
apache-commons-logging.spec | 56 ++++++--------
commons-logging-api-1.1.pom | 165 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 189 insertions(+), 32 deletions(-)
---
diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 5ef9ace..ddd9880 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,13 +4,14 @@
Name: apache-%{short_name}
Version: 1.1.1
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: Apache Commons Logging
License: ASL 2.0
Group: Development/Libraries
URL: http://commons.apache.org/%{base_name}
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{ve...
Source1: %{short_name}.depmap
+Source2: http://mirrors.ibiblio.org/pub/mirrors/maven2/%{short_name}/%{short_name}...
Patch1: %{short_name}-eclipse-manifest.patch
Patch0: %{short_name}-maven-release-plugin.patch
BuildArch: noarch
@@ -21,16 +22,13 @@ BuildRequires: avalon-logkit
BuildRequires: apache-commons-parent
BuildRequires: maven-plugin-build-helper
BuildRequires: maven-site-plugin
-BuildRequires: tomcat6-servlet-2.5-api
-BuildRequires: tomcat6
+BuildRequires: servlet25
Requires: java >= 1:1.6.0
Requires: jpackage-utils >= 0:1.6
Requires(post): jpackage-utils
Requires(postun):jpackage-utils
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-
# This should go away with F-17
Provides: jakarta-%{short_name} = 0:%{version}-%{release}
Obsoletes: jakarta-%{short_name} <= 0:1.0.4
@@ -62,7 +60,6 @@ Obsoletes: jakarta-%{short_name}-javadoc <= 0:1.0.4
%setup -q -n %{short_name}-%{version}-src
%patch0 -p1 -b .rhbug_588142
-
%patch1
sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt
@@ -84,31 +81,19 @@ mvn-jpp -e -Dmaven2.jpp.depmap.file="%{SOURCE1}" \
# -----------------------------------------------------------------------------
%install
-rm -rf $RPM_BUILD_ROOT
-
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-install -p -m 644 target/%{short_name}-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-api-%{version}.jar
-install -p -m 644 target/%{short_name}-adapters-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-adapters-%{version}.jar
-
-pushd $RPM_BUILD_ROOT%{_javadir}
-for jar in *-%{version}*; do
- ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
- ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
- ln -sf ${jar} `echo $jar| sed "s|apache-\(.*\)-%{version}|\1|g"`
-done
-popd # come back from javadir
+install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -p -m 644 target/%{short_name}-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-api.jar
+install -p -m 644 target/%{short_name}-adapters-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-adapters.jar
# pom
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
+install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}-api.pom
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
%add_to_maven_depmap org.apache.commons %{short_name}-api %{version} JPP %{short_name}-api
-
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
%add_to_maven_depmap org.apache.commons %{short_name}-adapters %{version} JPP %{short_name}-adapters
# following lines are only for backwards compatibility. New packages
@@ -117,23 +102,24 @@ install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
%add_to_maven_depmap %{short_name} %{short_name}-api %{version} JPP %{short_name}-api
%add_to_maven_depmap %{short_name} %{short_name}-adapters %{version} JPP %{short_name}-adapters
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -sf %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-# -----------------------------------------------------------------------------
-%clean
-rm -rf $RPM_BUILD_ROOT
+# javadoc
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# -----------------------------------------------------------------------------
%post
%update_maven_depmap
-
%postun
%update_maven_depmap
+%pre javadoc
+# workaround for rpm bug, can be removed in F-17
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
+
+
# -----------------------------------------------------------------------------
%files
@@ -141,6 +127,7 @@ rm -rf $RPM_BUILD_ROOT
%doc PROPOSAL.html STATUS.html LICENSE.txt RELEASE-NOTES.txt
%{_javadir}/*
%{_mavenpomdir}/JPP-%{short_name}.pom
+%{_mavenpomdir}/JPP-%{short_name}-api.pom
%{_mavendepmapfragdir}/*
@@ -148,11 +135,16 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%doc LICENSE.txt
%{_javadocdir}/%{name}
-%{_javadocdir}/%{name}-%{version}
# -----------------------------------------------------------------------------
%changelog
+* Thu Dec 16 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.1.1-13
+- Replace tomcat6 BR with servlet25 only
+- Cleanups according to new packaging guidelines
+- Install maven metadata for -api jar
+- Versionless jars/javadocs
+
* Tue Nov 9 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.1.1-12
- Add depmaps for api and adapters subpackages
- Use apache-commons-parent BR instead of maven-*
diff --git a/commons-logging-api-1.1.pom b/commons-logging-api-1.1.pom
new file mode 100644
index 0000000..c8b5be8
--- /dev/null
+++ b/commons-logging-api-1.1.pom
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <name>Logging</name>
+ <version>1.1</version>
+ <description>Commons Logging is a thin adapter allowing configurable bridging to other,
+ well known logging systems.</description>
+ <url>http://jakarta.apache.org/commons/logging/</url>
+ <issueManagement>
+ <url>http://issues.apache.org/jira/browse/LOGGING</url>
+ </issueManagement>
+ <ciManagement>
+ <notifiers>
+ <notifier>
+ <configuration>
+ <address>commons-dev(a)jakarta.apache.org</address>
+ </configuration>
+ </notifier>
+ </notifiers>
+ </ciManagement>
+ <inceptionYear>2001</inceptionYear>
+ <mailingLists>
+ <mailingList>
+ <name>Commons Dev List</name>
+ <subscribe>commons-dev-subscribe(a)jakarta.apache.org</subscribe>
+ <unsubscribe>commons-dev-unsubscribe(a)jakarta.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/</archive>
+ </mailingList>
+ <mailingList>
+ <name>Commons User List</name>
+ <subscribe>commons-user-subscribe(a)jakarta.apache.org</subscribe>
+ <unsubscribe>commons-user-unsubscribe(a)jakarta.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/</archive>
+ </mailingList>
+ </mailingLists>
+ <developers>
+ <developer>
+ <id>morgand</id>
+ <name>Morgan Delagrange</name>
+ <email>morgand at apache dot org</email>
+ <organization>Apache</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>rwaldhoff</id>
+ <name>Rodney Waldhoff</name>
+ <email>rwaldhoff at apache org</email>
+ <organization>Apache Software Foundation</organization>
+ </developer>
+ <developer>
+ <id>craigmcc</id>
+ <name>Craig McClanahan</name>
+ <email>craigmcc at apache org</email>
+ <organization>Apache Software Foundation</organization>
+ </developer>
+ <developer>
+ <id>sanders</id>
+ <name>Scott Sanders</name>
+ <email>sanders at apache dot org</email>
+ <organization>Apache Software Foundation</organization>
+ </developer>
+ <developer>
+ <id>rdonkin</id>
+ <name>Robert Burrell Donkin</name>
+ <email>rdonkin at apache dot org</email>
+ <organization>Apache Software Foundation</organization>
+ </developer>
+ <developer>
+ <id>donaldp</id>
+ <name>Peter Donald</name>
+ <email>donaldp at apache dot org</email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <id>costin</id>
+ <name>Costin Manolache</name>
+ <email>costin at apache dot org</email>
+ <organization>Apache Software Foundation</organization>
+ </developer>
+ <developer>
+ <id>rsitze</id>
+ <name>Richard Sitze</name>
+ <email>rsitze at apache dot org</email>
+ <organization>Apache Software Foundation</organization>
+ </developer>
+ <developer>
+ <id>baliuka</id>
+ <name>Juozas Baliuka</name>
+ <email>baliuka(a)apache.org</email>
+ <organization></organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>skitching</id>
+ <name>Simon Kitching</name>
+ <email>skitching(a)apache.org</email>
+ <organization>Apache Software Foundation</organization>
+ </developer>
+ <developer>
+ <id>dennisl</id>
+ <name>Dennis Lundberg</name>
+ <email>dennisl(a)apache.org</email>
+ <organization>Apache Software Foundation</organization>
+ </developer>
+ <developer>
+ <id>bstansberry</id>
+ <name>Brian Stansberry</name>
+ </developer>
+ </developers>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>/LICENSE.txt</url>
+ </license>
+ </licenses>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/logging/tr...</connection>
+ <url>http://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk/</url>
+ </scm>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://jakarta.apache.org</url>
+ </organization>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <plugins>
+ <plugin>
+ <artifactId>maven-xdoc-plugin</artifactId>
+ <version>1.9.2</version>
+ <configuration>
+ <optional>true</optional>
+ <comment><strong>Site Only</strong> - v1.9.2 (minimum)</comment>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+ <distributionManagement>
+ <repository>
+ <id>default</id>
+ <name>Default Repository</name>
+ <url>file:///www/jakarta.apache.org/builds/jakarta-commons/logging/</url>
+ </repository>
+ <site>
+ <id>default</id>
+ <name>Default Site</name>
+ <url>scp://people.apache.org//www/jakarta.apache.org/commons/logging/</url>
+ </site>
+ <status>converted</status>
+ </distributionManagement>
+</project>
\ No newline at end of file
13 years, 4 months
[maven-plugin-bundle] Fix release.
by Alexander Kurtakov
commit d1730a1a99490dbdecbee7ecff2af600ebb01c09
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Dec 15 21:31:15 2010 +0200
Fix release.
maven-plugin-bundle.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/maven-plugin-bundle.spec b/maven-plugin-bundle.spec
index dfac11c..c4538a6 100644
--- a/maven-plugin-bundle.spec
+++ b/maven-plugin-bundle.spec
@@ -1,6 +1,6 @@
Name: maven-plugin-bundle
Version: 2.0.0
-Release: 7 %{?dist}
+Release: 7%{?dist}
Summary: Maven Bundle Plugin
Group: Development/Tools
13 years, 4 months