- up to 1.1.3

diff --git a/cacti-spine-paths.patch b/cacti-spine-paths.patch
index a2cd1737be8a4bb73f99c35cd71e447cdb4cff8c..6d2d4650c4812db9489762f86b20ef50d1a3ecb3 100644 (file)
--- a/cacti-spine-paths.patch
+++ b/cacti-spine-paths.patch
@@ -42,17 +42,28 @@
  }
 --- cacti-spine-0.8.8f/spine.conf.dist~        2015-07-20 04:59:09.000000000 +0300
 +++ cacti-spine-0.8.8f/spine.conf.dist 2016-01-19 11:37:46.898998318 +0200
-@@ -30,8 +30,8 @@
- # | SNMP_Clientaddr Bind SNMP to a specific address for sites that use      |
- # |                 higher security levels                                  |
+@@ -30,14 +30,14 @@
+ # | RDB_Pass        The remote database password.                           |
  # +-------------------------------------------------------------------------+
--DB_Host         localhost
--DB_Database     cacti
--DB_User         cactiuser
--DB_Pass         cactiuser
--DB_Port         3306
-+#DB_Host         localhost
-+#DB_Database     cacti
-+#DB_User         cactiuser
-+#DB_Pass         cactiuser
-+#DB_Port         3306
+ 
+-DB_Host                       localhost
+-DB_Database           cacti
+-DB_User                       cactiuser
+-DB_Pass                       cactiuser
+-DB_Port                       3306
++#DB_Host                      localhost
++#DB_Database          cacti
++#DB_User                      cactiuser
++#DB_Pass                      cactiuser
++#DB_Port                      3306
+ 
+-RDB_Host              localhost
+-RDB_Database          cacti
+-RDB_User              cactiuser
+-RDB_Pass              cactiuser
+-RDB_Port              3306
++#RDB_Host             localhost
++#RDB_Database         cacti
++#RDB_User             cactiuser
++#RDB_Pass             cactiuser
++#RDB_Port             3306

diff --git a/cacti-spine.spec b/cacti-spine.spec
index 5e4f99144170202b802834c58e5fe1df7ec1018e..c1a03fb7b9fdfc0068b2b584009c681a32e8e602 100644 (file)
--- a/cacti-spine.spec
+++ b/cacti-spine.spec
@@ -1,8 +1,3 @@
-# TODO
-# - -lcap link fail:
-#spine.o: In function `drop_root':
-#/home/users/glen/rpm/packages/BUILD.x86_64-linux/cacti-spine-0.8.8f/spine.c:133: undefined reference to `cap_from_text'
-# - http://bugs.cacti.net/view.php?id=2650
 #
 # Conditional build:
 %bcond_without cap             # Enable support for the Linux Capabilities (default: disabled)
@@ -10,14 +5,13 @@
 Summary:       A backend data gatherer for Cacti
 Summary(pl.UTF-8):     Backend gromadzący dane dla Cacti
 Name:          cacti-spine
-Version:       0.8.8g
-Release:       0.1
+Version:       1.1.3
+Release:       1
 License:       GPL
 Group:         Daemons
 Source0:       http://www.cacti.net/downloads/spine/%{name}-%{version}.tar.gz
-# Source0-md5: 9e90936b950a7a353b31bf16ff7798f4
+# Source0-md5: 0a21b836cc0a1bed438bdad3635f975f
 Patch0:                %{name}-paths.patch
-Patch2:                man-dep.patch
 # Official patches http://www.cacti.net/spine_download_patches.php
 URL:           http://www.cacti.net/
 BuildRequires: autoconf
@@ -52,7 +46,6 @@ procesorem cmd.php.
 %prep
 %setup -q
 %patch0 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -80,6 +73,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README
+%doc README.md
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/spine.conf
 %attr(755,root,root) %{_sbindir}/cacti-poller-spine
+%{_mandir}/man1/spine.1*

diff --git a/man-dep.patch b/man-dep.patch
deleted file mode 100644 (file)
index fd7c98b..0000000
--- a/man-dep.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://bugs.cacti.net/view.php?id=2663
-
---- cacti-spine-0.8.8g/Makefile.am~    2016-02-22 03:49:22.000000000 +0200
-+++ cacti-spine-0.8.8g/Makefile.am     2016-02-25 23:12:58.718455284 +0200
-@@ -9,5 +9,5 @@
- 
- man_MANS = spine.1
- 
--spine.1: spine.c 
--      $(HELP2MAN) --output=$@ --name='Data Collector for Cacti' --no-info --version-option='--version' ./spine
-+spine.1: spine
-+      $(HELP2MAN) --output=$@ --name='Data Collector for Cacti' --no-info --version-option='--version' ./$<