diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 217bf93..a52adbf 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -1,31 +1,20 @@ +# +# spec file for package apache-commons-logging +# +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2000-2007, 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: -# -# 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. +# 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/ # @@ -37,10 +26,10 @@ Name: apache-%{short_name} Version: 1.1.1 Release: 0 -License: Apache-2.0 Summary: Apache Commons Logging -Url: http://commons.apache.org/%{base_name} +License: Apache-2.0 Group: Development/Libraries/Java +Url: http://commons.apache.org/%{base_name} Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz Source1: %{short_name}.depmap Source2: http://mirrors.ibiblio.org/pub/mirrors/maven2/%{short_name}/%{short_name}-api/1.1/%{short_name}-api-1.1.pom @@ -184,7 +173,6 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %{_mavenpomdir}/JPP-%{short_name}-api.pom %config %{_mavendepmapfragdir}/* - %if %{with_maven} %files javadoc %defattr(0644,root,root,0755) @@ -195,59 +183,3 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : # ----------------------------------------------------------------------------- %changelog -* Sun Dec 18 2011 Minh Ngo 1.1.1-15 -- Fixing the license for openSUSE packages - -* Thu Dec 16 2010 Alexander Kurtakov 1.1.1-14 -- Bring back commons-logging* symlinks. - -* Thu Dec 16 2010 Stanislav Ochotnicky - 1.1.1-13 -- Replace tomcat6 BR with servlet25 only -- Cleanups according to new packaging guidelines -- Install maven metadata for -api jar -- Versionless jars/javadocs - -* Tue Nov 9 2010 Stanislav Ochotnicky - 1.1.1-12 -- Add depmaps for api and adapters subpackages -- Use apache-commons-parent BR instead of maven-* -- Replace tomcat5 BR with tomcat6 -- Reenable tests - -* Thu Jul 8 2010 Stanislav Ochotnicky - 1.1.1-11 -- Add license to javadoc subpackage - -* Wed Jun 9 2010 Alexander Kurtakov 1.1.1-10 -- Add osgi manifest entries. - -* Fri May 21 2010 Stanislav Ochotnicky - 1.1.1-9 -- Correct depmap filename for backward compatibility - -* Mon May 17 2010 Stanislav Ochotnicky - 1.1.1-8 -- Fix wrong depmap JPP name to short_name -- Add obsoletes to javadoc subpackage - -* Wed May 12 2010 Stanislav Ochotnicky - 1.1.1-7 -- Fix symlink problems introduced previously in r5 - -* Tue May 11 2010 Stanislav Ochotnicky - 1.1.1-6 -- Add one more add_to_maven_depmap for backward compatibility - -* Mon May 10 2010 Stanislav Ochotnicky - 1.1.1-5 -- Fix up add_to_maven_depmap -- Add jpackage-utils Requires for javadoc -- Cleanup install a bit - -* Fri May 7 2010 Stanislav Ochotnicky - 1.1.1-4 -- Fix provides - -* Thu May 6 2010 Stanislav Ochotnicky - 1.1.1-3 -- Revert to using default permissions -- Drop "Package" from summary, improve javadoc summary text - -* Thu May 6 2010 Stanislav Ochotnicky - 1.1.1-2 -- Fix EOLs on docs -- Create javadoc symlinks during install -- Use version macro in Source0 URL, use _mavenpomdir macro - -* Thu May 6 2010 Stanislav Ochotnicky - 1.1.1-1 -- Rename and rebase from jakarta-commons-logging