[packages/cacti-spine] drop outdated x32.patch
glen
glen at pld-linux.org
Thu Feb 25 22:31:40 CET 2016
commit 3bc11fce3ae046db9fff6fcc808ba2f08d21d3b6
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Feb 25 23:31:23 2016 +0200
drop outdated x32.patch
cacti-spine.spec | 4 ----
x32.patch | 31 -------------------------------
2 files changed, 35 deletions(-)
---
diff --git a/cacti-spine.spec b/cacti-spine.spec
index bdffa8a..5e4f991 100644
--- a/cacti-spine.spec
+++ b/cacti-spine.spec
@@ -17,7 +17,6 @@ Group: Daemons
Source0: http://www.cacti.net/downloads/spine/%{name}-%{version}.tar.gz
# Source0-md5: 9e90936b950a7a353b31bf16ff7798f4
Patch0: %{name}-paths.patch
-Patch1: x32.patch
Patch2: man-dep.patch
# Official patches http://www.cacti.net/spine_download_patches.php
URL: http://www.cacti.net/
@@ -53,9 +52,6 @@ procesorem cmd.php.
%prep
%setup -q
%patch0 -p1
-%ifarch x32
-%patch1 -p1
-%endif
%patch2 -p1
%build
diff --git a/x32.patch b/x32.patch
deleted file mode 100644
index 1be2390..0000000
--- a/x32.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- cacti-spine-0.8.8c/configure.ac~ 2014-11-17 06:14:05.000000000 +0000
-+++ cacti-spine-0.8.8c/configure.ac 2015-04-06 21:30:05.950921974 +0000
-@@ -226,6 +226,8 @@
- fi
-
- for i in $MYSQL_DIR /usr /usr/local /opt /opt/mysql /usr/pkg /usr/local/mysql; do
-+ MYSQL_LIB_CHK($i/libx32)
-+ MYSQL_LIB_CHK($i/libx32/mysql)
- MYSQL_LIB_CHK($i/lib64)
- MYSQL_LIB_CHK($i/lib64/mysql)
- MYSQL_LIB_CHK($i/lib)
-@@ -257,6 +259,8 @@
- test -f $SNMP_DIR/$i/net-snmp-config.h && SNMP_INCDIR=$SNMP_DIR$i && break
- done
-
-+ test -f $SNMP_DIR/libx32/libsnmp.a -o -f $SNMP_DIR/libx32/libsnmp.$ShLib && SNMP_LIBDIR=$SNMP_DIR/libx32
-+ test -f $SNMP_DIR/libx32/libnetsnmp.a -o -f $SNMP_DIR/libx32/libnetsnmp.$ShLib && SNMP_LIBDIR=$SNMP_DIR/libx32
- # Accomodate 64-Bit Libraries
- test -f $SNMP_DIR/lib64/libsnmp.a -o -f $SNMP_DIR/lib64/libsnmp.$ShLib && SNMP_LIBDIR=$SNMP_DIR/lib64
- test -f $SNMP_DIR/lib64/libnetsnmp.a -o -f $SNMP_DIR/lib64/libnetsnmp.$ShLib && SNMP_LIBDIR=$SNMP_DIR/lib64
-@@ -278,6 +282,10 @@
- test -f $i/snmp/include/net-snmp/net-snmp-config.h && SNMP_INCDIR=$i/snmp/include/net-snmp && break
- done
-
-+ for i in /usr /usr/local /usr/pkg /usr/snmp /opt /opt/net-snmp /opt/ucd-snmp /opt/snmp /usr/local/snmp; do
-+ test -f $i/libx32/libsnmp.a -o -f $i/libx32/libsnmp.$ShLib && SNMP_LIBDIR=$i/libx32 && break
-+ test -f $i/libx32/libnetsnmp.a -o -f $i/libx32/libnetsnmp.$ShLib && SNMP_LIBDIR=$i/libx32 && break
-+ done
- # Accomodate 64-Bit Libraries
- for i in /usr /usr/local /usr/pkg /usr/snmp /opt /opt/net-snmp /opt/ucd-snmp /opt/snmp /usr/local/snmp; do
- test -f $i/lib64/libsnmp.a -o -f $i/lib64/libsnmp.$ShLib && SNMP_LIBDIR=$i/lib64 && break
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cacti-spine.git/commitdiff/3bc11fce3ae046db9fff6fcc808ba2f08d21d3b6
More information about the pld-cvs-commit
mailing list