[arch-commits] Commit in subversion/repos (3 files)

[Giovanni Scafora]

    Date: Sunday, April 12, 2009 @ 02:45:34
  Author: giovanni
Revision: 35312

Merged revisions 35305 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/subversion/trunk

........
  r35305 | douglas | 2009-04-11 15:06:01 -0700 (sab, 11 apr 2009) | 2 lines
  
  upgpkg: subversion 1.6.1-2
      Removing libtool files and using svnmerge from the latest subversion
........

Modified:
  subversion/repos/extra-x86_64/	(properties)
  subversion/repos/extra-x86_64/ChangeLog
  subversion/repos/extra-x86_64/PKGBUILD

-----------+
 ChangeLog |    4 ++++
 PKGBUILD  |   23 +++--------------------
 2 files changed, 7 insertions(+), 20 deletions(-)


Property changes on: subversion/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /subversion/trunk:1-34665
   + /subversion/trunk:1-35311

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2009-04-12 06:32:15 UTC (rev 35311)
+++ extra-x86_64/ChangeLog	2009-04-12 06:45:34 UTC (rev 35312)
@@ -1,4 +1,8 @@
 
+2009-04-11  Douglas Soares de Andrade  <douglas at archlinux.org>
+
+	* Removing libtool files
+
 2009-04-10  Douglas Soares de Andrade  <douglas at archlinux.org>
 
 	* Updated for i686: 1.6.1

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-04-12 06:32:15 UTC (rev 35311)
+++ extra-x86_64/PKGBUILD	2009-04-12 06:45:34 UTC (rev 35312)
@@ -4,7 +4,7 @@
 
 pkgname=subversion
 pkgver=1.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Replacement for CVS, another versioning system (svn)"
 arch=(i686 x86_64)
 license=('apache' 'bsd')
@@ -18,7 +18,7 @@
 backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
 url="http://subversion.tigris.org/"
 provides=('svn')
-options=('!makeflags' 'libtool')
+options=('!makeflags' '!libtool')
 
 build() {
    cd $startdir/src/${pkgname}-${pkgver}
@@ -71,28 +71,11 @@
    install -m 755 $startdir/src/svnserve $startdir/pkg/etc/rc.d
    install -m 644 $startdir/src/svn $startdir/pkg/etc/xinetd.d
    install -m 644 $startdir/src/svnserve.conf $startdir/pkg/etc/conf.d/svnserve
-   install -m 755 $startdir/src/svnmerge.py $pkgdir/usr/bin/svnmerge
-   #install -m 755 $startdir/src/subversion-$pkgver/contrib/client-side/svnmerge/svnmerge.py $startdir/pkg/usr/bin/svnmerge
+   install -m 755 $startdir/src/subversion-$pkgver/contrib/client-side/svnmerge/svnmerge.py $startdir/pkg/usr/bin/svnmerge
    install -D -m 644 $startdir/src/subversion-$pkgver/COPYING $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
-
-   #libtoolslay not all because of kdesdk
-   find ${startdir}/pkg/usr/lib/httpd/modules -name '*.la' -exec rm {} \;
-   find ${startdir}/pkg/usr/lib/ruby -name '*.la' -exec rm {} \;
-   find ${startdir}/pkg/usr/lib/python2.6 -name '*.la' -exec rm {} \;
 }
-md5sums=('b74985c9191d4a652a9f618a06171880'
-         'c5a2e490b3e58c6bd2ca3a2e72b71845'
-         'a0db6dd43af33952739b6ec089852630'
-         'c459e299192552f61578f3438abf0664'
-         '9540c341d669b3cdc27dcf2d36727aee')
 md5sums=('32014fe70397357fa1e0ef8f937a0232'
-         '86b500a8e10bb88f3d48c69774ab7049'
          'c5a2e490b3e58c6bd2ca3a2e72b71845'
          'a0db6dd43af33952739b6ec089852630'
          'c459e299192552f61578f3438abf0664'
          '9540c341d669b3cdc27dcf2d36727aee')
-md5sums=('32014fe70397357fa1e0ef8f937a0232'
-         'c5a2e490b3e58c6bd2ca3a2e72b71845'
-         'a0db6dd43af33952739b6ec089852630'
-         'c459e299192552f61578f3438abf0664'
-         '9540c341d669b3cdc27dcf2d36727aee')