[apache-commons-logging/f17] Bring back jakarta-commons-logging provides/obsoletes - the comment was misleading.
by Alexander Kurtakov
commit bd922d7396735f03bd9e3044c3516a904a8da8d7
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Tue May 1 00:19:10 2012 +0300
Bring back jakarta-commons-logging provides/obsoletes - the comment was
misleading.
apache-commons-logging.spec | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 4300cd6..c09355a 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,7 +4,7 @@
Name: apache-%{short_name}
Version: 1.1.1
-Release: 18%{?dist}
+Release: 19%{?dist}
Summary: Apache Commons Logging
License: ASL 2.0
Group: Development/Libraries
@@ -31,6 +31,10 @@ BuildRequires: servlet
Requires: java >= 1:1.6.0
Requires: jpackage-utils >= 0:1.6
+# This should go away with F-17
+Provides: jakarta-%{short_name} = 0:%{version}-%{release}
+Obsoletes: jakarta-%{short_name} <= 0:1.0.4
+
%description
The commons-logging package provides a simple, component oriented
interface (org.apache.commons.logging.Log) together with wrappers for
@@ -126,6 +130,9 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# -----------------------------------------------------------------------------
%changelog
+* Tue May 1 2012 Alexander Kurtakov <akurtako(a)redhat.com> 1.1.1-19
+- Bring back jakarta-commons-logging provides/obsoletes - the comment was misleading.
+
* Mon Apr 30 2012 Alexander Kurtakov <akurtako(a)redhat.com> 1.1.1-18
- Fix build with latest libs.
- Adapt to current guidelines.
12 years
Broken dependencies with Fedora 17 + updates-testing - 2012-04-30
by Michael Schwendt
The following packages in the repository suffer from broken dependencies:
======================================================================
The results in this summary consider Test Updates!
======================================================================
package: ant-commons-logging-1.8.3-1.fc17.noarch from fedora-17-development-i386
unresolved deps:
jakarta-commons-logging
package: ant-commons-logging-1.8.3-1.fc17.noarch from fedora-17-development-x86_64
unresolved deps:
jakarta-commons-logging
package: gooddata-cl-1.1.9-2.fc15.noarch from fedora-17-development-i386
unresolved deps:
jakarta-commons-logging
package: gooddata-cl-1.1.9-2.fc15.noarch from fedora-17-development-x86_64
unresolved deps:
jakarta-commons-logging
package: libbase-1.1.3-4.fc17.noarch from fedora-17-development-i386
unresolved deps:
jakarta-commons-logging
package: libbase-1.1.3-4.fc17.noarch from fedora-17-development-x86_64
unresolved deps:
jakarta-commons-logging
package: libformula-1.1.3-4.fc17.noarch from fedora-17-development-i386
unresolved deps:
jakarta-commons-logging
package: libformula-1.1.3-4.fc17.noarch from fedora-17-development-x86_64
unresolved deps:
jakarta-commons-logging
package: 1:libreoffice-wiki-publisher-3.5.2.1-6.fc17.i686 from fedora-17-development-i386
unresolved deps:
jakarta-commons-logging
package: 1:libreoffice-wiki-publisher-3.5.2.1-6.fc17.x86_64 from fedora-17-development-x86_64
unresolved deps:
jakarta-commons-logging
package: selenium-core-1.0.2-0.5.20100324svn.fc15.noarch from fedora-17-development-i386
unresolved deps:
jakarta-commons-logging
package: selenium-core-1.0.2-0.5.20100324svn.fc15.noarch from fedora-17-development-x86_64
unresolved deps:
jakarta-commons-logging
package: selenium-server-1.0.3-8.20100318svn.fc15.noarch from fedora-17-development-i386
unresolved deps:
jakarta-commons-logging
package: selenium-server-1.0.3-8.20100318svn.fc15.noarch from fedora-17-development-x86_64
unresolved deps:
jakarta-commons-logging
package: tomcat6-6.0.32-20.fc17.noarch from fedora-17-development-i386
unresolved deps:
jakarta-commons-logging
package: tomcat6-6.0.32-20.fc17.noarch from fedora-17-development-x86_64
unresolved deps:
jakarta-commons-logging
12 years
[maven-plugin-bundle] Add missing BuildRequires
by Mikolaj Izdebski
commit bacb0d08f430941d06575ccf1259adecc83e80bb
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Apr 30 17:38:16 2012 +0200
Add missing BuildRequires
maven-plugin-bundle.spec | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/maven-plugin-bundle.spec b/maven-plugin-bundle.spec
index 2dea402..7f8f7a8 100644
--- a/maven-plugin-bundle.spec
+++ b/maven-plugin-bundle.spec
@@ -2,7 +2,7 @@
Name: maven-plugin-bundle
Version: 2.3.7
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Maven Bundle Plugin
Group: Development/Tools
@@ -30,6 +30,9 @@ BuildRequires: maven-surefire-plugin >= 2.3
BuildRequires: maven-surefire-provider-junit4 >= 2.3
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-shared-osgi
+BuildRequires: maven-archiver
+BuildRequires: plexus-archiver
+BuildRequires: plexus-containers-container-default
BuildRequires: felix-parent
BuildRequires: felix-bundlerepository
@@ -103,6 +106,9 @@ rm -rf target/site/api*
%{_javadocdir}/%{name}
%changelog
+* Mon Apr 30 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.3.7-2
+- Add missing BuildRequires
+
* Wed Feb 29 2012 Jaromir Capik <jcapik(a)redhat.com> 2.3.7-1
- Update to 2.3.7
12 years
[maven-help-plugin] Migration from plexus-maven-plugin to plexus-containers-component-metadata
by Alexander Kurtakov
commit becbb754234706e7bce3cf7d426aaf395cd64648
Author: Jaromir Capik <jcapik(a)redhat.com>
Date: Mon Apr 30 15:54:55 2012 +0200
Migration from plexus-maven-plugin to plexus-containers-component-metadata
...lp-plugin-migration-to-component-metadata.patch | 18 ++++++++++++++++++
maven-help-plugin.spec | 15 ++++++++++-----
2 files changed, 28 insertions(+), 5 deletions(-)
---
diff --git a/maven-help-plugin-migration-to-component-metadata.patch b/maven-help-plugin-migration-to-component-metadata.patch
new file mode 100644
index 0000000..e7f3f6b
--- /dev/null
+++ b/maven-help-plugin-migration-to-component-metadata.patch
@@ -0,0 +1,18 @@
+diff -Naur maven-help-plugin-2.1.1.orig/pom.xml maven-help-plugin-2.1.1/pom.xml
+--- maven-help-plugin-2.1.1.orig/pom.xml 2012-04-30 15:45:38.000000000 +0200
++++ maven-help-plugin-2.1.1/pom.xml 2012-04-30 15:48:51.636000083 +0200
+@@ -175,12 +175,11 @@
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
+- <version>1.3.8</version>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
diff --git a/maven-help-plugin.spec b/maven-help-plugin.spec
index ce3002f..f12b668 100644
--- a/maven-help-plugin.spec
+++ b/maven-help-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-help-plugin
Version: 2.1.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Plugin to to get relative information about a project or the system
Group: Development/Libraries
@@ -9,7 +9,7 @@ URL: http://maven.apache.org/plugins/maven-help-plugin/
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
Patch0: add-compat.patch
Patch1: reduce-exception.patch
-
+Patch2: %{name}-migration-to-component-metadata.patch
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
@@ -27,6 +27,7 @@ BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: xstream
BuildRequires: jpackage-utils
+BuildRequires: plexus-containers-component-metadata
Requires: ant
Requires: maven
Requires: jpackage-utils
@@ -38,9 +39,9 @@ Provides: maven2-plugin-help = 0:%{version}-%{release}
%description
The Maven Help Plugin is used to get relative information about a project
- or the system. It can be used to get a description of a particular plugin,
+ or the system. It can be used to get a description of a particular plugin,
including the plugin's mojos with their parameters and component requirements,
-the effective POM and effective settings of the current build,
+the effective POM and effective settings of the current build,
and the profiles applied to the current project being built.
%package javadoc
@@ -53,9 +54,10 @@ API documentation for %{name}.
%prep
-%setup -q
+%setup -q
%patch0
%patch1
+%patch2 -p1
%build
# no junit-addons, skip test
@@ -87,6 +89,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%{_javadocdir}/%{name}
%changelog
+* Mon Apr 30 2012 Jaromir Capik <jcapik(a)redhat.com> 2.1.1-6
+- Migration from plexus-maven-plugin to plexus-containers-component-metadata
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.1.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
12 years
[jetty] Update osgi disabling patch
by Stanislav Ochotnicky
commit 4e7b06cff965403d702972e02c73bbd24b38a68c
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Apr 30 16:35:12 2012 +0200
Update osgi disabling patch
0007-disable-jetty-osgi.patch | 45 +++++++++++++++++++++++++++++++---------
1 files changed, 35 insertions(+), 10 deletions(-)
---
diff --git a/0007-disable-jetty-osgi.patch b/0007-disable-jetty-osgi.patch
index ab7a0ae..4f29e82 100644
--- a/0007-disable-jetty-osgi.patch
+++ b/0007-disable-jetty-osgi.patch
@@ -1,25 +1,50 @@
-From 7960d310a66c37b676b1fd03baae019530ccae79 Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk(a)redhat.com>
-Date: Tue, 24 Apr 2012 11:22:42 +0200
+From 82457b406b8198f26c470ee0b55485abdfd7b903 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Mon, 30 Apr 2012 16:24:57 +0200
Subject: [PATCH 7/7] disable jetty-osgi
---
- pom.xml | 18 ------------------
- 1 files changed, 0 insertions(+), 18 deletions(-)
+ jetty-jsp/pom.xml | 9 ++++++++-
+ pom.xml | 18 ------------------
+ 2 files changed, 8 insertions(+), 19 deletions(-)
+diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml
+index 55e8d29..4a3a5a9 100644
+--- a/jetty-jsp/pom.xml
++++ b/jetty-jsp/pom.xml
+@@ -48,11 +48,18 @@
+ <artifactId>com.sun.el</artifactId>
+ <version>2.2.0.v201108011116</version>
+ </dependency>
+- <!-- Eclipse Java Compiler (for JSP Compilation) -->
++ <!-- Eclipse Java Compiler (for JSP Compilation). Replaced by
++ glassfish
+ <dependency>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>org.eclipse.jdt.core</artifactId>
+ <version>3.7.1</version>
++ </dependency> -->
++
++ <dependency>
++ <groupId>org.glassfish.web</groupId>
++ <artifactId>javax.servlet.jsp</artifactId>
++ <version>2.2.3</version>
+ </dependency>
+ </dependencies>
+ </project>
diff --git a/pom.xml b/pom.xml
-index 6d778cc..f0ed5eb 100644
+index 65cf13a..65abba7 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -322,7 +322,6 @@
+@@ -352,7 +352,6 @@
<module>jetty-start</module>
<module>jetty-nested</module>
<module>jetty-overlay-deployer</module>
- <module>jetty-osgi</module>
- <module>jetty-distribution</module>
- <module>test-jetty-webapp</module>
<module>jetty-nosql</module>
-@@ -417,23 +416,6 @@
+ <module>jetty-http-spi</module>
+ <module>jetty-jsp</module>
+@@ -545,23 +544,6 @@
</modules>
</profile>
<profile>
12 years
[apache-commons-logging] Fix build with latest libs.
by Alexander Kurtakov
commit 7e7d17b790b3fff02248061592cad66c278dd9b8
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Mon Apr 30 17:30:00 2012 +0300
Fix build with latest libs.
- Adapt to current guidelines.
apache-commons-logging.spec | 33 ++++++----------------------
commons-logging-maven-release-plugin.patch | 33 ----------------------------
commons-logging.depmap | 28 ++---------------------
3 files changed, 10 insertions(+), 84 deletions(-)
---
diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 4e8b467..4300cd6 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,7 +4,7 @@
Name: apache-%{short_name}
Version: 1.1.1
-Release: 17%{?dist}
+Release: 18%{?dist}
Summary: Apache Commons Logging
License: ASL 2.0
Group: Development/Libraries
@@ -26,16 +26,10 @@ BuildRequires: apache-commons-parent
BuildRequires: maven-plugin-build-helper
BuildRequires: maven-release-plugin
BuildRequires: maven-site-plugin
-BuildRequires: servlet25
+BuildRequires: servlet
Requires: java >= 1:1.6.0
Requires: jpackage-utils >= 0:1.6
-Requires(post): jpackage-utils
-Requires(postun):jpackage-utils
-
-# This should go away with F-17
-Provides: jakarta-%{short_name} = 0:%{version}-%{release}
-Obsoletes: jakarta-%{short_name} <= 0:1.0.4
%description
The commons-logging package provides a simple, component oriented
@@ -79,7 +73,7 @@ rm src/test/org/apache/commons/logging/servlet/BasicServletTestCase.java
# They should probably be renamed/excluded from surefire run properly
rm src/test/org/apache/commons/logging/log4j/log4j12/*StandardTestCase.java
-mvn-rpmbuild -X -Dmaven.local.depmap.file="%{SOURCE1}" \
+mvn-rpmbuild -Dmaven.local.depmap.file="%{SOURCE1}" \
install javadoc:aggregate
# -----------------------------------------------------------------------------
@@ -117,23 +111,7 @@ install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}-api
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
-%defattr(-,root,root,-)
%doc PROPOSAL.html STATUS.html LICENSE.txt RELEASE-NOTES.txt
%{_javadir}/*
%{_mavenpomdir}/JPP-%{short_name}.pom
@@ -142,13 +120,16 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%files javadoc
-%defattr(-,root,root,-)
%doc LICENSE.txt
%{_javadocdir}/%{name}
# -----------------------------------------------------------------------------
%changelog
+* Mon Apr 30 2012 Alexander Kurtakov <akurtako(a)redhat.com> 1.1.1-18
+- Fix build with latest libs.
+- Adapt to current guidelines.
+
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.1.1-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/commons-logging.depmap b/commons-logging.depmap
index 1059072..922cda5 100644
--- a/commons-logging.depmap
+++ b/commons-logging.depmap
@@ -1,34 +1,12 @@
<dependencies>
<dependency>
<maven>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>xerces</groupId>
+ <artifactId>xerces</artifactId>
</maven>
<jpp>
<groupId>JPP</groupId>
- <artifactId>tomcat6-servlet-2.5-api</artifactId>
+ <artifactId>xerces-j2</artifactId>
</jpp>
</dependency>
- <dependency>
- <maven>
- <groupId>servletapi</groupId>
- <artifactId>servletapi</artifactId>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>tomcat6-servlet-2.5-api</artifactId>
- </jpp>
- </dependency>
- <dependency>
- <maven>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-javamail</artifactId>
- </maven>
- </dependency>
- <dependency>
- <maven>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jms</artifactId>
- </maven>
- </dependency>
</dependencies>
12 years
[jetty] Don't require subpackages not needed by server itself
by Stanislav Ochotnicky
commit b385b0388dec71e629ee0a54530dc5066ebff124
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Apr 30 09:41:55 2012 +0200
Don't require subpackages not needed by server itself
- Make jetty look for jars in correct directory
- Add proper dependent jars
jetty.spec | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index 63a20f7..1e7447b 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -44,7 +44,7 @@
Name: jetty
Version: 8.1.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Java Webserver and Servlet Container
Group: Applications/Internet
@@ -117,13 +117,9 @@ Requires: jetty-client = %{version}-%{release}
Requires: jetty-continuation = %{version}-%{release}
Requires: jetty-deploy = %{version}-%{release}
Requires: jetty-http = %{version}-%{release}
-Requires: jetty-http-spi = %{version}-%{release}
Requires: jetty-io = %{version}-%{release}
-Requires: jetty-jaspi = %{version}-%{release}
Requires: jetty-jmx = %{version}-%{release}
Requires: jetty-jndi = %{version}-%{release}
-Requires: jetty-nested = %{version}-%{release}
-Requires: jetty-nosql = %{version}-%{release}
Requires: jetty-overlay-deployer = %{version}-%{release}
Requires: jetty-plus = %{version}-%{release}
Requires: jetty-policy = %{version}-%{release}
@@ -136,9 +132,20 @@ Requires: jetty-util = %{version}-%{release}
Requires: jetty-webapp = %{version}-%{release}
Requires: jetty-websocket = %{version}-%{release}
Requires: jetty-xml = %{version}-%{release}
-%if 0%{?rhel} <= 0
-Requires: jetty-osgi = %{version}-%{release}
-%endif
+
+# needed for jsp to work
+Requires: glassfish-jsp
+Requires: glassfish-jsp-api
+
+# These are not required by main jetty server so we don't require them
+# in RPM. Install as necessary
+# Requires: jetty-http-spi = %{version}-%{release}
+# Requires: jetty-jaspi = %{version}-%{release}
+# Requires: jetty-nested = %{version}-%{release}
+# Requires: jetty-nosql = %{version}-%{release}
+# %if 0%{?rhel} <= 0
+# Requires: jetty-osgi = %{version}-%{release}
+# %endif
Requires(post): systemd-units, systemd-sysv
Requires(preun): systemd-units
@@ -428,7 +435,7 @@ Requires: tomcat-servlet-3.0-api
%package server
Summary: server module for Jetty
Requires: java >= 1:1.7.0
-Requires: jpackage-utils
+Requires: jpackage-utils
Requires: jetty-project = %{version}-%{release}
Requires: jetty-continuation = %{version}-%{release}
Requires: jetty-http = %{version}-%{release}
@@ -644,6 +651,9 @@ install -pm 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
echo '# Placeholder configuration file. No default is provided.' > \
%{buildroot}%{confdir}/jetty.conf
+# make sure jetty knows where to look for jars
+sed -i "1{s:^:lib=%{homedir}/lib\n:}" %{buildroot}%{homedir}/start.ini
+
install -dm 755 %{buildroot}%{_mavenpomdir}
for module in jetty-ajp jetty-annotations jetty-client jetty-continuation \
@@ -706,10 +716,10 @@ build-jar-repository %{buildroot}%{homedir}/lib/annotations \
build-jar-repository %{buildroot}%{homedir}/lib/jndi javamail/mail
-build-jar-repository %{buildroot}%{homedir}/lib/jsp \
+build-jar-repository %{buildroot}%{homedir}/lib/jsp tomcat-el-2.2-api \
taglibs-core taglibs-standard glassfish-jsp \
- tomcat/jasper tomcat/tomcat-api \
- tomcat/tomcat-juli glassfish-jsp
+ glassfish-jsp-api tomcat/jasper tomcat/jasper-el tomcat/tomcat-api \
+ tomcat/tomcat-juli tomcat/tomcat-jsp-2.2-api
ln -sf $(build-classpath geronimo-jta) \
@@ -990,6 +1000,11 @@ fi
%doc %{_javadocdir}/%{name}
%changelog
+* Mon Apr 30 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 8.1.2-5
+- Don't require subpackages not needed by server itself
+- Make jetty look for jars in correct directory
+- Add proper dependent jars
+
* Fri Apr 27 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 8.1.2-4
- Keep license files only in jetty-project and jetty-javadoc packages
12 years