From 3f94a11832b10f8790f2b457b3894794cb938c9a Mon Sep 17 00:00:00 2001 From: jorton Date: Sun, 8 Nov 2009 17:08:47 +0000 Subject: [PATCH] - update to 1.6.6 --- .cvsignore | 1 + sources | 1 + subversion-1.6.2.tar.gz.asc | 35 ----------------------------------- subversion-1.6.3.tar.gz.asc | 7 ------- subversion-1.6.4.tar.bz2.asc | 35 ----------------------------------- subversion-1.6.4.tar.gz.asc | 35 ----------------------------------- subversion-1.6.6.tar.bz2.asc | 35 +++++++++++++++++++++++++++++++++++ subversion.spec | 9 ++++++--- upstream | 2 +- 9 files changed, 44 insertions(+), 116 deletions(-) delete mode 100644 subversion-1.6.2.tar.gz.asc delete mode 100644 subversion-1.6.3.tar.gz.asc delete mode 100644 subversion-1.6.4.tar.bz2.asc delete mode 100644 subversion-1.6.4.tar.gz.asc create mode 100644 subversion-1.6.6.tar.bz2.asc diff --git a/.cvsignore b/.cvsignore index b070505..1fd0408 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ subversion-1.6.5.tar.bz2 +subversion-1.6.6.tar.bz2 diff --git a/sources b/sources index 4f27b20..e908314 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 1a53a0e72bee0bf814f4da83a9b6a636 subversion-1.6.5.tar.bz2 +e5109da756d74c7d98f683f004a539af subversion-1.6.6.tar.bz2 diff --git a/subversion-1.6.2.tar.gz.asc b/subversion-1.6.2.tar.gz.asc deleted file mode 100644 index ffd3159..0000000 --- a/subversion-1.6.2.tar.gz.asc +++ /dev/null @@ -1,35 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iEYEABECAAYFAkoDD0IACgkQCwOubk4kUXx7kACgx2OOfBOPAMBeUHrM+xSsdsWj -WLkAnA4tzj8eBBfKtfIUnomLB+0xSqh7 -=dIoL ------END PGP SIGNATURE----- ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2.2 (GNU/Linux) - -iD8DBQBKA6AAxXIjJtpWHZERAv/PAJ4iSk7tHYYHI7t+EPmxC6pmD3hT9QCgk9lX -/nEquZMpPhZie6qQWNDZyLs= -=5jcM ------END PGP SIGNATURE----- ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iEYEABECAAYFAkoDJg8ACgkQ9o1G+2zNQDhVYwCgpZMjlTopJIOREHHsr+E/775n -O9YAniuC/5S5W92vRFpAahpH9j7GzGul -=GMi5 ------END PGP SIGNATURE----- ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (FreeBSD) - -iEYEABECAAYFAkoEpmkACgkQ/P1jBZgh97JkegCgvAWA8MlEycZIkWud4HLK0uw4 -YrsAnRFtdlwzeOI3knarehRe0q7ixYvg -=9hZJ ------END PGP SIGNATURE----- ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEABECAAYFAkoEWNoACgkQIEGVSeBq/j6U8QCgkkd3w7znQ/dMOtIQIGdg9gwC -P/UAn3T6R8pj+3cOLSFsFUuy/V7bkGbU -=GPSt ------END PGP SIGNATURE----- diff --git a/subversion-1.6.3.tar.gz.asc b/subversion-1.6.3.tar.gz.asc deleted file mode 100644 index 4424935..0000000 --- a/subversion-1.6.3.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iEYEABECAAYFAko5swkACgkQCwOubk4kUXwbpQCfT7+XfNkX8nb2HAO0og5Tn8Xu -9ukAoPIKZ/+taVMeiPXRC8AX0x24niOr -=1vmx ------END PGP SIGNATURE----- diff --git a/subversion-1.6.4.tar.bz2.asc b/subversion-1.6.4.tar.bz2.asc deleted file mode 100644 index b8f3014..0000000 --- a/subversion-1.6.4.tar.bz2.asc +++ /dev/null @@ -1,35 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iEYEABECAAYFAkp3xLQACgkQCwOubk4kUXxp8wCdEk4skjDqre08fEuF/bc+n05d -WQIAoNzA2nVuza0td20YjDqXbX2lW7GG -=BEAB ------END PGP SIGNATURE----- ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iEYEABECAAYFAkp4nzUACgkQ5dMCc/WdJfBwZACgpAcORwz5rnbUpMacRRNZ7cNw -v98AoPBo/9ULXBt4dPn021pjsLxgyUw3 -=FLdA ------END PGP SIGNATURE----- ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iEYEABECAAYFAkp4k/kACgkQokEGqRcG/W5gdACguMlg/4QUAAsh811ffgM6upmt -qA0AoLd1R8UXEqnozKjGPuzljtEDBolg -=HVCk ------END PGP SIGNATURE----- ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iEYEABECAAYFAkp5RxAACgkQ9o1G+2zNQDhMiwCgh8xaAhXxyp6/YHf2onxWEiXb -hR8AmgKuMuBS+R8XDZaoLDx+i0o+XCHX -=57CQ ------END PGP SIGNATURE----- ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (FreeBSD) - -iEYEABECAAYFAkp7AzwACgkQ/P1jBZgh97LPSACfV0Q1NEW7uilPCGyED7n3urqU -VPIAnjJVMYpb6aG10C9ymDj0LiucKOi9 -=jGlb ------END PGP SIGNATURE----- diff --git a/subversion-1.6.4.tar.gz.asc b/subversion-1.6.4.tar.gz.asc deleted file mode 100644 index 9c27fc5..0000000 --- a/subversion-1.6.4.tar.gz.asc +++ /dev/null @@ -1,35 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iEYEABECAAYFAkp3xLYACgkQCwOubk4kUXwuHwCgxFKL+QnzIebGGcjqPm4l/iBp -/2QAni/Ye1w73QjIikRxSsvNaBxr7Ik6 -=Vkwq ------END PGP SIGNATURE----- ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iEYEABECAAYFAkp4n9QACgkQ5dMCc/WdJfBD0QCg+UN5zZ9HS6bouwVexaFWYXbh -GeEAmQGA7yQtvHgYJ97DJM3LNAW6cd5X -=5fXs ------END PGP SIGNATURE----- ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iEYEABECAAYFAkp4k+UACgkQokEGqRcG/W7VUQCeNFQ7VJgRxQFOG1Ukp026e+H4 -bDUAoIRMH84/Bb3OYa5Gr0xSOuhPhWEx -=EfId ------END PGP SIGNATURE----- ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iEYEABECAAYFAkp5RxgACgkQ9o1G+2zNQDgGHACdGJWmRW6L8qjrBpIPIqdvQfGw -X7IAn2icEiXqv7/TMROxCVGJh5jvxVAx -=2Td8 ------END PGP SIGNATURE----- ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (FreeBSD) - -iEYEABECAAYFAkp7Az8ACgkQ/P1jBZgh97KJSQCgyQz56frR5zEAf+l4m/Ny3Dr5 -u50AmQErCcguvMp/MJva2oluweihoW4Y -=ZQx2 ------END PGP SIGNATURE----- diff --git a/subversion-1.6.6.tar.bz2.asc b/subversion-1.6.6.tar.bz2.asc new file mode 100644 index 0000000..5d0321d --- /dev/null +++ b/subversion-1.6.6.tar.bz2.asc @@ -0,0 +1,35 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEABECAAYFAkrXTlsACgkQCwOubk4kUXyyPgCeOJk5kVF+eoByU6GKZkzm2r9m +3mMAnjZusFZJ+qGd/MIT7fDc66Ey8TuQ +=3Uhc +-----END PGP SIGNATURE----- +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEABECAAYFAkrX9ZkACgkQ9o1G+2zNQDh15wCglUp6nbw3tpP04O5ljud2QccS +7NcAmwViX8mR2X5itH3N0KVk1VQj0WOO +=v+Og +-----END PGP SIGNATURE----- +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2 (GNU/Linux) + +iD8DBQBK2I/RNR8z5DU+JbwRAsgkAJ0dU8J/GakhF3qezvb/JgkpSDF6swCfQKHX +M2bPkCtBdNwjBDqeho4wRpg= +=jPxs +-----END PGP SIGNATURE----- +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.10 (FreeBSD) + +iEYEABECAAYFAkre/ukACgkQ/P1jBZgh97JaEACgm58i2b7byLEQ3yGWv+yl/hj3 +5yYAnROYRntwtZKCbaekYVxVhBtieugD +=tm1D +-----END PGP SIGNATURE----- +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEABECAAYFAkrfLvsACgkQokEGqRcG/W7dxwCdFP46PMY3UyEoMBZN0OInI2VW +FpUAn0nnfdaWMN21My5Xhru9xGeK2XQ5 +=ve9G +-----END PGP SIGNATURE----- diff --git a/subversion.spec b/subversion.spec index a989216..a9d8727 100644 --- a/subversion.spec +++ b/subversion.spec @@ -16,8 +16,8 @@ Summary: A Modern Concurrent Version Control System Name: subversion -Version: 1.6.5 -Release: 3%{?dist} +Version: 1.6.6 +Release: 1%{?dist} License: ASL 1.1 Group: Development/Tools URL: http://subversion.tigris.org/ @@ -163,7 +163,7 @@ sed -i -e 's|-fpie|-fPIE|g' Makefile.in sed -i -e 's|^XSL="$dir/|XSL="%{_datadir}/svn2cl/|' \ contrib/client-side/svn2cl/svn2cl.sh # Sanity check svn2cl_version -v=$(contrib/client-side/svn2cl/svn2cl.sh -V | head -n 1 | awk '{ print $2 }') +v=$(contrib/client-side/svn2cl/svn2cl.sh -V | sed -n '1{s/.* //;p;}') if [ "$v" != "%{svn2cl_version}" ]; then echo -n "ERROR: svn2cl_version not up to date in specfile: " echo "'$v' <> '%{svn2cl_version}'" @@ -385,6 +385,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_mandir}/man1/svn2cl.1* %changelog +* Sun Nov 8 2009 Joe Orton - 1.6.6-1 +- update to 1.6.6 + * Mon Nov 2 2009 Ville Skyttä - 1.6.5-3 - Apply svn2cl upstream patch to fix newline issues with libxml2 2.7.4+, see http://bugs.debian.org/546990 for details. diff --git a/upstream b/upstream index b070505..398431b 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -subversion-1.6.5.tar.bz2 +subversion-1.6.6.tar.bz2