commit b2005f7dd5ef6e5e4dc3122306661a9dacd6e679 Author: Mikolaj Izdebski mizdebsk@redhat.com Date: Thu Jul 12 00:45:38 2012 +0200
Enable jboss-logging
0001-Remove-optional-deps.patch | 15 +++++----- 0002-Replace-jboss-logger-with-jdk-logger.patch | 33 ----------------------- netty.spec | 21 +++++--------- 3 files changed, 16 insertions(+), 53 deletions(-) --- diff --git a/0001-Remove-optional-deps.patch b/0001-Remove-optional-deps.patch index 86cd9f2..1536b10 100644 --- a/0001-Remove-optional-deps.patch +++ b/0001-Remove-optional-deps.patch @@ -11,17 +11,18 @@ diff --git a/pom.xml b/pom.xml index a1597fe..77fb611 100644 --- a/pom.xml +++ b/pom.xml -@@ -116,13 +116,6 @@ +@@ -116,13 +116,13 @@ <optional>true</optional> </dependency> <dependency> -- <groupId>org.jboss.logging</groupId> + <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> -- <version>2.1.2.GA</version> -- <scope>compile</scope> -- <optional>true</optional> -- </dependency> -- <dependency> ++ <artifactId>jboss-logging</artifactId> + <version>2.1.2.GA</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.16</version> diff --git a/netty.spec b/netty.spec index 77a6b6e..b3b7e2f 100644 --- a/netty.spec +++ b/netty.spec @@ -8,13 +8,12 @@ License: ASL 2.0 URL: http://www.jboss.org/netty Source0: http://sourceforge.net/projects/jboss/files/%%7Bname%7D-%%7Bversion%7D.Final...
-Patch0: 0001-Remove-optional-deps.patch -Patch1: 0002-Replace-jboss-logger-with-jdk-logger.patch -Patch2: 0003-Fix-javadoc-plugin-configuration.patch -Patch3: 0004-Remove-antun-execution-for-removing-examples.patch -Patch4: 0005-Remove-eclipse-plugin.patch +Patch1: 0001-Remove-optional-deps.patch +Patch3: 0003-Fix-javadoc-plugin-configuration.patch +Patch4: 0004-Remove-antun-execution-for-removing-examples.patch +Patch5: 0005-Remove-eclipse-plugin.patch
-BuildArch: noarch +BuildArch: noarch
# This pulls in all of the required java and maven stuff BuildRequires: maven @@ -34,6 +33,7 @@ BuildRequires: subversion BuildRequires: protobuf-java BuildRequires: felix-osgi-compendium BuildRequires: jboss-parent +BuildRequires: jboss-logging
Requires: java Requires: protobuf-java @@ -70,20 +70,15 @@ rm -rf jar/ # example doesn't build with our protobuf rm -rf src/main/java/org/jboss/netty/example/localtime
- -%patch0 -p1 %patch1 -p1 - -# we don't have jboss logging facilites so we replace it with jdk logger -rm src/main/java/org/jboss/netty/logging/JBossLogger*.java -%patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1
%build # skipping tests because we don't have all dependencies in Fedora mvn-rpmbuild -Dmaven.test.skip=true \ - install javadoc:javadoc + install javadoc:aggregate
%install
java-sig-commits@lists.fedoraproject.org