pool/slf4j
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 198424 from Java:packages

Browse Source 
- use add_maven_depmap from javapackages-tools

- Move from jpackage-utils to javapackage-tools

OBS-URL: https://build.opensuse.org/request/show/198424
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/slf4j?expand=0&rev=4
This commit is contained in:
Stephan Kulow 2013-09-11 11:37:51 +00:00 committed by Git OBS Bridge
parent 88e5b09b8b
commit 3ab146984d
2 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slf4j.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Sep 11 07:49:42 UTC 2013 - mvyskocil@suse.com
- use add_maven_depmap from javapackages-tools
-------------------------------------------------------------------
Mon Sep 9 11:06:22 UTC 2013 - tchvatal@suse.com
- Move from jpackage-utils to javapackage-tools
-------------------------------------------------------------------
Fri Apr 27 09:59:40 UTC 2012 - mvyskocil@suse.cz

61
slf4j.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package slf4j
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2009, JPackage Project
# All rights reserved.
#
@ -18,8 +18,6 @@
#
%global _mavenpomdir %{_datadir}/maven2/poms
Name: slf4j
Version: 1.6.1
Release: 0
@ -32,21 +30,21 @@ 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
Requires(post): javapackages-tools
Requires(postun): javapackages-tools
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: javapackages-tools
BuildRequires: javassist >= 3.4
BuildRequires: jpackage-utils >= 1.7.5
BuildRequires: junit >= 3.8.2
BuildRequires: log4j
Requires: cal10n
Requires: java
Requires: jpackage-utils
Requires: javapackages-tools
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -65,7 +63,7 @@ API implementation, e.g. Log4jLoggerAdapter or JDK14LoggerAdapter..
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation/HTML
Requires: jpackage-utils
Requires: javapackages-tools
%description javadoc
API documentation for %{name}.
@ -128,45 +126,55 @@ install -m 644 slf4j-nop/target/%{name}-nop-%{version}.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
# % add_maven_depmap JPP.%{name}-parent.pom %{name}/pa
install -pm 644 jcl-over-slf4j/pom.xml \
$RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-jcl-over-slf4j.pom
%add_maven_depmap JPP.%{name}-jcl-over-slf4j.pom %{name}/jcl-over-slf4j.jar
install -pm 644 jul-to-slf4j/pom.xml \
$RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-jul-to-slf4j.pom
%add_maven_depmap JPP.%{name}-jul-to-slf4j.pom %{name}/jul-to-slf4j.jar
install -pm 644 log4j-over-slf4j/pom.xml \
$RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-log4j-over-slf4j.pom
%add_maven_depmap JPP.%{name}-log4j-over-slf4j.pom %{name}/log4j-over-slf4j.jar
install -pm 644 slf4j-api/pom.xml \
$RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-api.pom
%add_maven_depmap JPP.%{name}-api.pom %{name}/api.jar
install -pm 644 slf4j-ext/pom.xml \
$RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-ext.pom
%add_maven_depmap JPP.%{name}-ext.pom %{name}/ext.jar
install -pm 644 slf4j-jcl/pom.xml \
$RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-jcl.pom
%add_maven_depmap JPP.%{name}-jcl.pom %{name}/jcl.jar
install -pm 644 slf4j-jdk14/pom.xml \
$RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-jdk14.pom
%add_maven_depmap JPP.%{name}-jdk14.pom %{name}/jdk14.jar
install -pm 644 slf4j-log4j12/pom.xml \
$RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-log4j12.pom
%add_maven_depmap JPP.%{name}-log4j12.pom %{name}/log4j12.jar
install -pm 644 slf4j-migrator/pom.xml \
$RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-migrator.pom
%add_maven_depmap JPP.%{name}-migrator.pom %{name}/migrator.jar
install -pm 644 slf4j-nop/pom.xml \
$RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-nop.pom
%add_maven_depmap JPP.%{name}-nop.pom %{name}/nop.jar
install -pm 644 slf4j-simple/pom.xml \
$RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-simple.pom
# % add_maven_depmap JPP.%{name}-simple.pom JPP.%{name}-simple.pom
# manual
install -d -m 0755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
@ -179,17 +187,6 @@ 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}