[java-sig-commits] [logback] Import new SRPM
mef
mef at fedoraproject.org
Fri May 4 09:21:33 UTC 2012
commit 2f6c460b7553f9dc367aa70ef6f2bf45d430b90b
Author: Mary Ellen Foster <mefoster at gmail.com>
Date: Fri May 4 10:21:18 2012 +0100
Import new SRPM
.gitignore | 1 +
dead.package | 1 -
logback-debian-build.xml | 105 +++++++++++++++++++++++++++
logback-janino-2_6.patch | 22 ++++++
logback.spec | 177 ++++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
6 files changed, 306 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1517e53..1a11cb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
logback-0.9.18.tar.gz
+/logback-1.0.1.tar.gz
diff --git a/logback-debian-build.xml b/logback-debian-build.xml
new file mode 100644
index 0000000..6397985
--- /dev/null
+++ b/logback-debian-build.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<project name="logback">
+
+<taskdef name="groovyc"
+ classname="org.codehaus.groovy.ant.Groovyc"/>
+
+<target name="init">
+ <property name="build.dir" value="build"/>
+ <property name="dist.dir" value="dist"/>
+
+ <property name="core.src.dir" value="logback-core/src/main"/>
+ <property name="core.build.dir" value="${build.dir}/core"/>
+ <property name="core.jar" value="${dist.dir}/${deb.package}-${deb.version}-core.jar"/>
+
+ <property name="classic.src.dir" value="logback-classic/src/main"/>
+ <property name="classic.build.dir" value="${build.dir}/classic"/>
+ <property name="classic.jar" value="${dist.dir}/${deb.package}-${deb.version}-classic.jar"/>
+
+ <property name="access.src.dir" value="logback-access/src/main"/>
+ <property name="access.build.dir" value="${build.dir}/access"/>
+ <property name="access.jar" value="${dist.dir}/${deb.package}-${deb.version}-access.jar"/>
+</target>
+
+<target name="compile.core" depends="init">
+ <mkdir dir="${core.build.dir}"/>
+ <javac srcdir="${core.src.dir}"
+ destdir="${core.build.dir}"
+ classpath="${fam.build.dir}"
+ source="1.5" target="1.5"
+ debug="on">
+ </javac>
+</target>
+
+<target name="compile.classic" depends="compile.core">
+ <mkdir dir="${classic.build.dir}"/>
+ <groovyc srcdir="${classic.src.dir}" destdir="${classic.build.dir}">
+ <javac classpath="${core.build.dir}"
+ source="1.5" target="1.5"
+ debug="on">
+ </javac>
+ </groovyc>
+</target>
+
+<target name="compile.access" depends="compile.core">
+ <mkdir dir="${access.build.dir}"/>
+ <javac srcdir="${access.src.dir}"
+ destdir="${access.build.dir}"
+ classpath="${core.build.dir}"
+ source="1.5" target="1.5"
+ debug="on">
+ </javac>
+</target>
+
+<target name="jar.core" depends="compile.core">
+ <jar jarfile="${core.jar}"
+ basedir="${core.build.dir}" />
+</target>
+
+<target name="jar.classic" depends="compile.classic">
+ <jar jarfile="${classic.jar}"
+ basedir="${classic.build.dir}" />
+</target>
+
+<target name="jar.access" depends="compile.access">
+ <jar jarfile="${access.jar}"
+ basedir="${access.build.dir}" />
+</target>
+
+<target name="jar.all" depends="jar.core, jar.classic"> <!-- , jar.access -->
+</target>
+
+<target name="javadoc">
+
+ <javadoc
+ packagenames="*"
+ destdir="${dist.dir}/api"
+ access="protected"
+ old="false"
+ verbose="false"
+ version="true"
+ use="true"
+ author="true"
+ >
+ <fileset dir=".">
+ <include name="${core.src.dir}/**/*.java"/>
+ <include name="${classic.src.dir}/**/*.java"/>
+ <!--<include name="${access.src.dir}/**/*.java"/>-->
+ </fileset>
+ </javadoc>
+
+</target>
+
+
+
+<target name="clean" depends="init">
+ <delete dir="${build.dir}"/>
+ <delete dir="${dist.dir}"/>
+
+ <mkdir dir="${build.dir}"/>
+ <mkdir dir="${dist.dir}"/>
+</target>
+
+
+
+</project>
diff --git a/logback-janino-2_6.patch b/logback-janino-2_6.patch
new file mode 100644
index 0000000..5d532fd
--- /dev/null
+++ b/logback-janino-2_6.patch
@@ -0,0 +1,22 @@
+--- logback-1.0.1/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilder.java.orig 2012-03-21 10:49:50.680828668 +0000
++++ logback-1.0.1/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilder.java 2012-03-21 10:50:07.103764436 +0000
+@@ -20,9 +20,7 @@
+
+ import ch.qos.logback.core.spi.PropertyContainer;
+ import org.codehaus.janino.ClassBodyEvaluator;
+-import org.codehaus.janino.CompileException;
+-import org.codehaus.janino.Parser.ParseException;
+-import org.codehaus.janino.Scanner.ScanException;
++import org.codehaus.commons.compiler.CompileException;
+
+ import ch.qos.logback.core.spi.ContextAwareBase;
+
+@@ -41,7 +39,7 @@
+ Map<String, String> map = new HashMap<String, String>();
+
+ public Condition build(String script) throws IllegalAccessException,
+- CompileException, ParseException, ScanException, InstantiationException,
++ CompileException, InstantiationException,
+ SecurityException, NoSuchMethodException, IllegalArgumentException,
+ InvocationTargetException {
+
diff --git a/logback.spec b/logback.spec
new file mode 100644
index 0000000..3718064
--- /dev/null
+++ b/logback.spec
@@ -0,0 +1,177 @@
+Name: logback
+Version: 1.0.1
+Release: 1%{?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
+# http://anonscm.debian.org/viewvc/pkg-java/trunk/logback/debian/build.xml?revision=13384&view=co
+Source1: %{name}-debian-build.xml
+
+# Use Janino 2.6 API
+Patch0: %{name}-janino-2_6.patch
+
+# Java dependencies
+BuildRequires: jpackage-utils
+BuildRequires: java-devel >= 1:1.6.0
+
+# Required libraries
+BuildRequires: jms
+BuildRequires: janino
+# Using the version of jetty in the pom.xml file
+BuildRequires: jetty >= 7.5.1
+BuildRequires: slf4j
+BuildRequires: servlet25
+BuildRequires: tomcat-lib
+BuildRequires: javamail
+BuildRequires: apache-commons-cli
+BuildRequires: antlr-tool
+
+# Build tools -- build with ant for now because of circular dependencies
+BuildRequires: ant
+BuildRequires: groovy
+
+BuildArch: noarch
+
+# Java runtime dependencies
+Requires: java >= 1:1.6.0
+Requires: jpackage-utils
+
+# Java library dependencies
+Requires: jms
+Requires: janino
+Requires: jetty >= 7.5.1
+Requires: slf4j
+Requires: tomcat-lib
+Requires: servlet25
+
+%description
+Logback is intended as a successor to the popular log4j project. At present
+time, logback is divided into three modules, logback-core, logback-classic
+and logback-access.
+
+The logback-core module lays the groundwork for the other two modules. The
+logback-classic module can be assimilated to a significantly improved
+version of log4j. Moreover, logback-classic natively implements the SLF4J
+API so that you can readily switch back and forth between logback and other
+logging frameworks such as log4j or java.util.logging (JUL).
+
+The logback-access module integrates with Servlet containers, such as
+Tomcat and Jetty, to provide HTTP-access log functionality. Note that you
+could easily build your own module on top of logback-core.
+
+%package javadoc
+Summary: Javadoc for %{name}
+Group: Documentation
+Requires: jpackage-utils
+
+%description javadoc
+API documentation for the Logback library
+
+%package examples
+Summary: Sample code for %{name}
+Group: Documentation
+Requires: %{name} = %{version}
+
+%description examples
+Sample code for the Logback library
+
+%prep
+%setup -q
+%{__cp} %{SOURCE1} ./build.xml
+%{__sed} -i 's/basedir=".."//' build.xml
+%{__sed} -i 's/\${deb.package}/%{name}/' build.xml
+%{__sed} -i 's/-\${deb.version}//' build.xml
+%patch0 -p1
+
+find . -name "*.jar" -delete
+
+# Clean up the documentation
+sed -i 's/\r//' LICENSE.txt README.txt 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
+
+%build
+export CLASSPATH=`build-classpath antlr groovy janino javamail commons-compiler commons-cli tomcat6-servlet-api objectweb-asm jms slf4j jetty tomcat/catalina`
+ant jar.all jar.access javadoc
+
+%install
+install -d -m 755 p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -r dist/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+
+install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-%{name}-parent.pom
+%add_maven_depmap JPP.%{name}-%{name}-parent.pom
+
+for sub in logback-access logback-classic logback-core; do
+ install -m 644 dist/$sub.jar \
+ $RPM_BUILD_ROOT%{_javadir}/%{name}/$sub.jar
+ install -m 644 $sub/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-$sub.pom
+ %add_maven_depmap JPP.%{name}-$sub.pom %{name}/$sub.jar
+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
+
+%files
+%doc LICENSE.txt README.txt docs/*
+%{_javadir}/%{name}
+%{_mavendepmapfragdir}/%{name}
+%{_mavenpomdir}/*.pom
+
+%files javadoc
+%doc LICENSE.txt
+%{_javadocdir}/%{name}
+
+%files examples
+%doc LICENSE.txt
+%{_datadir}/%{name}-%{version}
+
+%changelog
+* Tue Mar 20 2012 Mary Ellen Foster <mefoster at gmail.com> - 1.0.1-1
+- Update to 1.0.1
+- Prepare for re-review
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.18-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* 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
+
+* Wed Jan 13 2010 Mary Ellen Foster <mefoster at gmail.com> - 0.9.18-3
+- Add some missing (Build)Requirements
+
+* Tue Jan 12 2010 Mary Ellen Foster <mefoster at gmail.com> - 0.9.18-2
+- Add maven2 BuildRequirements
+- Remove requirement for specific slf4j version
+
+* Mon Jan 11 2010 Mary Ellen Foster <mefoster at gmail.com> - 0.9.18-1
+- Update to new upstream version -- many bugfixes, see
+ http://qos.ch/pipermail/announce/2009/000068.html
+- Include new license tag
+- Add all referenced dependencies to the Requires list
+- Specify which bits of tomcat are actually used, instead of requiring
+ all of it
+- Don't remove hsqldb from poms any more; Maven metadata has been added
+
+* Wed Jan 6 2010 Mary Ellen Foster <mefoster at gmail.com> - 0.9.17-3
+- Manually add the Maven metadata for geronimo-specs-jms
+
+* Wed Dec 2 2009 Mary Ellen Foster <mefoster at gmail.com> - 0.9.17-2
+- Use Maven build instead (with all that entails), and include POMs
+- Add -examples subpackage
+- Depend on javamail 1.4
+
+* Wed Nov 18 2009 Mary Ellen Foster <mefoster at gmail.com> - 0.9.17-1
+- Initial package (using build.xml from Debian)
diff --git a/sources b/sources
new file mode 100644
index 0000000..036e024
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+43540f6b3e8f30c7aa1f59fa7db8b6c9 logback-1.0.1.tar.gz
More information about the java-sig-commits
mailing list