add patch tagging and move patch back

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=188
This commit is contained in:
2014-11-20 19:02:06 +00:00
committed by Git OBS Bridge
parent 99af2e4da4
commit 4807fd77f9
2 changed files with 20 additions and 6 deletions

View File

@@ -1,7 +1,21 @@
diff -Ndur subversion-1.8.10/tools/hook-scripts/mailer/tests/mailer-init.sh subversion-1.8.10-fix-bashisms/tools/hook-scripts/mailer/tests/mailer-init.sh
--- subversion-1.8.10/tools/hook-scripts/mailer/tests/mailer-init.sh 2013-02-25 05:30:54.000000000 +0200
+++ subversion-1.8.10-fix-bashisms/tools/hook-scripts/mailer/tests/mailer-init.sh 2014-11-20 02:03:58.000000000 +0200
@@ -101,14 +101,14 @@
From: Oleksandr Chumachenko <ledest@gmail.com>
Date: Thu, 20 Nov 2014 18:58:48 +0000
Subject: [PATCH] Remove bashism in mailer.py test suite
References:
Upstream: submitting
* mailer/tests/mailer-init.sh
Change echo -e to more portable printf
---
tools/hook-scripts/mailer/tests/mailer-init.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: subversion-1.8.10/tools/hook-scripts/mailer/tests/mailer-init.sh
===================================================================
--- subversion-1.8.10.orig/tools/hook-scripts/mailer/tests/mailer-init.sh 2013-02-25 03:30:54.000000000 +0000
+++ subversion-1.8.10/tools/hook-scripts/mailer/tests/mailer-init.sh 2014-11-20 19:00:52.000000000 +0000
@@ -101,14 +101,14 @@ echo change C6 >> dir6/file4
svn commit -m "copy dir, then make a change"
# add a binary file and set property to binary value

View File

@@ -58,7 +58,6 @@ Source43: subversion.svndiff.sh
Source50: subversion.keyring
Source51: https://www.apache.org/dist/subversion/%{name}-%{version}.tar.bz2.asc
Source92: %{name}.rpmlintrc
Patch10: subversion-1.8.10-fix-bashisms.patch
Patch11: subversion.libtool-verbose.patch
Patch20: subversion-swig-perl-install_vendor.patch
Patch23: subversion-swig-perl-Wall.patch
@@ -67,6 +66,7 @@ Patch37: subversion-no-build-date.patch
Patch38: subversion-1.8.9-allow-httpd-2.4.6.patch
Patch39: subversion-fix-parallel-build-support-for-perl-bindings.patch
Patch40: subversion-perl-underlinking.patch
Patch41: subversion-1.8.10-fix-bashisms.patch
BuildRequires: apache2-devel
BuildRequires: apache2-prefork
BuildRequires: cyrus-sasl-devel
@@ -225,7 +225,6 @@ parameters and keywords for the svn command and other tools.
%prep
%setup -q -n subversion-%{version} -a 4
%patch10 -p1
%patch11 -p1
%patch20 -p1
%patch23 -p1
@@ -234,6 +233,7 @@ parameters and keywords for the svn command and other tools.
%patch38 -p1
%patch39
%patch40 -p1
%patch41 -p1
%build
# Re-boot strap, needed for patch37