rpms/subversion/F-10 sources,1.35,1.36 subversion.spec,1.128,1.129

[Joe Orton]

Author: jorton

Update of /cvs/extras/rpms/subversion/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30584

Modified Files:
	sources subversion.spec 
Log Message:
* Thu May 28 2009 Joe Orton <jorton at redhat.com> 1.6.2-2.fc10
- update to 1.6.2 (#500933, #469524)



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/subversion/F-10/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	30 Jan 2009 12:39:30 -0000	1.35
+++ sources	28 May 2009 10:41:33 -0000	1.36
@@ -1 +1 @@
-532c7d49b3cd33d712289a5ef03b7749  subversion-1.5.5.tar.gz
+93f128306b11e1a1c64ff51338777952  subversion-1.6.2.tar.gz


Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/F-10/subversion.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- subversion.spec	30 Jan 2009 12:39:30 -0000	1.128
+++ subversion.spec	28 May 2009 10:41:33 -0000	1.129
@@ -12,10 +12,10 @@
 
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-Summary: Modern Version Control System designed to replace CVS
+Summary: A Modern Concurrent Version Control System
 Name: subversion
-Version: 1.5.5
-Release: 3%{?dist}
+Version: 1.6.2
+Release: 2%{?dist}
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -23,14 +23,16 @@ Source0: http://subversion.tigris.org/ta
 Source1: subversion.conf
 Source3: filter-requires.sh
 Source4: http://www.xsteve.at/prg/emacs/psvn.el
-Patch2: subversion-0.20.1-deplibs.patch
-Patch3: subversion-1.5.1-rpath.patch
-Patch6: subversion-1.5.2-pie.patch
+Source5: psvn-init.el
+Patch2: subversion-1.6.0-deplibs.patch
+Patch3: subversion-1.6.1-rpath.patch
+Patch6: subversion-1.6.0-pie.patch
 Patch7: subversion-1.1.3-java.patch
 BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
 BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext
 BuildRequires: apr-devel >= 1.3.0, apr-util-devel >= 1.3.0
 BuildRequires: neon-devel >= 0:0.24.7-1, cyrus-sasl-devel
+BuildRequires: sqlite-devel >= 3.4.0
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides: svn = %{version}-%{release}
 Requires: apr >= 1.3.0
@@ -60,7 +62,7 @@ package.
 
 %package -n mod_dav_svn
 Group: System Environment/Daemons
-Summary: Apache server module for Subversion server
+Summary: Apache httpd module for Subversion server
 Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing)
 Requires: subversion = %{version}-%{release}
 BuildRequires: httpd-devel >= 2.0.45
@@ -105,14 +107,19 @@ This package includes the Ruby bindings 
 %setup -q
 %patch2 -p1 -b .deplibs
 %patch3 -p1 -b .rpath
-%patch6 -p1 -b .pie
+#patch6 -p1 -b .pie
 %if %{with_java}
 %patch7 -p1 -b .java
 %endif
+%ifarch sparc64
+sed -i -e 's|-fpie|-fPIE|g' Makefile.in
+%endif
 
 %build
-# Regenerate after patches to build.conf et al
-autoheader && autoconf && ./gen-make.py --reload
+# Regenerate the buildsystem, so that:
+#  1) patches applied to configure.in take effect
+#  2) the swig bindings are regenerated using the system swig
+./autogen.sh --release
 
 # fix shebang lines, #111498
 perl -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in
@@ -122,12 +129,13 @@ 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 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=%{ruby_sitearch} \
         --with-apxs=%{_sbindir}/apxs --disable-mod-activation \
-        --disable-static --with-sasl=%{_prefix}
+        --disable-static --with-sasl=%{_prefix} \
+        --disable-neon-version-check
 make %{?_smp_mflags} all
 make swig-py swig-py-lib %{swigdirs}
 make swig-pl swig-pl-lib swig-rb swig-rb-lib
@@ -181,6 +189,9 @@ for f in emacs/site-lisp xemacs/site-pac
   install -m 644 $RPM_SOURCE_DIR/psvn.el ${RPM_BUILD_ROOT}%{_datadir}/$f
 done
 
+install -m 644 $RPM_SOURCE_DIR/psvn-init.el \
+        ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp
+
 # Rename authz_svn INSTALL doc for docdir
 ln -f subversion/mod_authz_svn/INSTALL mod_authz_svn-INSTALL
 
@@ -232,8 +243,8 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*
 %{python_sitearch}/svn
 %{python_sitearch}/libsvn
-%{_datadir}/emacs/site-lisp
-%{_datadir}/xemacs/site-packages/lisp
+%{_datadir}/emacs/site-lisp/*.el
+%{_datadir}/xemacs/site-packages/lisp/*.el
 %dir %{_sysconfdir}/subversion
 %exclude %{_libdir}/libsvn_swig_perl*
 %exclude %{_libdir}/libsvn_swig_ruby*
@@ -275,6 +286,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Thu May 28 2009 Joe Orton <jorton at redhat.com> 1.6.2-2.fc10
+- update to 1.6.2 (#500933, #469524)
+
 * Fri Jan 30 2009 Joe Orton <jorton at redhat.com> 1.5.5-4.fc10
 - rebuild