[mantis/f12/master] Use system's NuSOAP library
Gianluca Sforna
giallu at fedoraproject.org
Mon Sep 20 22:05:53 UTC 2010
commit 0650d2fc4c58e79703200ac6f9be5a4a82d74279
Author: Gianluca Sforna <giallu at gmail.com>
Date: Mon Sep 20 23:41:30 2010 +0200
Use system's NuSOAP library
mantis-1.1.8-use_systems_nusoap.patch | 17 +++++++++++++++++
mantis.spec | 16 ++++++++++++++--
2 files changed, 31 insertions(+), 2 deletions(-)
---
diff --git a/mantis-1.1.8-use_systems_nusoap.patch b/mantis-1.1.8-use_systems_nusoap.patch
new file mode 100644
index 0000000..d72f010
--- /dev/null
+++ b/mantis-1.1.8-use_systems_nusoap.patch
@@ -0,0 +1,17 @@
+--- mantisbt-1.1.8/api/soap/mantisconnect.php 2009-04-20 15:14:00.000000000 +0200
++++ mantisbt-1.1.8.new/api/soap/mantisconnect.php 2010-09-20 23:35:00.879105159 +0200
+@@ -10,13 +10,8 @@
+ # $Id: mantisconnect.php,v 1.1 2007-07-18 06:52:47 vboctor Exp $
+ # --------------------------------------------------------
+
+- $t_current_dir = dirname( __FILE__ ) . DIRECTORY_SEPARATOR;
+- $t_nusoap_dir = $t_current_dir . 'nusoap';
+-
+ # includes nusoap classes
+- chdir( $t_nusoap_dir );
+- require_once( 'nusoap.php' );
+- chdir( $t_current_dir );
++ require_once( 'nusoap/nusoap.php' );
+
+ # create server
+ $l_oServer = new soap_server();
diff --git a/mantis.spec b/mantis.spec
index 11ffbef..b19cc76 100644
--- a/mantis.spec
+++ b/mantis.spec
@@ -6,7 +6,7 @@
Summary: Web-based issue tracking system
Name: mantis
Version: 1.1.8
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+
Group: Applications/Internet
URL: http://www.mantisbt.org/
@@ -17,6 +17,7 @@ Source1: mantis-README.Fedora
Patch0: mantis-1.1.6-install-nowriteconfig.patch
Patch1: mantis-1.1.0-noexamplecom.patch
Patch2: mantis-1.0.0rc2-noadmin.patch
+Patch3: mantis-1.1.8-use_systems_nusoap.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,6 +25,7 @@ Requires: php >= 4.3.0
Requires: php-mbstring >= 4.3.0
Requires: mantis-config
#Requires: php-adodb
+Requires: php-nusoap
%package config-httpd
Summary: Mantis configuration for Apache httpd
@@ -59,6 +61,7 @@ This package contains configuration-files for Apache httpd 2.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
cp %{SOURCE1} ./doc/README.Fedora
rm .gitignore
@@ -76,9 +79,15 @@ rm -rf "${RPM_BUILD_ROOT}"
tar cf - . | tar xf - -C ${RPM_BUILD_ROOT}%{pkgdir}
-# Remove adodb
+# Remove bundled libraries
+# adodb
# rm -rf ${RPM_BUILD_ROOT}%{pkgdir}/core/adodb
+# NuSOAP
+rm -rf ${RPM_BUILD_ROOT}%{pkgdir}/api/soap/nusoap
+
+
+
find ${RPM_BUILD_ROOT} \( \
-name '*.orig' \
-o -name '*.#.*' \
@@ -141,6 +150,9 @@ rm -rf "${RPM_BUILD_ROOT}"
%changelog
+* Mon Sep 20 2010 Gianluca Sforna <giallu at gmail.com> - 1.1.8-4
+- Use system's NuSOAP (#633011)
+
* Thu Jan 17 2010 Gianluca Sforna <giallu gmail com> - 1.1.8-3
- Tweak summary
- Don't restart apache (#552943)
More information about the scm-commits
mailing list