- add svnmerge and wcgrep to docdir (Edward Rudd, #451932)
- drop neon version overrides
This commit is contained in:
parent
e84be422df
commit
ae2d876a10
@ -15,7 +15,7 @@
|
|||||||
Summary: Modern Version Control System designed to replace CVS
|
Summary: Modern Version Control System designed to replace CVS
|
||||||
Name: subversion
|
Name: subversion
|
||||||
Version: 1.5.0
|
Version: 1.5.0
|
||||||
Release: 6
|
Release: 7
|
||||||
License: ASL 1.1
|
License: ASL 1.1
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
URL: http://subversion.tigris.org/
|
URL: http://subversion.tigris.org/
|
||||||
@ -124,12 +124,11 @@ export svn_cv_ruby_sitedir_libsuffix=""
|
|||||||
export svn_cv_ruby_sitedir_archsuffix=""
|
export svn_cv_ruby_sitedir_archsuffix=""
|
||||||
|
|
||||||
export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path}
|
export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path}
|
||||||
export CPPFLAGS="-DSVN_NEON_0_26 -DSVN_NEON_0_25"
|
|
||||||
%configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
|
%configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
|
||||||
--with-swig --with-neon=%{_prefix} \
|
--with-swig --with-neon=%{_prefix} \
|
||||||
--with-ruby-sitedir=%{ruby_sitearch} \
|
--with-ruby-sitedir=%{ruby_sitearch} \
|
||||||
--with-apxs=%{_sbindir}/apxs --disable-mod-activation \
|
--with-apxs=%{_sbindir}/apxs --disable-mod-activation \
|
||||||
--disable-static --disable-neon-version-check
|
--disable-static
|
||||||
make %{?_smp_mflags} all
|
make %{?_smp_mflags} all
|
||||||
make swig-py swig-py-lib %{swigdirs}
|
make swig-py swig-py-lib %{swigdirs}
|
||||||
make swig-pl swig-pl-lib swig-rb swig-rb-lib
|
make swig-pl swig-pl-lib swig-rb swig-rb-lib
|
||||||
@ -227,6 +226,8 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||||||
%doc BUGS COMMITTERS COPYING HACKING INSTALL README CHANGES
|
%doc BUGS COMMITTERS COPYING HACKING INSTALL README CHANGES
|
||||||
%doc tools subversion/LICENSE mod_authz_svn-INSTALL
|
%doc tools subversion/LICENSE mod_authz_svn-INSTALL
|
||||||
%doc contrib/client-side/svn_load_dirs/{*.pl,*.example,*.README}
|
%doc contrib/client-side/svn_load_dirs/{*.pl,*.example,*.README}
|
||||||
|
%doc contrib/client-side/svnmerge/*.{README,py}
|
||||||
|
%doc contrib/client-side/wcgrep
|
||||||
%{_bindir}/*
|
%{_bindir}/*
|
||||||
%{_libdir}/libsvn_*.so.*
|
%{_libdir}/libsvn_*.so.*
|
||||||
%{_mandir}/man*/*
|
%{_mandir}/man*/*
|
||||||
@ -275,6 +276,10 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 3 2008 Joe Orton <jorton@redhat.com> 1.5.0-7
|
||||||
|
- add svnmerge and wcgrep to docdir (Edward Rudd, #451932)
|
||||||
|
- drop neon version overrides
|
||||||
|
|
||||||
* Wed Jul 2 2008 Joe Orton <jorton@redhat.com> 1.5.0-6
|
* Wed Jul 2 2008 Joe Orton <jorton@redhat.com> 1.5.0-6
|
||||||
- build with OpenJDK
|
- build with OpenJDK
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user