Accepting request 106367 from home:coolo:branches:openSUSE:Factory

- Apache-2 is not a license in spdx.org, pick Apache-2.0

OBS-URL: https://build.opensuse.org/request/show/106367
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=90
This commit is contained in:
Dirk Mueller 2012-02-26 23:10:09 +00:00 committed by Git OBS Bridge
parent 7b1b13e9d8
commit 7ad8dd42bd
2 changed files with 34 additions and 24 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Feb 21 20:00:27 UTC 2012 - coolo@suse.com
- Apache-2 is not a license in spdx.org, pick Apache-2.0
-------------------------------------------------------------------
Mon Feb 13 23:16:44 UTC 2012 - andreas.stieger@gmx.de

View File

@ -42,15 +42,22 @@
Name: subversion
Version: 1.7.3
Release: 1
Release: 0
# in-tree SWIG version to use for the build:
%define swig_version 1.3.36
%define sqlite_version 3.7.6.3
%define sqlite_pkg_version 3070603
BuildRequires: apache2-devel db-devel file-devel gcc-c++ libstdc++-devel zlib-devel
BuildRequires: libtool pkgconfig
BuildRequires: python-devel python-xml
BuildRequires: apache2-devel
BuildRequires: db-devel
BuildRequires: file-devel
BuildRequires: gcc-c++
BuildRequires: libstdc++-devel
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: python-devel
BuildRequires: python-xml
BuildRequires: update-alternatives
BuildRequires: zlib-devel
%if %with_python_ctypes
BuildRequires: ctypesgen
%endif
@ -72,7 +79,10 @@ BuildRequires: gnome-keyring-devel
BuildRequires: libserf-devel
%endif
%if %with_kde4_kwallet
BuildRequires: dbus-1-devel kdelibs4-core libkde4-devel libqt4-devel
BuildRequires: dbus-1-devel
BuildRequires: kdelibs4-core
BuildRequires: libkde4-devel
BuildRequires: libqt4-devel
%endif # with_kde4_kwallet
%if 0%{?suse_version} >= 1130
%define with_java 1
@ -84,7 +94,8 @@ BuildRequires: junit
%if 0%{?suse_version} > 1030
BuildRequires: libneon-devel
%else
BuildRequires: neon-devel openldap2-devel
BuildRequires: neon-devel
BuildRequires: openldap2-devel
%endif # suse_version > 1030
# for %check section, to find a free port:
BuildRequires: iproute2
@ -102,9 +113,9 @@ BuildRequires: iproute2
PreReq: %insserv_prereq %fillup_prereq
#
Summary: Subversion version control system
BuildRoot: %{_tmppath}/%{name}-%{version}-build
License: Apache-2
License: Apache-2.0
Group: Development/Tools/Version Control
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://subversion.apache.org
Source0: http://www.apache.org/dist/subversion/subversion-%{version}.tar.bz2
Source1: subversion.conf
@ -165,9 +176,8 @@ to large-scale enterprise operations.
%package devel
License: Apache-2
Group: Development/Libraries/C and C++
Summary: Development package for Subversion developers
Group: Development/Libraries/C and C++
Requires: subversion = %{version}
# this pulls in libapr1-devel and libexpat-devel
Requires: libapr-util1-devel
@ -179,18 +189,16 @@ files for developers interacting with the subversion package.
%package tools
License: Apache-2
Group: Development/Tools/Version Control
Summary: Tools for Subversion
Group: Development/Tools/Version Control
%description tools
This package contains some tools for subversion server and
repository admins.
%package perl
License: Apache-2
Group: Development/Tools/Version Control
Summary: Allows Perl scripts to directly use Subversion repositories
Group: Development/Tools/Version Control
Requires: subversion = %{version}
Requires: perl >= 5.8
Requires: perl = %{perl_version}
@ -201,9 +209,8 @@ Provides Perl (SWIG) support for Subversion.
%package python
License: Apache-2
Group: Development/Tools/Version Control
Summary: Allows Python scripts to directly use Subversion repositories
Group: Development/Tools/Version Control
Requires: subversion = %{version}
%description python
@ -215,8 +222,8 @@ Provides Python (SWIG) support for Subversion.
%package python-ctypes
Group: Development/Tools/Version Control
Summary: High-Level Python Bindings for Subversion
Group: Development/Tools/Version Control
Requires: subversion = %{version}
%description python-ctypes
@ -225,9 +232,8 @@ Provides high-level Python support for Subversion, based on ctypes.
%if %with_ruby
%package ruby
License: Apache-2
Group: Development/Tools/Version Control
Summary: Allows Ruby scripts to directly use Subversion repositories
Group: Development/Tools/Version Control
Requires: subversion = %{version}
%description ruby
@ -238,10 +244,11 @@ Provides Ruby (SWIG) support for Subversion.
%endif # with_ruby
%package server
License: Apache-2
Group: Development/Tools/Version Control
Summary: Apache server module for Subversion server
Requires: subversion = %{version} apache2 %{apache_mmn}
Group: Development/Tools/Version Control
Requires: %{apache_mmn}
Requires: apache2
Requires: subversion = %{version}
%description server
The subversion-server package adds the Subversion server Apache module
@ -254,7 +261,6 @@ http://subversion.apache.org
%if %with_kde4_kwallet
%package -n libsvn_auth_kwallet-1-0
License: Apache-2
Summary: A Concurrent Versioning system similar to but better than CVS
Group: Development/Tools/Version Control
@ -266,7 +272,6 @@ Provides KWallet integration for Subversion.
%if %with_gnome_keyring
%package -n libsvn_auth_gnome_keyring-1-0
License: Apache-2
Summary: A Concurrent Versioning system similar to but better than CVS
Group: Development/Tools/Version Control