From 88e5b09b8bd8f69c0fe8b0b4c98d62373af9ad187cd52e47e5c4723da2ebb717 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 14 May 2012 14:21:48 +0000 Subject: [PATCH] Accepting request 115823 from Java:packages add slf4j to Factory, needed for updated mysql-connector-java OBS-URL: https://build.opensuse.org/request/show/115823 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/slf4j?expand=0&rev=1 --- .gitattributes | 23 +++ .gitignore | 1 + build-remove-slf4j_api-binder.patch | 13 ++ build.xml.tar.bz2 | 3 + slf4j-1.6.1.tar.gz | 3 + slf4j-pom_xml.patch | 39 ++++++ slf4j.changes | 22 +++ slf4j.spec | 209 ++++++++++++++++++++++++++++ 8 files changed, 313 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 build-remove-slf4j_api-binder.patch create mode 100644 build.xml.tar.bz2 create mode 100644 slf4j-1.6.1.tar.gz create mode 100644 slf4j-pom_xml.patch create mode 100644 slf4j.changes create mode 100644 slf4j.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/build-remove-slf4j_api-binder.patch b/build-remove-slf4j_api-binder.patch new file mode 100644 index 0000000..587f951 --- /dev/null +++ b/build-remove-slf4j_api-binder.patch @@ -0,0 +1,13 @@ +Les fichiers binaires actual//build.xml.tar.bz2 et patched//build.xml.tar.bz2 sont différents. +diff -uNr actual//slf4j-api/maven-build.xml patched//slf4j-api/maven-build.xml +--- actual//slf4j-api/maven-build.xml 2011-04-11 14:32:50.000000000 +0200 ++++ patched//slf4j-api/maven-build.xml 2011-04-12 17:30:10.248498005 +0200 +@@ -79,6 +79,8 @@ + + + ++ Removing slf4j-api's dummy StaticLoggerBinder and StaticMarkerBinder ++ + + + diff --git a/build.xml.tar.bz2 b/build.xml.tar.bz2 new file mode 100644 index 0000000..e3e6d76 --- /dev/null +++ b/build.xml.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:07b1ebf12cf4be908708fae54f7003cf8304aed7eefa81843db315f88eb3383f +size 6855 diff --git a/slf4j-1.6.1.tar.gz b/slf4j-1.6.1.tar.gz new file mode 100644 index 0000000..4200906 --- /dev/null +++ b/slf4j-1.6.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62cd3614c84315304969f5d42a029d3dcc80017e1588f3b4357f01b1f50c4955 +size 1708903 diff --git a/slf4j-pom_xml.patch b/slf4j-pom_xml.patch new file mode 100644 index 0000000..e363d61 --- /dev/null +++ b/slf4j-pom_xml.patch @@ -0,0 +1,39 @@ +--- pom.xml.sav 2010-07-05 23:24:16.000000000 +0300 ++++ pom.xml 2011-01-25 22:34:34.761335409 +0200 +@@ -44,7 +44,7 @@ + jcl-over-slf4j + log4j-over-slf4j + jul-to-slf4j +- integration ++ + slf4j-site + slf4j-migrator + +@@ -121,9 +121,9 @@ + + + +- +- +- org.apache.maven.plugins ++ + + + org.apache.maven.plugins +@@ -349,4 +350,4 @@ + + + +- +\ No newline at end of file ++ diff --git a/slf4j.changes b/slf4j.changes new file mode 100644 index 0000000..0ac8281 --- /dev/null +++ b/slf4j.changes @@ -0,0 +1,22 @@ +------------------------------------------------------------------- +Fri Apr 27 09:59:40 UTC 2012 - mvyskocil@suse.cz + +- format spec file to be suitable for Factory + +------------------------------------------------------------------- +Mon Dec 12 19:31:15 UTC 2011 - dmacvicar@suse.de + +- Fix absolute path in maven-build.xml that prevented + package task in newer versions of openSUSE +- Fix javadoc group + +------------------------------------------------------------------- +Wed Jul 27 09:08:44 UTC 2011 - dmacvicar@suse.de + +- Completely remove all maven build parts. Build with ant + +------------------------------------------------------------------- +Mon Jul 4 21:18:38 UTC 2011 - dmacvicar@suse.de + +- add BuildRoot tag + diff --git a/slf4j.spec b/slf4j.spec new file mode 100644 index 0000000..86df07b --- /dev/null +++ b/slf4j.spec @@ -0,0 +1,209 @@ +# +# spec file for package slf4j +# +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2000-2009, JPackage Project +# All rights reserved. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%global _mavenpomdir %{_datadir}/maven2/poms + +Name: slf4j +Version: 1.6.1 +Release: 0 +Summary: Simple Logging Facade for Java +License: MIT +Group: Development/Libraries/Java +Url: http://www.slf4j.org/ +Source0: http://www.slf4j.org/dist/%{name}-%{version}.tar.gz +Source1: build.xml.tar.bz2 +Patch0: %{name}-pom_xml.patch +Patch1: build-remove-slf4j_api-binder.patch + +Requires(post): jpackage-utils >= 1.7.5 +Requires(postun): jpackage-utils >= 1.7.5 +BuildRequires: ant >= 1.6.5 +BuildRequires: ant-junit >= 1.6.5 +BuildRequires: apache-commons-logging +BuildRequires: cal10n +BuildRequires: jakarta-commons-lang +BuildRequires: java-devel >= 1.5.0 +BuildRequires: javassist >= 3.4 +BuildRequires: jpackage-utils >= 1.7.5 +BuildRequires: junit >= 3.8.2 +BuildRequires: log4j +Requires: cal10n +Requires: java +Requires: jpackage-utils +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +The Simple Logging Facade for Java or (SLF4J) is intended to serve +as a simple facade for various logging APIs allowing to the end-user +to plug in the desired implementation at deployment time. SLF4J also +allows for a gradual migration path away from +Jakarta Commons Logging (JCL). + +Logging API implementations can either choose to implement the +SLF4J interfaces directly, e.g. NLOG4J or SimpleLogger. Alternatively, +it is possible (and rather easy) to write SLF4J adapters for the given +API implementation, e.g. Log4jLoggerAdapter or JDK14LoggerAdapter.. + +%package javadoc +Summary: Javadoc for %{name} +Group: Documentation/HTML +Requires: jpackage-utils + +%description javadoc +API documentation for %{name}. + +%package manual +Summary: Documents for %{name} +Group: Documentation/Other + +%description manual +Manual for %{name}. + +%prep +%setup -q +tar xf %{SOURCE1} +%patch0 -p0 -b .sav +%patch1 -p1 +find . -name "*.jar" | xargs rm + +sed -i -e "s|ant<|org.apache.ant<|g" integration/pom.xml + +%{_bindir}/find -name "*.css" -o -name "*.js" -o -name "*.txt" | \ + %{_bindir}/xargs -t %{__perl} -pi -e 's/\r$//g' + +%build +export CLASSPATH=$(build-classpath log4j \ + commons-logging \ + jakarta-commons-lang \ + javassist-3.14.0 \ + cal10n) +export CLASSPATH=$CLASSPATH:$(pwd)/slf4j-api/target/slf4j-api-%{version}.jar +ant -Dmaven2.jpp.mode=true \ + -Dmaven.test.skip=true \ + -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ + package javadoc \ + +%install +# jars +install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}/%{name} + +install -m 644 jcl-over-slf4j/target/jcl-over-slf4j-%{version}.jar \ + $RPM_BUILD_ROOT%{_javadir}/%{name}/jcl-over-slf4j.jar +install -m 644 jul-to-slf4j/target/jul-to-slf4j-%{version}.jar \ + $RPM_BUILD_ROOT%{_javadir}/%{name}/jul-to-slf4j.jar +install -m 644 log4j-over-slf4j/target/log4j-over-slf4j-%{version}.jar \ + $RPM_BUILD_ROOT%{_javadir}/%{name}/log4j-over-slf4j.jar +install -m 644 slf4j-api/target/%{name}-api-%{version}.jar \ + $RPM_BUILD_ROOT%{_javadir}/%{name}/api.jar +install -m 644 slf4j-ext/target/%{name}-ext-%{version}.jar \ + $RPM_BUILD_ROOT%{_javadir}/%{name}/ext.jar +install -m 644 slf4j-jcl/target/%{name}-jcl-%{version}.jar \ + $RPM_BUILD_ROOT%{_javadir}/%{name}/jcl.jar +install -m 644 slf4j-jdk14/target/%{name}-jdk14-%{version}.jar \ + $RPM_BUILD_ROOT%{_javadir}/%{name}/jdk14.jar +install -m 644 slf4j-log4j12/target/%{name}-log4j12-%{version}.jar \ + $RPM_BUILD_ROOT%{_javadir}/%{name}/log4j12.jar +install -m 644 slf4j-migrator/target/%{name}-migrator-%{version}.jar \ + $RPM_BUILD_ROOT%{_javadir}/%{name}/migrator.jar +install -m 644 slf4j-nop/target/%{name}-nop-%{version}.jar \ + $RPM_BUILD_ROOT%{_javadir}/%{name}/nop.jar +install -m 644 slf4j-simple/target/%{name}-simple-%{version}.jar \ + $RPM_BUILD_ROOT%{_javadir}/%{name}/simple.jar + +%add_to_maven_depmap org.slf4j jcl-over-slf4j %{version} JPP/slf4j jcl-over-slf4j +%add_to_maven_depmap org.slf4j jul-to-slf4j %{version} JPP/slf4j jul-to-slf4j +%add_to_maven_depmap org.slf4j log4j-over-slf4j %{version} JPP/slf4j log4j-over-slf4j +%add_to_maven_depmap org.slf4j %{name}-parent %{version} JPP/slf4j parent +%add_to_maven_depmap org.slf4j %{name}-api %{version} JPP/slf4j api +%add_to_maven_depmap org.slf4j %{name}-ext %{version} JPP/slf4j ext +%add_to_maven_depmap org.slf4j %{name}-jcl %{version} JPP/slf4j jcl +%add_to_maven_depmap org.slf4j %{name}-jdk14 %{version} JPP/slf4j jdk14 +%add_to_maven_depmap org.slf4j %{name}-log4j12 %{version} JPP/slf4j log4j12 +%add_to_maven_depmap org.slf4j %{name}-migrator %{version} JPP/slf4j migrator +%add_to_maven_depmap org.slf4j %{name}-nop %{version} JPP/slf4j nop +%add_to_maven_depmap org.slf4j %{name}-simple %{version} JPP/slf4j simple + +# poms +install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} +install -pm 644 pom.xml \ + $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-parent.pom +install -pm 644 jcl-over-slf4j/pom.xml \ + $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-jcl-over-slf4j.pom +install -pm 644 jul-to-slf4j/pom.xml \ + $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-jul-to-slf4j.pom +install -pm 644 log4j-over-slf4j/pom.xml \ + $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-log4j-over-slf4j.pom +install -pm 644 slf4j-api/pom.xml \ + $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-api.pom +install -pm 644 slf4j-ext/pom.xml \ + $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-ext.pom +install -pm 644 slf4j-jcl/pom.xml \ + $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-jcl.pom +install -pm 644 slf4j-jdk14/pom.xml \ + $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-jdk14.pom +install -pm 644 slf4j-log4j12/pom.xml \ + $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-log4j12.pom +install -pm 644 slf4j-migrator/pom.xml \ + $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-migrator.pom +install -pm 644 slf4j-nop/pom.xml \ + $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-nop.pom +install -pm 644 slf4j-simple/pom.xml \ + $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-simple.pom + +# manual +install -d -m 0755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +rm -f target/site/.htaccess +cp -pr target/site $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ +install -m 644 LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ + +# javadoc +install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -pr target/site/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/ +rm -rf target/site + +%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} || : + +%post +%update_maven_depmap + +%postun +%update_maven_depmap + +%files +%defattr(-,root,root,-) +%dir %{_docdir}/%{name}-%{version} +%doc %{_docdir}/%{name}-%{version}/LICENSE.txt +%{_javadir}/%{name} +%{_mavenpomdir}/* +%{_mavendepmapfragdir}/* + +%files javadoc +%defattr(-,root,root,-) +%{_javadocdir}/%{name} + +%files manual +%defattr(-,root,root,-) +%{_docdir}/%{name}-%{version}/site + +%changelog