From 6a6af60919d78385ef34d83b6446f95f8c3eedbc Mon Sep 17 00:00:00 2001 From: Jarod Wilson Date: Jun 04 2008 04:31:18 +0000 Subject: - New upstream release --- diff --git a/.cvsignore b/.cvsignore index 6e9c9c6..7329642 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,4 @@ powerman-1.0.24.tar.bz2 powerman-1.0.25.tar.bz2 powerman-1.0.32.tar.bz2 +powerman-2.0.tar.bz2 diff --git a/powerman-1.0.25-optflags.patch b/powerman-1.0.25-optflags.patch deleted file mode 100644 index fe1ff8b..0000000 --- a/powerman-1.0.25-optflags.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -urp powerman-1.0.25/Makefile powerman-1.0.25-optflags/Makefile ---- powerman-1.0.25/Makefile 2006-08-16 17:22:55.000000000 -0400 -+++ powerman-1.0.25-optflags/Makefile 2007-02-04 13:18:54.000000000 -0500 -@@ -11,7 +11,7 @@ initrddir= /etc/rc.d/init.d - VERSION = $(shell perl -ne 'print,exit if s/^\s*VERSION:\s*(\S*).*/\1/i' META) - - all clean: -- (cd src && $(MAKE) $@ VERSION=$(VERSION)) -+ (cd src && $(MAKE) $@ VERSION=$(VERSION) EXTRA_CFLAGS="$(EXTRA_CFLAGS)") - (cd test && $(MAKE) $@) - - install: all -diff -urp powerman-1.0.25/src/Makefile powerman-1.0.25-optflags/src/Makefile ---- powerman-1.0.25/src/Makefile 2006-08-16 17:22:55.000000000 -0400 -+++ powerman-1.0.25-optflags/src/Makefile 2007-02-04 13:21:37.000000000 -0500 -@@ -10,6 +10,8 @@ YACC= bison - - DEFS= -DHAVE_CONFIG_H -DPOWERMAN_VERSION=\"$(VERSION)\" - CFLAGS= -g -Wall $(DEFS) -+EXTRA_CFLAGS= -+CFLAGS+= $(EXTRA_CFLAGS) - #CFLAGS+= -pg - LDADD= -lfl -lwrap -lnsl -lutil - -@@ -27,7 +29,7 @@ powermand: $(SERVER_OBJS) - $(CC) $(CFLAGS) -o $@ $(SERVER_OBJS) $(LDADD) - - powerman: $(CLIENT_OBJS) -- $(CC) -o $@ $(CLIENT_OBJS) $(LDADD) -+ $(CC) $(CFLAGS) -o $@ $(CLIENT_OBJS) $(LDADD) - - parse_lex.c: parse.lex - $(LEX) -oparse_lex.c parse.lex diff --git a/powerman-1.0.32-header-includes.patch b/powerman-1.0.32-header-includes.patch deleted file mode 100644 index 07131a7..0000000 --- a/powerman-1.0.32-header-includes.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -Naurp powerman-1.0.32.orig/src/client.c powerman-1.0.32/src/client.c ---- powerman-1.0.32.orig/src/client.c 2006-04-26 20:17:33.000000000 -0400 -+++ powerman-1.0.32/src/client.c 2008-02-13 13:25:56.000000000 -0500 -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - #include - #include -diff -Naurp powerman-1.0.32.orig/src/parse.y powerman-1.0.32/src/parse.y ---- powerman-1.0.32.orig/src/parse.y 2006-11-14 16:29:53.000000000 -0500 -+++ powerman-1.0.32/src/parse.y 2008-02-13 13:29:37.000000000 -0500 -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - - #include "powerman.h" - #include "list.h" -diff -Naurp powerman-1.0.32.orig/src/powerman.c powerman-1.0.32/src/powerman.c ---- powerman-1.0.32.orig/src/powerman.c 2004-02-20 11:51:06.000000000 -0500 -+++ powerman-1.0.32/src/powerman.c 2008-02-13 13:28:36.000000000 -0500 -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - - #include "powerman.h" - #include "wrappers.h" -diff -Naurp powerman-1.0.32.orig/src/powermand.c powerman-1.0.32/src/powermand.c ---- powerman-1.0.32.orig/src/powermand.c 2004-02-20 11:51:06.000000000 -0500 -+++ powerman-1.0.32/src/powermand.c 2008-02-13 13:28:47.000000000 -0500 -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - - #include "powerman.h" - #include "list.h" -diff -Naurp powerman-1.0.32.orig/src/wrappers.c powerman-1.0.32/src/wrappers.c ---- powerman-1.0.32.orig/src/wrappers.c 2005-03-09 06:11:46.000000000 -0500 -+++ powerman-1.0.32/src/wrappers.c 2008-02-13 14:19:45.000000000 -0500 -@@ -29,6 +29,7 @@ - #include "config.h" - #endif - -+#define _GNU_SOURCE /* needed for regex.h */ - #include - #include - #include -@@ -38,6 +39,8 @@ - #include - #include - #include -+#include -+#include - #include - #include - #if HAVE_POLL diff --git a/powerman.spec b/powerman.spec index c869156..8aefb10 100644 --- a/powerman.spec +++ b/powerman.spec @@ -1,14 +1,12 @@ Name: powerman -Version: 1.0.32 -Release: 5%{?dist} -Summary: PowerMan - Power to the Cluster +Version: 2.0 +Release: 1%{?dist} +Summary: PowerMan - Power to the Cluster Group: Applications/System License: GPL Url: http://sourceforge.net/projects/powerman Source0: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 -Patch1: powerman-1.0.25-optflags.patch -Patch2: powerman-1.0.32-header-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex bison readline-devel @@ -18,7 +16,7 @@ BuildRequires: tcp_wrappers BuildRequires: tcp_wrappers-devel %endif -%if "%{?fedora}" >= "9" +%if 0%{?fedora} >= 9 BuildRequires: libcurl-devel BuildRequires: ncurses-devel %else @@ -33,14 +31,12 @@ Expect-like configurability simplifies the addition of new devices. %prep %setup -q -# Honor $RPM_OPT_FLAGS -%patch1 -p1 -b .optflags -%patch2 -p1 -b .headers %if "%{?fedora}" >= "9" sed -i -e 's/termcap/ncurses/g' src/Makefile %endif %build +%configure --with-httppower --with-genders # parallel makes often fail make -e VERSION=%{version} EXTRA_CFLAGS="$RPM_OPT_FLAGS" @@ -57,7 +53,7 @@ cp examples/%{name}.conf-small \ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/* # Don't turn on by default %{__perl} -pi -e 's|chkconfig:.*95 5|chkconfig: - 95 5|g' \ - $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name} + $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name} %clean rm -rf $RPM_BUILD_ROOT @@ -88,9 +84,12 @@ fi %dir %{_sysconfdir}/%{name}/ %config(noreplace) %{_sysconfdir}/%{name}/* %{_mandir}/man*/* -%{_initrddir}/%{name} +%{_sysconfdir}/init.d/%{name} %changelog +* Wed Jun 04 2008 Jarod Wilson 2.0-1 +- New upstream release + * Wed Feb 13 2008 Jarod Wilson 1.0.32-5 - Fix up header includes to build w/gcc 4.3 diff --git a/sources b/sources index 6717aaf..7fa3336 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c38279970bc588ff3a8797679d970ab6 powerman-1.0.32.tar.bz2 +09dd5f064fed72af7698a5a6338e1d62 powerman-2.0.tar.bz2