From fa85306153835641dee48fbb555cd4d2ac6b600fab821cf229584e8004d2ab05 Mon Sep 17 00:00:00 2001
From: Thomas Renninger <trenn@suse.com>
Date: Fri, 23 Mar 2012 16:15:39 +0000
Subject: [PATCH] - Adjust source url, downloadable tarballs moved from
 zresearch   to ftp.gnu.org - Update to 1.1.3

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/freeipmi?expand=0&rev=4
---
 adapt_to_suse_docdir.patch | 70 --------------------------------------
 freeipmi-1.1.2.tar.bz2     |  3 --
 freeipmi-1.1.3.tar.gz      |  3 ++
 freeipmi.changes           |  7 ++++
 freeipmi.spec              | 10 ++----
 5 files changed, 12 insertions(+), 81 deletions(-)
 delete mode 100644 adapt_to_suse_docdir.patch
 delete mode 100644 freeipmi-1.1.2.tar.bz2
 create mode 100644 freeipmi-1.1.3.tar.gz

diff --git a/adapt_to_suse_docdir.patch b/adapt_to_suse_docdir.patch
deleted file mode 100644
index 22263e9..0000000
--- a/adapt_to_suse_docdir.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From: Thomas Renninger <trenn@suse.de>
-Subject: Do not override docdir
-
-./configure --docdir=
-does not work. Simply removing the override
-makes it use the default docdir.
-Also use $docdir in subfolders.
-
----
- Makefile.am         |    1 -
- contrib/Makefile.am |    8 ++++----
- doc/Makefile.am     |    2 --
- 3 files changed, 4 insertions(+), 7 deletions(-)
-
-Index: contrib/Makefile.am
-===================================================================
---- contrib/Makefile.am.orig
-+++ contrib/Makefile.am
-@@ -1,22 +1,22 @@
--ganglia_docdir = $(datadir)/doc/$(PACKAGE)/contrib/ganglia
-+ganglia_docdir = $(docdir)/contrib/ganglia
- 
- ganglia_doc_DATA = \
- 	ganglia/README \
- 	ganglia/ganglia_ipmi_sensors.pl
- 
--libipmimonitoring_docdir = $(datadir)/doc/$(PACKAGE)/contrib/libipmimonitoring
-+libipmimonitoring_docdir = $(docdir)/contrib/libipmimonitoring
- 
- libipmimonitoring_doc_DATA = \
- 	libipmimonitoring/ipmimonitoring-sel.c \
- 	libipmimonitoring/ipmimonitoring-sensors.c
- 
--nagios_docdir = $(datadir)/doc/$(PACKAGE)/contrib/nagios
-+nagios_docdir = $(docdir)/contrib/nagios
- 
- nagios_doc_DATA = \
- 	nagios/README \
- 	nagios/nagios_ipmi_sensors.pl
- 
--pet_docdir = $(datadir)/doc/$(PACKAGE)/contrib/pet
-+pet_docdir = $(docdir)/contrib/pet
- 
- pet_doc_DATA = \
- 	pet/README \
-Index: Makefile.am
-===================================================================
---- Makefile.am.orig
-+++ Makefile.am
-@@ -79,7 +79,6 @@ EXTRA = \
- 	DISCLAIMER.ipmidetect.UC \
- 	DISCLAIMER.ipmi-fru.UC
- 
--docdir   = $(datadir)/doc/$(PACKAGE)
- doc_DATA = $(EXTRA)
- 
- CLEANFILES =
-Index: doc/Makefile.am
-===================================================================
---- doc/Makefile.am.orig
-+++ doc/Makefile.am
-@@ -13,8 +13,6 @@ EXTRA_DIST = \
- 	freeipmi-bugs-issues-and-workarounds.txt \
- 	freeipmi-oem-documentation-requirements.txt
- 
--docdir = $(datadir)/doc/$(PACKAGE)
--
- doc_DATA = $(EXTRA_DIST)
- 
- 
diff --git a/freeipmi-1.1.2.tar.bz2 b/freeipmi-1.1.2.tar.bz2
deleted file mode 100644
index e700846..0000000
--- a/freeipmi-1.1.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0bb0a9eac9c720337000c588ee34d4d961f13299f90124f4192cbdc4cc2484e9
-size 2236615
diff --git a/freeipmi-1.1.3.tar.gz b/freeipmi-1.1.3.tar.gz
new file mode 100644
index 0000000..ac4c8bf
--- /dev/null
+++ b/freeipmi-1.1.3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b34e273b72ad7c4fc7a8b6c9a79e60f95af51fd6a13658f078e932347fe76a86
+size 3055789
diff --git a/freeipmi.changes b/freeipmi.changes
index 795073a..2f9b523 100644
--- a/freeipmi.changes
+++ b/freeipmi.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Mar 23 16:14:28 UTC 2012 - trenn@suse.de
+
+- Adjust source url, downloadable tarballs moved from zresearch
+  to ftp.gnu.org
+- Update to 1.1.3
+
 -------------------------------------------------------------------
 Mon Mar 19 10:14:02 UTC 2012 - trenn@suse.de
 
diff --git a/freeipmi.spec b/freeipmi.spec
index d6fb08b..12e9708 100644
--- a/freeipmi.spec
+++ b/freeipmi.spec
@@ -18,7 +18,7 @@
 
 
 %define name freeipmi
-%define version 1.1.2
+%define version 1.1.3
 %if %{?_with_debug:1}%{!?_with_debug:0}
 %define release 1.debug%{?dist}
 %else
@@ -31,11 +31,8 @@ Release:        %{release}
 License:        GPL-3.0+
 Group:          Applications/System
 Url:            http://www.gnu.org/software/freeipmi/
-Source:         ftp://ftp.zresearch.com/pub/freeipmi/%{version}/%{name}-%{version}.tar.bz2
+Source:         ftp://ftp.gnu.org/gnu/freeipmi/%{name}-%{version}.tar.gz
 Patch1:         add_default_start.patch
-%if 0%{?suse_version}
-Patch2:         adapt_to_suse_docdir.patch
-%endif
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  automake libgcrypt-devel libtool pkg-config texinfo
@@ -95,9 +92,6 @@ This service detects and monitors IPMI nodes.
 %prep
 %setup -q
 %patch1 -p0
-%if 0%{?suse_version}
-%patch2 -p0
-%endif
 
 %build
 aclocal -I config