diff --git a/.gitignore b/.gitignore index afee675..a7a450d 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /ledmon-0.78.tar.gz /ledmon-0.79.tar.gz /ledmon-0.80.tar.gz +/ledmon-0.90.tar.gz diff --git a/ledmon.spec b/ledmon.spec index 08f449f..d4d9732 100644 --- a/ledmon.spec +++ b/ledmon.spec @@ -1,14 +1,17 @@ Summary: Enclosure LED Utilities Name: ledmon -Version: 0.80 -Release: 6%{?dist} +Version: 0.90 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System -URL: http://sourceforge.net/projects/ledmon/ -Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +URL: https://github.com/intel/ledmon +Source0: https://github.com/intel/ledmon/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz + Patch0: ledmon_cflags.patch BuildRequires: perl-interpreter BuildRequires: sg3_utils-devel +# Needed for the udev dependency. +BuildRequires: systemd-devel Obsoletes: ledctl = 0.1-1 Provides: ledctl = %{version}-%{release} Requires: sg3_utils-libs @@ -38,6 +41,9 @@ make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT SBIN_DIR=$RPM_BUI %{_mandir}/*/* %changelog +* Wed Mar 14 2018 Jan Synáček - 0.90-1 +- update to 0.90 (#1555099) + * Mon Feb 26 2018 Jan Synáček - 0.80-6 - use distribution LDFLAGS during build (#1548551) diff --git a/ledmon_cflags.patch b/ledmon_cflags.patch index 81e9a98..a049b52 100644 --- a/ledmon_cflags.patch +++ b/ledmon_cflags.patch @@ -1,18 +1,18 @@ ---- ledmon-0.80/src/Makefile 2016-11-25 13:59:48.000000000 +0100 -+++ ledmon-0.80-new/src/Makefile 2018-02-26 13:06:00.911085377 +0100 -@@ -57,15 +57,10 @@ LEDCTL_OBJECTS=\ - $(OUTDIR)/ledctl.o \ - $(OBJECTS) +--- ledmon-0.90/src/Makefile 2018-02-14 12:26:04.000000000 +0100 ++++ ledmon-0.90-new/src/Makefile 2018-03-14 09:45:12.887450849 +0100 +@@ -64,15 +64,10 @@ TEST_CONFIG_OBJECTS=\ + $(OUTDIR)/list.o \ + $(OUTDIR)/utils.o --CXFLAGS=-O0 -g +-CXFLAGS=-O0 -g -std=gnu99 -CWFLAGS=-Wall -CFLAGS=$(CXFLAGS) $(CWFLAGS) - - DEFFLAGS=-D_DEBUG -D_GNU_SOURCE -D_BSD_SOURCE -DDMALLOC_DISABLE + DEFFLAGS=-D_DEBUG -D_GNU_SOURCE -D_DEFAULT_SOURCE -DDMALLOC_DISABLE CPPFLAGS=$(DEFFLAGS) ALL_CPPFLAGS=$(CPPFLAGS) -I../config -LDFLAGS=$(CXFLAGS) - LDLIBS=-lsgutils2 + LDLIBS=-lsgutils2 -ludev SOURCES:=$(shell find -name "*.[cC]" -print) diff --git a/sources b/sources index 36753a8..6ae0108 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bb7368117320d8d2b2c9403f0f3530a2 ledmon-0.80.tar.gz +SHA512 (ledmon-0.90.tar.gz) = 9b97b254d1aa54624743293d4c77829e87674ea213da746133473152455bd34e61e456dd7c53eb5d66e5a90fd0927629130965e3bf0a81bf239fe97a2b2b92a4