rpms/amtu/devel amtu-1.0.7-makefile.patch, NONE, 1.1 amtu.spec, 1.24, 1.25

Wed Jul 1 15:45:31 UTC 2009

Author: sgrubb

Update of /cvs/pkgs/rpms/amtu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1310

Modified Files:
	amtu.spec 
Added Files:
	amtu-1.0.7-makefile.patch 
Log Message:
* Wed Jul 01 2009 Steve Grubb <sgrubb at redhat.com> 1.0.7-1
- new upstream version


amtu-1.0.7-makefile.patch:

--- NEW FILE amtu-1.0.7-makefile.patch ---
diff -ur amtu-1.0.7.orig/configure.in amtu-1.0.7/configure.in
--- amtu-1.0.7.orig/configure.in	2009-07-01 10:29:09.000000000 -0400
+++ amtu-1.0.7/configure.in	2009-07-01 11:05:07.000000000 -0400
@@ -1,19 +1,14 @@
-AC_REVISION($Revision: 1.2 $)dnl
-# AC_CANONICAL_SYSTEM is deprecated in the latest version of AUTOMAKE.
-# We aren't using the latest version so we'll keep using it
-#AC_CANONICAL_TARGET
-AC_INIT(src/amtu.c)
+AC_REVISION($Revision: 1.3 $)dnl
+AC_INIT(amtu,1.0.7)
 AC_PREREQ(2.12)dnl
-AC_CONFIG_AUX_DIR(config)
-AC_CONFIG_SRCDIR(src/amtu.c)
 AM_CONFIG_HEADER(config.h)
 
-VERSION=1.0.6
-echo Configuring amtu $VERSION
-
-AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(amtu, $VERSION)
+AC_CANONICAL_TARGET
+AM_INIT_AUTOMAKE
 AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_AWK
+
 case "$target" in
 i386-* | i486-* | i586-* | i686-*) AC_DEFINE(HAVE_I86,1,NULL);;
 powerpc-*) AC_DEFINE(HAVE_PPC,1,NULL);;
@@ -25,3 +20,15 @@
 AC_CHECK_LIB(laus, laus_open)
 AC_CHECK_LIB(audit, audit_open)
 AC_OUTPUT(Makefile src/Makefile doc/Makefile)
+
+echo .
+echo "
+
+  amtu:                   $VERSION
+  Target:                 $target
+  Installation prefix:    $prefix
+  Compiler:               $CC
+  Compiler flags:
+`echo $CFLAGS | fmt -w 50 | sed 's,^,                          ,'`
+"
+
diff -ur amtu-1.0.7.orig/doc/Makefile.am amtu-1.0.7/doc/Makefile.am
--- amtu-1.0.7.orig/doc/Makefile.am	2009-07-01 10:29:09.000000000 -0400
+++ amtu-1.0.7/doc/Makefile.am	2009-07-01 10:56:52.000000000 -0400
@@ -1 +1,3 @@
+CONFIG_CLEAN_FILES = *.rej *.orig
+EXTRA_DIST = $(man_MANS)
 man_MANS = amtu.8
diff -ur amtu-1.0.7.orig/Makefile.am amtu-1.0.7/Makefile.am
--- amtu-1.0.7.orig/Makefile.am	2009-07-01 10:29:09.000000000 -0400
+++ amtu-1.0.7/Makefile.am	2009-07-01 10:36:48.000000000 -0400
@@ -1 +1,8 @@
 SUBDIRS = src doc
+EXTRA_DIST = bootstrap LICENSE CPLv1.0.htm README
+CONFIG_CLEAN_FILES = debug*.list config/*
+
+clean-generic:
+	rm -rf autom4te*.cache 
+	rm -f *.rej *.orig
+
diff -ur amtu-1.0.7.orig/src/Makefile.am amtu-1.0.7/src/Makefile.am
--- amtu-1.0.7.orig/src/Makefile.am	2009-07-01 10:29:09.000000000 -0400
+++ amtu-1.0.7/src/Makefile.am	2009-07-01 10:55:44.000000000 -0400
@@ -1,3 +1,8 @@
-AM_CPPFLAGS  = -Wall -W -Wfloat-equal -Wundef
+CLEANFILES = $(BUILT_SOURCES)
+CONFIG_CLEAN_FILES = *.loT *.rej *.orig
+AM_CFLAGS  = -Wall -W -Wfloat-equal -Wundef
+INCLUDES = -I. -I${top_srcdir}
+noinst_HEADERS = amtu.h
 bin_PROGRAMS = amtu
 amtu_SOURCES = amtu-i86.c amtu-ppc.c amtu-s390.c amtu-ia64.c amtu.c memory.c memsep.c iodisktest.c networkio.c
+amtu_DEPENDENCIES = $(amtu_SOURCES) ${top_srcdir}/config.h


Index: amtu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amtu/devel/amtu.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- amtu.spec	24 Feb 2009 01:01:27 -0000	1.24
+++ amtu.spec	1 Jul 2009 15:45:01 -0000	1.25
@@ -1,11 +1,12 @@
 Summary: Abstract Machine Test Utility (AMTU)
 Name: amtu 
-Version: 1.0.6
-Release: 4%{?dist}
+Version: 1.0.7
+Release: 1%{?dist}
 License: CPL
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/amtueal/
 Source0: %{name}-%{version}.tar.gz
+Patch1: amtu-1.0.7-makefile.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: audit-libs-devel >= 1.1.2
 BuildRequires: automake
@@ -22,19 +23,9 @@ http://www.radium.ncsc.mil/tpep/library/
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
-# Determine appropriate compiler
-CC="gcc"
-%ifarch ppc64 ppc64iseries ppc64pseries
-  CC="/usr/bin/ppc64-redhat-linux-gcc"
-%endif
-# Determine appropriate compiler flags
-CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -Wall -pipe"
-%ifarch x86_64
-  CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -Wall -pipe -m64"
-%endif
-export CC CFLAGS
 # next 3 items is to quieten autoreconf
 touch ChangeLog
 touch NEWS
@@ -45,22 +36,21 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-install -m 0750 src/amtu $RPM_BUILD_ROOT/%{_bindir}
-
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8/
-install -m 644 doc/amtu.8 $RPM_BUILD_ROOT/%{_mandir}/man8/amtu.8
+make "DESTDIR=${RPM_BUILD_ROOT}" install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root, -)
 %doc doc/AMTUHowTo.txt COPYING
 %attr(0750,root,root) %{_bindir}/amtu
 %attr(0644,root,root) %{_mandir}/man8/*
 
 %changelog
+* Wed Jul 01 2009 Steve Grubb <sgrubb at redhat.com> 1.0.7-1
+- new upstream version
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


