commit 7923efcae9a4cb621371419e6b72234b982806dc
Author: Jan Rękorajski <[email protected]>
Date: Mon Sep 14 14:49:58 2015 +0200
- fix linking/install on x32
- rel 2
subversion.spec | 4 +++-
x32-libdir.patch | 11 +++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/subversion.spec b/subversion.spec
index 216ccce..325c119 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -51,7 +51,7 @@ Summary(pl.UTF-8): System kontroli wersji podobny, ale
lepszy, niż CVS
Summary(pt_BR.UTF-8): Sistema de versionamento concorrente
Name: subversion
Version: 1.9.1
-Release: 1
+Release: 2
License: Apache v2.0
Group: Development/Version Control
Source0: http://www.apache.org/dist/subversion/%{name}-%{version}.tar.bz2
@@ -68,6 +68,7 @@ Patch0: %{name}-home_etc.patch
Patch1: %{name}-DESTDIR.patch
Patch2: %{name}-ruby-datadir-path.patch
Patch3: %{name}-tests.patch
+Patch4: x32-libdir.patch
URL: http://subversion.apache.org/
%{?with_apache:BuildRequires: apache-devel >= 2.4.14}
BuildRequires: apr-devel >= 1:1.3
@@ -442,6 +443,7 @@ uwierzytelniać się przy użyciu Portfela KDE.
%patch1 -p1
%patch2 -p0
%patch3 -p1
+%patch4 -p1
sed -i -e 's#serf_prefix/lib#serf_prefix/%{_lib}#g' build/ac-macros/serf.m4
diff --git a/x32-libdir.patch b/x32-libdir.patch
new file mode 100644
index 0000000..087a97c
--- /dev/null
+++ b/x32-libdir.patch
@@ -0,0 +1,11 @@
+--- subversion-1.9.1/build/ac-macros/svn-macros.m4~ 2013-08-01
12:58:09.000000000 +0200
++++ subversion-1.9.1/build/ac-macros/svn-macros.m4 2015-09-14
14:32:39.547188202 +0200
+@@ -105,7 +105,7 @@
+ [
+ input_flags="$1"
+ output_flags=""
+- filtered_dirs="/lib /lib64 /usr/lib /usr/lib64"
++ filtered_dirs="/lib /lib64 /libx32 /usr/lib /usr/lib64 /usr/libx32"
+ for flag in $input_flags; do
+ filter="no"
+ for dir in $filtered_dirs; do
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/subversion.git/commitdiff/7923efcae9a4cb621371419e6b72234b982806dc
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
