From 640267d86629f4c69105c7e9da332ee1c30003fc203c76a49c87ecc22c5cd859 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Mon, 27 Dec 2010 14:48:51 +0000
Subject: [PATCH 1/2] - fix build against 11.4

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=35
---
 subversion.changes | 5 +++++
 subversion.spec    | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/subversion.changes b/subversion.changes
index b42879e..77e089e 100644
--- a/subversion.changes
+++ b/subversion.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Dec 27 15:48:41 CET 2010 - dmueller@suse.de
+
+- fix build against 11.4
+
 -------------------------------------------------------------------
 Mon Dec  6 11:21:06 CET 2010 - dmueller@suse.de
 
diff --git a/subversion.spec b/subversion.spec
index d19da4a..c358069 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -642,6 +642,9 @@ if [ "$with_jdk" != "" ] ; then
     install -d -m 0755 $RPM_BUILD_ROOT/%{_datadir}/java
     ln -sv %{_libdir}/svn-javahl/svn-javahl.jar $RPM_BUILD_ROOT/%{_datadir}/java/svn-javahl.jar
 fi
+%if %suse_version < 1140
+rmdir %{buildroot}/var/adm/perl-modules/subversion
+%endif
 
 %check
 # Don't run regression tests on Factory, they take too long to complete.
@@ -775,7 +778,6 @@ kill -9 `cat "$SVNSERVE_PIDFILE" 2>/dev/null`
 %{_libdir}/libsvn_swig_perl-1.so.*
 %perl_vendorarch/SVN
 %perl_vendorarch/auto/SVN
-/var/adm/perl-modules/subversion
 
 %files python
 %defattr(-,root,root)

From e9b9dfb24bf1ed9f58878e2287d3ae5d01a20b7e40d5cdc11b7c85bab301f0f4 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Mon, 27 Dec 2010 15:17:17 +0000
Subject: [PATCH 2/2] its not a directory

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=36
---
 subversion.spec | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/subversion.spec b/subversion.spec
index c358069..06f92af 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -642,9 +642,7 @@ if [ "$with_jdk" != "" ] ; then
     install -d -m 0755 $RPM_BUILD_ROOT/%{_datadir}/java
     ln -sv %{_libdir}/svn-javahl/svn-javahl.jar $RPM_BUILD_ROOT/%{_datadir}/java/svn-javahl.jar
 fi
-%if %suse_version < 1140
-rmdir %{buildroot}/var/adm/perl-modules/subversion
-%endif
+rm -f %{buildroot}/var/adm/perl-modules/subversion
 
 %check
 # Don't run regression tests on Factory, they take too long to complete.