|
|
@@ -12,7 +12,7 @@
|
|
|
Summary: Modern Version Control System
|
|
|
Summary(ja): モダンなバージョン管理システム
|
|
|
Name: subversion
|
|
|
-Version: 1.7.6
|
|
|
+Version: 1.7.7
|
|
|
Release: 1%{?_dist_release}
|
|
|
License: ASL 2.0
|
|
|
Group: Development/Tools
|
|
|
@@ -27,6 +27,7 @@ SOURCE1: subversion.conf
|
|
|
SOURCE2: httpd.davcheck.conf
|
|
|
SOURCE3: filter-requires.sh
|
|
|
Patch3: subversion-1.7.0-rpath.patch
|
|
|
+Patch4: subversion-1.7.2-ruby19.patch
|
|
|
|
|
|
Requires: db4 >= %{db_version}
|
|
|
Requires: expat
|
|
|
@@ -108,7 +109,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.8.2
|
|
|
+Requires: ruby >= 1.9.3
|
|
|
|
|
|
%description ruby
|
|
|
This package includes the Ruby bindings to the Subversion libraries.
|
|
|
@@ -124,6 +125,7 @@ This package includes the Python bindings to the Subversion libraries.
|
|
|
%prep
|
|
|
%setup -q
|
|
|
%patch3 -p1 -b .rpath
|
|
|
+%patch4 -p1 -b .ruby19
|
|
|
|
|
|
rm -rf neon apr apr-util db4
|
|
|
|
|
|
@@ -138,8 +140,7 @@ export svn_cv_ruby_link="%{__cc} -shared"
|
|
|
export svn_cv_ruby_sitedir_libsuffix=""
|
|
|
export svn_cv_ruby_sitedir_archsuffix=""
|
|
|
|
|
|
-export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path}
|
|
|
-export CPPFLAGS="-DSVN_NEON_0_26 -DSVN_NEON_0_25"
|
|
|
+export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path} CFLAGS="$RPM_OPT_FLAGS"
|
|
|
%configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
|
|
|
--with-swig --with-neon=%{_prefix} \
|
|
|
--with-ruby-sitedir=%{rarchdir} \
|
|
|
@@ -150,7 +151,7 @@ export CPPFLAGS="-DSVN_NEON_0_26 -DSVN_NEON_0_25"
|
|
|
--disable-neon-version-check
|
|
|
# 1.3.0 tarball ships with generated swig sources
|
|
|
make extraclean-swig-headers
|
|
|
-make %{?_smp_mflags} all
|
|
|
+make %{?_smp_mflags} all tools
|
|
|
make swig-py swig-py-lib %{swigdirs}
|
|
|
make swig-pl swig-pl-lib swig-rb swig-rb-lib
|
|
|
|
|
|
@@ -265,6 +266,10 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Thu Oct 25 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.7.7-1
|
|
|
+- update to 1.7.7
|
|
|
+- rebuild with ruby-1.9.3
|
|
|
+
|
|
|
* Tue Sep 18 2012 IWAI, Masaharu <iwai@alib.jp> 1.7.6-1
|
|
|
- new upstream release
|
|
|
- update License
|
daisuke