rpms/powerman/FC-6 powerman-1.0.25-optflags.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 powerman.spec, 1.3, 1.4 sources, 1.2, 1.3
Jarod Wilson (jwilson)
fedora-extras-commits at redhat.com
Wed Feb 7 17:07:19 UTC 2007
- Previous message: rpms/powerman/devel powerman-1.0.25-optflags.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 powerman.spec, 1.3, 1.4 sources, 1.2, 1.3
- Next message: rpms/powerman/FC-6 powerman.spec,1.4,1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwilson
Update of /cvs/extras/rpms/powerman/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22263
Modified Files:
.cvsignore powerman.spec sources
Added Files:
powerman-1.0.25-optflags.patch
Log Message:
New upstream release, powerman v1.0.25
powerman-1.0.25-optflags.patch:
--- NEW FILE powerman-1.0.25-optflags.patch ---
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
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/powerman/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 19 Jun 2006 14:50:53 -0000 1.2
+++ .cvsignore 7 Feb 2007 17:06:47 -0000 1.3
@@ -1 +1,2 @@
powerman-1.0.24.tar.bz2
+powerman-1.0.25.tar.bz2
Index: powerman.spec
===================================================================
RCS file: /cvs/extras/rpms/powerman/FC-6/powerman.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- powerman.spec 5 Sep 2006 14:49:28 -0000 1.3
+++ powerman.spec 7 Feb 2007 17:06:47 -0000 1.4
@@ -1,16 +1,21 @@
Name: powerman
-Version: 1.0.24
-Release: 3%{?dist}
+Version: 1.0.25
+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
-Source1: icebox4.dev
+Patch1: powerman-1.0.25-optflags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: tcp_wrappers flex bison
+BuildRequires: flex bison
+%if "%{?fedora}" <= "6"
+BuildRequires: tcp_wrappers
+%else
+BuildRequires: tcp_wrappers-devel
+%endif
%description
PowerMan is a tool for manipulating remote power control (RPC) devices from a
@@ -19,10 +24,12 @@
%prep
%setup -q
+# Honor $RPM_OPT_FLAGS
+%patch1 -p1 -b .optflags
%build
# parallel makes often fail
-VERSION=%{version} CFLAGS="$RPM_OPT_FLAGS" make
+make -e VERSION=%{version} EXTRA_CFLAGS="$RPM_OPT_FLAGS"
%install
rm -rf $RPM_BUILD_ROOT
@@ -30,8 +37,6 @@
# work around a problem in the install make file target
rm $RPM_BUILD_ROOT/%{_bindir}/pm
pushd $RPM_BUILD_ROOT/%{_bindir};ln -s powerman pm; popd
-# add Linux Networx IceBox v4 device file
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
# install a default config file
cp examples/%{name}.conf-small \
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
@@ -72,6 +77,10 @@
%{_initrddir}/%{name}
%changelog
+* Mon Feb 05 2007 Jarod Wilson <jwilson at redhat.com> 1.0.25-1
+- New upstream release
+- Fixed up compile flags
+
* Tue Sep 05 2006 Jarod Wilson <jwilson at redhat.com> 1.0.24-3
- Rebuild for new glibc
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/powerman/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 19 Jun 2006 14:50:53 -0000 1.2
+++ sources 7 Feb 2007 17:06:47 -0000 1.3
@@ -1 +1 @@
-a903511e470cb3be005075ebc739048e powerman-1.0.24.tar.bz2
+22af8e73d79cb7810e3b0ae3b1c16564 powerman-1.0.25.tar.bz2
- Previous message: rpms/powerman/devel powerman-1.0.25-optflags.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 powerman.spec, 1.3, 1.4 sources, 1.2, 1.3
- Next message: rpms/powerman/FC-6 powerman.spec,1.4,1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list