From dcb0eefaad6a12dbc1f848ca52dada85039f0bb9 Mon Sep 17 00:00:00 2001
From: Michal Sekletar <msekleta@redhat.com>
Date: Wed, 3 Jul 2013 17:11:36 +0200
Subject: [PATCH] Update to 0.78

Upstream dropped std=c99 from compiler flags and fixed code which
required c99 support to be enabled, upstream commit d0448d. Fixup
our patch, thus it applies cleanly.

Dropped unnecessary patch.
---
 .gitignore          |  1 +
 ledmon-doc.patch    | 39 ---------------------------------------
 ledmon.spec         | 11 ++++++-----
 ledmon_cflags.patch |  2 +-
 sources             |  2 +-
 5 files changed, 9 insertions(+), 46 deletions(-)
 delete mode 100644 ledmon-doc.patch

diff --git a/.gitignore b/.gitignore
index cf40594..98386a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /ledmon-0.74.tar.bz2
 /ledmon-0.75.tar.gz
 /ledmon-0.77.tar.gz
+/ledmon-0.78.tar.gz
diff --git a/ledmon-doc.patch b/ledmon-doc.patch
deleted file mode 100644
index 039527f..0000000
--- a/ledmon-doc.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-ledctl documentation improvements
-
-Remove invalid option from the manpage. Show short options in usage().
-
-Author: Jan Synacek <jsynacek@redhat.com>
-
---- ledmon-0.77/doc/ledctl.pod	2013-02-12 14:45:22.000000000 +0100
-+++ ledmon-0.77/doc/ledctl.pod.new	2013-04-19 10:25:41.784551587 +0200
-@@ -258,11 +258,6 @@
- Sets a path to local log file. If this option is specified the global log
- file F</var/log/ledctl.log> is not used.
- 
--=item B<--quiet>
--
--Turns off all messages sent to C<stdout> or C<stderr> out. The messages
--will be still logged to local file and syslog facility.
--
- =item B<-h> or B<--help>
- 
- Prints this text out and exits.
---- ledmon-0.77/src/ledctl.c	2013-02-12 14:45:28.000000000 +0100
-+++ ledmon-0.77/src/ledctl.c.new	2013-04-19 10:28:07.895707605 +0200
-@@ -179,13 +179,13 @@
- 	printf("Mandatory arguments for long options are mandatory for" \
- 	       " short options, too.\n\n");
- 	printf
--	    ("--log=PATH\t\t\t  Use local log file instead\n" \
-+	    ("--log=PATH,  -l PATH\t\t  Use local log file instead\n" \
- 	     "\t\t\t\t  /var/log/ledctl.log global file.\n");
- 	printf("--config=PATH,  -c PATH\t\t  Use alternate configuration" \
- 	       " file (not yet\n\t\t\t\t  implemented).\n");
--	printf("--help\t\t\t\t  Displays this help text.\n");
-+	printf("--help,  -h\t\t\t  Displays this help text.\n");
- 	printf
--	    ("--version\t\t\t  Displays version and license information.\n\n");
-+	    ("--version,  -v\t\t\t  Displays version and license information.\n\n");
- 	printf("Patterns:\n"
- 	       "\tCommon patterns are:\n"
- 	       "\t\tlocate, locate_off, normal, off, degraded, rebuild,\n" ""
diff --git a/ledmon.spec b/ledmon.spec
index f2c6642..ae5f3a1 100644
--- a/ledmon.spec
+++ b/ledmon.spec
@@ -1,13 +1,12 @@
 Summary: Enclosure LED Utilities
 Name: ledmon
-Version: 0.77
+Version: 0.78
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://sourceforge.net/projects/ledmon/
 Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0: ledmon_cflags.patch
-Patch1: ledmon-doc.patch
 BuildRequires: perl
 BuildRequires: sg3_utils-devel
 Obsoletes: ledctl = 0.1-1
@@ -22,13 +21,12 @@ types of system: 2-LED system (Activity LED, Status LED) and 3-LED system
 use this application.
 
 %prep
-%setup -q
+%setup -q -n ledmon
 %patch0 -p1 -b .cflags
-%patch1 -p1 -b .doc
 
 %build
 # can't use smp_flags because -j4 makes the build fail
-make CFLAGS="$RPM_OPT_FLAGS --std=c99"
+make CFLAGS="$RPM_OPT_FLAGS"
 
 %install
 make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT SBIN_DIR=$RPM_BUILD_ROOT/%{_sbindir} MANDIR=$RPM_BUILD_ROOT%{_mandir}
@@ -40,6 +38,9 @@ make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT SBIN_DIR=$RPM_BUI
 %{_mandir}/*/*
 
 %changelog
+* Wed Jul 03 2013 Michal Sekletar <msekleta@redhat.com> - 0.78-1
+- Update to 0.78
+
 * Fri Apr 19 2013 Jan Synáček <jsynacek@redhat.com> - 0.77-1
 - Update to 0.77
 - Documentation enhancements
diff --git a/ledmon_cflags.patch b/ledmon_cflags.patch
index 13a7755..9980b01 100644
--- a/ledmon_cflags.patch
+++ b/ledmon_cflags.patch
@@ -4,7 +4,7 @@
  	$(OUTDIR)/ledctl.o	\
  	$(OBJECTS)
  
--CFLAGS=-O0 -g -Wall -std=c99
+-CFLAGS=-O0 -g -Wall
  DEFFLAGS=-D_DEBUG -D_GNU_SOURCE -D_BSD_SOURCE -DDMALLOC_DISABLE
  INCFLAGS=-I../config
  LDFLAGS=-O0 -g $(DEFFLAGS) -lsgutils2
diff --git a/sources b/sources
index ac71ca3..59a0c18 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-10ab3269eacc3a602346c27e056d872f  ledmon-0.77.tar.gz
+b9593298a83d93048536927cb0516846  ledmon-0.78.tar.gz