From 94cb390b64e7eeb808395babad634ee1c0573e32385c4f81b3a12ef874b5f23c Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Tue, 15 Mar 2011 09:12:19 +0000 Subject: [PATCH] Autobuild autoformatter for 64104 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ant?expand=0&rev=34 --- ant-antlr.spec | 53 ++++++++++++++++++++++++-------------------------- ant.spec | 53 ++++++++++++++++++++++++-------------------------- 2 files changed, 50 insertions(+), 56 deletions(-) diff --git a/ant-antlr.spec b/ant-antlr.spec index a1765ce..426e1d9 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -1,31 +1,23 @@ +# +# spec file for package ant-antlr +# +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2000-2009, JPackage Project # All rights reserved. # -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: +# 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/ # -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the -# distribution. -# 3. Neither the name of the JPackage Project nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + # %define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}} %define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}} @@ -50,14 +42,14 @@ Name: ant-antlr Version: 1.8.2 -Release: 0 +Release: 1 License: ASL 2.0 %if %bootstrap -Summary: Build tool for java +Summary: Antlr Task for ant %else Summary: Antlr Task for ant %endif -URL: http://ant.apache.org/ +Url: http://ant.apache.org/ Group: Development/Tools/Building Source0: http://www.apache.org/dist/ant/source/apache-ant-%{cvs_version}-src.tar.bz2 Source2: apache-ant-%{major_version}.ant.conf @@ -349,6 +341,7 @@ Apache Ant is a Java-based build tool. This package contains optional apache regexp tasks for Apache Ant. %package -n ant-apache-xalan2 +License: Apache Software License .. Summary: Optional apache xalan2 tasks for ant Group: Development/Tools/Building BuildRequires: regexp @@ -422,6 +415,7 @@ Apache Ant is a Java-based build tool. This package contains optional JUnit tasks for Apache Ant. %package -n ant-testutil +License: Apache Software License .. Summary: Test utility classes for ant Group: Development/Tools/Building Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) @@ -503,7 +497,6 @@ __EOF__ %define __perl_provides %{_builddir}/apache-ant-%{cvs_version}/%{name}-perl.prov chmod +x %{__perl_provides} - # Requires: exclude bogus perl(the) cat <<__EOF__ > %{name}-perl.req #!/bin/sh @@ -656,6 +649,7 @@ rm -rf %{buildroot} %update_maven_depmap %if %bootstrap + %files %defattr(0644,root,root,0755) %doc KEYS LICENSE NOTICE README WHATSNEW @@ -694,6 +688,7 @@ rm -rf %{buildroot} %else # ant-antlr filelist + %files %defattr(0644,root,root,0755) %{_javadir}/ant/ant-antlr.jar @@ -707,6 +702,7 @@ rm -rf %{buildroot} ### Basic ant subpackages %if %bootstrap + %files -n ant-jmf %defattr(0644,root,root,0755) %{_javadir}/ant/ant-jmf.jar @@ -728,6 +724,7 @@ rm -rf %{buildroot} %endif #if bootstrap %if ! %bootstrap + %files -n ant-apache-bsf %defattr(0644,root,root,0755) %{_javadir}/ant/ant-apache-bsf.jar diff --git a/ant.spec b/ant.spec index dc0065f..49c1d2a 100644 --- a/ant.spec +++ b/ant.spec @@ -1,31 +1,23 @@ +# +# spec file for package ant +# +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2000-2009, JPackage Project # All rights reserved. # -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: +# 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/ # -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the -# distribution. -# 3. Neither the name of the JPackage Project nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + # %define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}} %define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}} @@ -49,14 +41,14 @@ Name: ant Version: 1.8.2 -Release: 0 +Release: 1 License: ASL 2.0 %if %bootstrap -Summary: Build tool for java +Summary: Antlr Task for ant %else Summary: Antlr Task for ant %endif -URL: http://ant.apache.org/ +Url: http://ant.apache.org/ Group: Development/Tools/Building Source0: http://www.apache.org/dist/ant/source/apache-ant-%{cvs_version}-src.tar.bz2 Source2: apache-ant-%{major_version}.ant.conf @@ -349,6 +341,7 @@ Apache Ant is a Java-based build tool. This package contains optional apache regexp tasks for Apache Ant. %package -n ant-apache-xalan2 +License: Apache Software License .. Summary: Optional apache xalan2 tasks for ant Group: Development/Tools/Building BuildRequires: regexp @@ -422,6 +415,7 @@ Apache Ant is a Java-based build tool. This package contains optional JUnit tasks for Apache Ant. %package -n ant-testutil +License: Apache Software License .. Summary: Test utility classes for ant Group: Development/Tools/Building Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) @@ -503,7 +497,6 @@ __EOF__ %define __perl_provides %{_builddir}/apache-ant-%{cvs_version}/%{name}-perl.prov chmod +x %{__perl_provides} - # Requires: exclude bogus perl(the) cat <<__EOF__ > %{name}-perl.req #!/bin/sh @@ -656,6 +649,7 @@ rm -rf %{buildroot} %update_maven_depmap %if %bootstrap + %files %defattr(0644,root,root,0755) %doc KEYS LICENSE NOTICE README WHATSNEW @@ -694,6 +688,7 @@ rm -rf %{buildroot} %else # ant-antlr filelist + %files %defattr(0644,root,root,0755) %{_javadir}/ant/ant-antlr.jar @@ -707,6 +702,7 @@ rm -rf %{buildroot} ### Basic ant subpackages %if %bootstrap + %files -n ant-jmf %defattr(0644,root,root,0755) %{_javadir}/ant/ant-jmf.jar @@ -728,6 +724,7 @@ rm -rf %{buildroot} %endif #if bootstrap %if ! %bootstrap + %files -n ant-apache-bsf %defattr(0644,root,root,0755) %{_javadir}/ant/ant-apache-bsf.jar