[logback] Fix pom filenames (#655813)
Stanislav Ochotnicky
sochotni at fedoraproject.org
Wed Dec 8 11:06:03 UTC 2010
commit da1b39b58464adc2b6fc449b549156d300437061
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Wed Dec 8 12:05:29 2010 +0100
Fix pom filenames (#655813)
- Make jars and javadoc versionless
- Remove gcj bits
- Other packaging cleanups/fixes
logback-0.9.18-clean-poms.patch | 112 +++++++++++++++++++++--------------
logback-depmap.xml | 14 ++++
logback.spec | 125 +++++++++++++++------------------------
3 files changed, 129 insertions(+), 122 deletions(-)
---
diff --git a/logback-0.9.18-clean-poms.patch b/logback-0.9.18-clean-poms.patch
index 3cf39b1..15956d8 100644
--- a/logback-0.9.18-clean-poms.patch
+++ b/logback-0.9.18-clean-poms.patch
@@ -1,7 +1,38 @@
-diff -ur logback-0.9.18.orig/logback-access/pom.xml logback-0.9.18/logback-access/pom.xml
---- logback-0.9.18.orig/logback-access/pom.xml 2009-12-03 19:28:59.000000000 +0000
-+++ logback-0.9.18/logback-access/pom.xml 2010-01-11 14:54:19.408869342 +0000
-@@ -64,7 +64,7 @@
+From e72da7b52be43461e94ff05f21e069948022803a Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Tue, 7 Dec 2010 15:48:59 +0100
+Subject: [PATCH] Clean pom files
+
+---
+ logback-access/pom.xml | 14 ++-----
+ logback-classic/pom.xml | 89 +----------------------------------------------
+ logback-core/pom.xml | 2 +-
+ pom.xml | 11 +-----
+ 4 files changed, 7 insertions(+), 109 deletions(-)
+
+diff --git a/logback-access/pom.xml b/logback-access/pom.xml
+index af7e1e7..a697d11 100644
+--- a/logback-access/pom.xml
++++ b/logback-access/pom.xml
+@@ -42,15 +42,9 @@
+ </dependency>
+
+ <dependency>
+- <groupId>ch.qos.logback</groupId>
+- <artifactId>logback-core</artifactId>
+- <type>test-jar</type>
+- <scope>test</scope>
+- </dependency>
+-
+- <dependency>
+- <groupId>tomcat</groupId>
++ <groupId>org.apache.tomcat</groupId>
+ <artifactId>catalina</artifactId>
++ <version>6.0.26</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+@@ -64,7 +58,7 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
@@ -10,34 +41,28 @@ diff -ur logback-0.9.18.orig/logback-access/pom.xml logback-0.9.18/logback-acces
<scope>compile</scope>
<optional>true</optional>
</dependency>
-@@ -77,6 +77,13 @@
- </dependency>
-
- <dependency>
-+ <groupId>javax.servlet</groupId>
-+ <artifactId>servlet-api</artifactId>
-+ <scope>compile</scope>
-+ <optional>true</optional>
-+ </dependency>
-+
-+ <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>test</scope>
-@@ -202,4 +209,4 @@
+@@ -202,4 +196,4 @@
</profiles>
-</project>
\ No newline at end of file
+</project>
-diff -ur logback-0.9.18.orig/logback-classic/pom.xml logback-0.9.18/logback-classic/pom.xml
---- logback-0.9.18.orig/logback-classic/pom.xml 2009-12-03 19:28:59.000000000 +0000
-+++ logback-0.9.18/logback-classic/pom.xml 2010-01-11 14:55:44.561970153 +0000
-@@ -103,13 +103,6 @@
+diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml
+index 5f0049c..4e94453 100644
+--- a/logback-classic/pom.xml
++++ b/logback-classic/pom.xml
+@@ -96,20 +96,6 @@
</dependency>
-
+
<dependency>
+- <groupId>ch.qos.logback</groupId>
+- <artifactId>logback-core</artifactId>
+- <type>test-jar</type>
+- <scope>test</scope>
+- </dependency>
+-
+- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>integration</artifactId>
- <version>${slf4j.version}</version>
@@ -48,7 +73,7 @@ diff -ur logback-0.9.18.orig/logback-classic/pom.xml logback-0.9.18/logback-clas
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
<scope>compile</scope>
-@@ -122,40 +115,6 @@
+@@ -122,40 +108,6 @@
<scope>compile</scope>
<optional>true</optional>
</dependency>
@@ -89,8 +114,11 @@ diff -ur logback-0.9.18.orig/logback-classic/pom.xml logback-0.9.18/logback-clas
</dependencies>
<build>
-@@ -194,44 +153,6 @@
-
+@@ -191,47 +143,8 @@
+ </execution>
+ </executions>
+ </plugin>
+-
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
@@ -134,27 +162,17 @@ diff -ur logback-0.9.18.orig/logback-classic/pom.xml logback-0.9.18/logback-clas
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
-@@ -326,4 +247,4 @@
+@@ -326,4 +239,4 @@ org.slf4j.test_osgi
</profiles>
-</project>
\ No newline at end of file
+</project>
-diff -ur logback-0.9.18.orig/logback-core/pom.xml logback-0.9.18/logback-core/pom.xml
---- logback-0.9.18.orig/logback-core/pom.xml 2009-12-03 19:28:59.000000000 +0000
-+++ logback-0.9.18/logback-core/pom.xml 2010-01-11 14:55:58.054842609 +0000
-@@ -59,8 +59,8 @@
- </dependency>
-
- <dependency>
-- <groupId>org.easymock</groupId>
-- <artifactId>easymock</artifactId>
-+ <groupId>easymock2</groupId>
-+ <artifactId>easymock2</artifactId>
- <version>2.4</version>
- <scope>test</scope>
- </dependency>
+diff --git a/logback-core/pom.xml b/logback-core/pom.xml
+index c67bd99..79fd219 100644
+--- a/logback-core/pom.xml
++++ b/logback-core/pom.xml
@@ -148,4 +148,4 @@
</plugins>
</build>
@@ -162,9 +180,10 @@ diff -ur logback-0.9.18.orig/logback-core/pom.xml logback-0.9.18/logback-core/po
-</project>
\ No newline at end of file
+</project>
-diff -ur logback-0.9.18.orig/pom.xml logback-0.9.18/pom.xml
---- logback-0.9.18.orig/pom.xml 2010-01-11 14:52:42.285869208 +0000
-+++ logback-0.9.18/pom.xml 2010-01-11 14:56:12.036825749 +0000
+diff --git a/pom.xml b/pom.xml
+index 94f9f7a..4b02a0e 100644
+--- a/pom.xml
++++ b/pom.xml
@@ -21,8 +21,6 @@
<module>logback-core</module>
<module>logback-classic</module>
@@ -195,3 +214,6 @@ diff -ur logback-0.9.18.orig/pom.xml logback-0.9.18/pom.xml
-</project>
\ No newline at end of file
+</project>
+--
+1.7.3.2
+
diff --git a/logback-depmap.xml b/logback-depmap.xml
new file mode 100644
index 0000000..8334415
--- /dev/null
+++ b/logback-depmap.xml
@@ -0,0 +1,14 @@
+<dependencies>
+ <dependency>
+ <maven>
+ <groupId>commons-modeler</groupId>
+ <artifactId>commons-modeler</artifactId>
+ <version>2.0.1</version>
+ </maven>
+ <jpp>
+ <groupId>JPP</groupId>
+ <artifactId>commons-modeler</artifactId>
+ <version>2.0.1</version>
+ </jpp>
+ </dependency>
+</dependencies>
diff --git a/logback.spec b/logback.spec
index d2e69e3..992d4b8 100644
--- a/logback.spec
+++ b/logback.spec
@@ -1,57 +1,50 @@
-%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
Name: logback
Version: 0.9.18
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: A Java logging library
Group: Development/Tools
License: LGPLv2 or EPL
URL: http://logback.qos.ch/
Source0: http://logback.qos.ch/dist/%{name}-%{version}.tar.gz
+Source1: %{name}-depmap.xml
+
# Add dummy implementations of two new methods from Jetty 6
Patch0: %{name}-LifecycleListener.patch
# Modify the POMs to remove unavailable dependencies, and to avoid
# building the "site" and "examples" directories
-Patch1: %{name}-%{version}-clean-poms.patch
-
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Patch1: %{name}-%{version}-clean-pom.patch
-BuildRequires: dos2unix
BuildRequires: jms
-BuildRequires: janino
+BuildRequires: janino
BuildRequires: java-devel >= 1.6.0
BuildRequires: javamail >= 1.4
BuildRequires: jetty >= 6.1.20-7
BuildRequires: jpackage-utils >= 0:1.5
BuildRequires: slf4j
-BuildRequires: tomcat5-server-lib
-BuildRequires: tomcat5-servlet-2.4-api
-BuildRequires: tomcat5
+BuildRequires: servlet25
+BuildRequires: tomcat6
BuildRequires: easymock2
BuildRequires: hsqldb >= 1:1.8.0.10-5
# Maven build requirements
BuildRequires: maven2
-BuildRequires: maven2-plugin-assembly
+BuildRequires: maven-assembly-plugin
BuildRequires: maven-plugin-bundle
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-idea
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-site
-BuildRequires: maven2-plugin-source
-BuildRequires: maven-surefire-maven-plugin
-
-%if %{with_gcj}
-BuildRequires: java-gcj-compat-devel >= 1.0.31
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
-%else
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-idea-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-site-plugin
+BuildRequires: maven-source-plugin
+BuildRequires: maven-surefire-plugin
+BuildRequires: ant-junit
+BuildRequires: apache-commons-modeler
+
BuildArch: noarch
-%endif
# Dependencies from the pom files
Requires: dom4j
@@ -62,9 +55,8 @@ Requires: janino
Requires: javamail
Requires: jetty
Requires: slf4j
-Requires: tomcat5
-Requires: tomcat5-server-lib
-Requires: tomcat5-servlet-2.4-api
+Requires: tomcat6
+Requires: servlet25
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
@@ -88,16 +80,15 @@ could easily build your own module on top of logback-core.
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation
-BuildArch: noarch
+Requires: jpackage-utils
%description javadoc
-Documentation for the Logback library
+API documentation for the Logback library
%package examples
Summary: Sample code for %{name}
Group: Documentation
-BuildArch: noarch
%description examples
Sample code for the Logback library
@@ -107,10 +98,10 @@ Sample code for the Logback library
%patch0 -p1
%patch1 -p1
-find . -name "*.jar" | xargs rm -f
+find . -name "*.jar" -delete
# Clean up the documentation
-dos2unix LICENSE.txt README.txt docs/*.* docs/*/*.* docs/*/*/*.* docs/*/*/*/*.*
+sed -i 's/\r//' LICENSE.txt README.txt docs/*.* docs/*/*.* docs/*/*/*.* docs/*/*/*/*.*
sed -i 's#"apidocs#"%{_javadocdir}/%{name}-%{version}#g' docs/*.html
rm -rf docs/apidocs docs/project-reports docs/testapidocs docs/project-reports.html
rm -f docs/manual/.htaccess docs/css/site.css # Zero-length file
@@ -138,31 +129,24 @@ popd
mvn-jpp \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-Dmaven.test.skip=true \
- install
-
-mvn-jpp \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven.test.skip=true \
- javadoc:javadoc
+ -Dmaven2.jpp.depmap.file=%{SOURCE1} \
+ install javadoc:aggregate
%install
-rm -rf $RPM_BUILD_ROOT
-
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -d -m 755 p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-(cd $RPM_BUILD_ROOT%{_javadocdir} && ln -sf %{name}-%{version} %{name})
-cp -r target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+install -d -m 755 p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -r target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}-parent.pom
+install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}-parent.pom
%add_to_maven_depmap ch.qos.logback %{name}-parent %{version} JPP %{name}-parent
for sub in logback-access logback-classic logback-core; do
base=`echo $sub | sed 's/%{name}-//g'`
install -m 644 $sub/target/$sub-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/$base-%{version}.jar
- install -m 644 $sub/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-$sub.pom
+ $RPM_BUILD_ROOT%{_javadir}/%{name}/$base.jar
+ install -m 644 $sub/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-$base.pom
%add_to_maven_depmap ch.qos.logback $sub %{version} JPP/%{name} $base
done
@@ -170,37 +154,20 @@ done
%add_to_maven_depmap org.apache.geronimo.specs geronimo-jms_1.1_spec 1.1 JPP/geronimo spec-jms-1.1
# End part 2 of the hack
-(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/examples
cp -r logback-examples/pom.xml logback-examples/src $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/examples
-%if %{with_gcj}
-%{_bindir}/aot-compile-rpm
-%endif
-
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
%post
%update_maven_depmap
-%if %{with_gcj}
- if [ -x %{_bindir}/rebuild-gcj-db ]
- then
- %{_bindir}/rebuild-gcj-db
- fi
-%endif
%postun
%update_maven_depmap
-%if %{with_gcj}
- if [ -x %{_bindir}/rebuild-gcj-db ]
- then
- %{_bindir}/rebuild-gcj-db
- fi
-%endif
+
+%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
@@ -208,21 +175,25 @@ rm -rf $RPM_BUILD_ROOT
%{_javadir}/%{name}
%config(noreplace) %{_mavendepmapfragdir}/%{name}
%doc LICENSE.txt README.txt docs/*
-%{_datadir}/maven2/poms/*.pom
-%if %{with_gcj}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
+%{_mavenpomdir}/*.pom
%files javadoc
%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
+%doc LICENSE.txt
%{_javadocdir}/%{name}
%files examples
%defattr(-,root,root,-)
+%doc LICENSE.txt
%{_datadir}/%{name}-%{version}
%changelog
+* Tue Dec 7 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0.9.18-5
+- Make jars and javadoc versionless
+- Fix pom filenames (#655813)
+- Remove gcj bits
+- Other packaging cleanups/fixes
+
* Wed Jan 13 2010 Mary Ellen Foster <mefoster at gmail.com> - 0.9.18-4
- Change (Build)Requirement from geronimo-specs to jms
More information about the scm-commits
mailing list