|
|
@@ -1,9 +1,8 @@
|
|
|
%define neon_version 0.25.5
|
|
|
-%define swig_version 1.3.29
|
|
|
+%define swig_version 3.0.0
|
|
|
+%define apache_version 2.4
|
|
|
%define apache_dir /usr
|
|
|
|
|
|
-%define db_version 4.3.29
|
|
|
-
|
|
|
%define swigdirs swig_pydir=%{python_sitearch}/libsvn swig_pydir_extra=%{python_sitearch}/svn
|
|
|
|
|
|
# set to zero to avoid running test suite
|
|
|
@@ -12,13 +11,13 @@
|
|
|
Summary: Modern Version Control System
|
|
|
Summary(ja): モダンなバージョン管理システム
|
|
|
Name: subversion
|
|
|
-Version: 1.8.8
|
|
|
+Version: 1.8.9
|
|
|
Release: 1%{?_dist_release}
|
|
|
License: ASL 2.0
|
|
|
Group: Development/Tools
|
|
|
URL: http://subversion.apache.org/
|
|
|
|
|
|
-Packager: iwaim
|
|
|
+Packager: iwaim, daisuke
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
|
|
|
|
@@ -29,13 +28,10 @@ SOURCE3: filter-requires.sh
|
|
|
Patch3: subversion-1.7.0-rpath.patch
|
|
|
#Patch4: subversion-1.7.2-ruby19.patch
|
|
|
|
|
|
-Requires: db4 >= %{db_version}
|
|
|
-Requires: expat
|
|
|
-Requires: neon >= %{neon_version}
|
|
|
-BuildRequires: apache2-devel
|
|
|
+BuildRequires: apache2-devel >= %{apache_version}
|
|
|
BuildRequires: apr-devel, apr-util-devel
|
|
|
BuildRequires: autoconf >= 2.53
|
|
|
-BuildRequires: db4-devel >= %{db_version}
|
|
|
+BuildRequires: libdb-devel
|
|
|
BuildRequires: expat-devel
|
|
|
BuildRequires: gdbm-devel
|
|
|
BuildRequires: libtool >= 1.4.2
|
|
|
@@ -47,8 +43,7 @@ BuildRequires: swig >= %{swig_version}
|
|
|
BuildRequires: texinfo
|
|
|
BuildRequires: zlib-devel
|
|
|
BuildRequires: openldap-devel
|
|
|
-BuildRequires: ruby >= 1.8.2
|
|
|
-BuildRequires: ruby-devel >= 1.8.2
|
|
|
+BuildRequires: ruby-devel >= 2.0
|
|
|
BuildRequires: perl >= 5.8.0
|
|
|
BuildRequires: sqlite3-devel
|
|
|
BuildRequires: krb5-devel
|
|
|
@@ -80,7 +75,7 @@ for developers interacting with the subversion package.
|
|
|
%package mod_dav_svn
|
|
|
Group: System Environment/Daemons
|
|
|
Summary: Apache server module for Subversion server.
|
|
|
-Requires: httpd >= %{apache_version}
|
|
|
+Requires: apache2 >= %{apache_version}
|
|
|
Requires: subversion = %{version}-%{release}
|
|
|
%description mod_dav_svn
|
|
|
The subversion-mod_dav_svn package adds the Subversion server Apache module to
|
|
|
@@ -110,7 +105,7 @@ This package includes the Perl bindings to the Subversion libraries.
|
|
|
Group: Development/Libraries
|
|
|
Summary: Ruby bindings to the Subversion libraries
|
|
|
Requires: subversion = %{version}-%{release}
|
|
|
-Requires: ruby >= 1.9.3
|
|
|
+Requires: ruby >= 2.0
|
|
|
|
|
|
%description ruby
|
|
|
This package includes the Ruby bindings to the Subversion libraries.
|
|
|
@@ -171,7 +166,7 @@ install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/subversion
|
|
|
|
|
|
install -m 755 -d $RPM_BUILD_ROOT%{_libdir}/apache2/modules
|
|
|
|
|
|
-# Add subversion.conf configuration file into httpd/conf.d directory.
|
|
|
+# Add subversion.conf configuration file into apache2/conf.d directory.
|
|
|
install -m 755 -d $RPM_BUILD_ROOT/etc/apache2/conf.d
|
|
|
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/apache2/conf.d
|
|
|
|
|
|
@@ -304,6 +299,13 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Jun 25 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 1.8.9-1
|
|
|
+- update to 1.8.9
|
|
|
+- remove unneeded explisit dependency
|
|
|
+- add BR: apache2-devel >= 2.4
|
|
|
+- add BR: libdb-devel instead of db4-devel
|
|
|
+- add R: apache2 > 2.4 to mod_dav_svn
|
|
|
+
|
|
|
* Fri Apr 18 2014 Daisuke SUZUKI <daisuke@linux.or.jp> 1.8.8-1
|
|
|
- update to 1.8.8
|
|
|
- add BR: libserf-devel to handle http* scheme
|
daisuke