Author: glen Date: Thu Nov 26 20:58:17 2009 GMT Module: packages Tag: HEAD ---- Log message: - makefile that one could send upstream
---- Files affected: packages/nmon: nmon.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: packages/nmon/nmon.spec diff -u packages/nmon/nmon.spec:1.6 packages/nmon/nmon.spec:1.7 --- packages/nmon/nmon.spec:1.6 Thu Nov 26 20:40:23 2009 +++ packages/nmon/nmon.spec Thu Nov 26 21:58:12 2009 @@ -7,24 +7,27 @@ Group: Applications/System URL: http://nmon.sourceforge.net/pmwiki.php BuildRequires: ncurses-devel -Source0: http://downloads.sourceforge.net/project/nmon/lmon%{version}.c +Source0: http://dl.sourceforge.net/project/nmon/lmon%{version}.c # Source0-md5: 36da7485cc16dccbd6f840359c76ad83 -Source1: http://downloads.sourceforge.net/project/nmon/Documentation.txt +Source1: http://dl.sourceforge.net/project/nmon/Documentation.txt # Source1-md5: dbb13658cf55d687c4f2ff771a696d4a -BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) - ExclusiveArch: %{ix86} %{x8664} ppc ppc64 +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description nmon is designed for performance specialists to use for monitoring and analyzing performance data. %prep -%setup -q -T -c +%setup -qcT install %{SOURCE0} nmon.c install %{SOURCE1} . cat <<'EOF' > Makefile +LIBS := -lncurses +OPTFLAGS := -O2 +CFLAGS := -Wall -I/usr/include/ncurses -D JFS -D GETUSER -D LARGEMEM $(OPTFLAGS) + nmon: nmon.o $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) EOF @@ -32,13 +35,12 @@ %build %{__make} nmon \ CC="%{__cc}" \ - CFLAGS="%{rpmcflags} -Wall -I/usr/include/ncurses -D JFS -D GETUSER -D LARGEMEM" \ - LDFLAGS="%{rpmldflags}" \ - LIBS="-lncurses" + OPTFLAGS="%{rpmcflags}" \ + LDFLAGS="%{rpmldflags}" %install rm -rf $RPM_BUILD_ROOT -install -D nmon $RPM_BUILD_ROOT%{_bindir}/nmon +install -p -D nmon $RPM_BUILD_ROOT%{_bindir}/nmon %clean rm -rf $RPM_BUILD_ROOT @@ -54,6 +56,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.7 2009/11/26 20:58:12 glen +- makefile that one could send upstream + Revision 1.6 2009/11/26 19:40:23 sparky - use minimal makefile ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nmon/nmon.spec?r1=1.6&r2=1.7&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
