From 9ed9b4e3459e3125befd324f579f751a239c26ca Mon Sep 17 00:00:00 2001
From: Jonathan Masters <jcm@londonpacket.bos.redhat.com>
Date: May 06 2008 23:08:20 +0000
Subject: A variety of small cleanups


---

diff --git a/brp-java-repack-jars b/brp-java-repack-jars
index d403779..9f295d7 100755
--- a/brp-java-repack-jars
+++ b/brp-java-repack-jars
@@ -33,6 +33,8 @@ if [ ! -z "$JARS" ]; then
 		
 		pushd $JTMPDIR > /dev/null
 		/usr/bin/unzip -qq -o $j
+		find -type d -exec chmod a+rx {} \;
+		find -type f -exec chmod a+r {} \;
 		rm -f $j
 		
 		# Create the directories first.
diff --git a/find-requires b/find-requires
index 6984ab7..5449407 100755
--- a/find-requires
+++ b/find-requires
@@ -114,6 +114,7 @@ for f in $liblist $exelist ; do
 	(START==2) && (LIBNAME!="") && ($4!="") {
 	    print LIBNAME "(" $4 ")'$lib64'";
 	}
+	/^[A-Za-z]/ { START=3; }
     '
 done | sort -u
 
diff --git a/macros b/macros
index 4ce2946..907103d 100644
--- a/macros
+++ b/macros
@@ -20,6 +20,8 @@
 
 %_defaultdocdir		%{_usr}/share/doc
 
+%_fmoddir		%{_libdir}/gfortran/modules
+
 %_enable_debug_packages 1
 
 #==============================================================================
@@ -28,10 +30,7 @@
 %configure \
   CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
-  FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
-  for i in $(find . -name config.guess -o -name config.sub) ; do \
-           [ -f /usr/lib/rpm/redhat/$(basename $i) ] && %{__rm} -f $i && %{__cp} -fv /usr/lib/rpm/redhat/$(basename $i) $i ; \
-  done ; \
+  FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
   ./configure --build=%{_build} --host=%{_host} \\\
 	--target=%{_target_platform} \\\
 	--program-prefix=%{?_program_prefix} \\\
@@ -106,6 +105,7 @@
 %package debuginfo \
 Summary: Debug information for package %{name}\
 Group: Development/Debug\
+AutoReqProv: 0\
 %description debuginfo\
 This package provides debug information for package %{name}.\
 Debug information is useful when developing applications that use this\
@@ -136,6 +136,10 @@ export LANG\
 unset DISPLAY\
 %{nil}
 
+%check %%check\
+unset DISPLAY\
+%{nil}
+
 %find_lang      /usr/lib/rpm/find-lang.sh %{buildroot}
 
 #
@@ -145,6 +149,9 @@ unset DISPLAY\
 #
 # Should missing %doc files terminate a build?
 %_missing_doc_files_terminate_build    1
+#
+# Should missing buildids terminate a build?
+%_missing_build_ids_terminate_build    1
 
 #
 # Should unpackaged files in a build root terminate a build?
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 048d1c4..50e2da4 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -1,6 +1,6 @@
 Summary: Red Hat specific rpm configuration files.
 Name: redhat-rpm-config
-Version: 9.0.2
+Version: 9.0.3
 Release: 1%{?dist}
 License: GPL
 Group: Development/System
@@ -33,6 +33,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_prefix}/lib/rpm/redhat
 
 %changelog
+* Tue May 06 2008 Jon Masters <jcm@redhat.com> - 9.0.3-1
+- Ensure Java Jar files have readable files within.
+- Remove overwritten config.guess|sub files (testing).
+- Fix Fortran flags for building using _fmoddir.
+- Pull in objdump fix to upstream find-requires.
+
 * Thu Apr 03 2008 Jon Masters <jcm@redhat.com> - 9.0.2-1
 - Remove smp dependencies
 - Update config.guess|sub files