A variety of small cleanups

This commit is contained in:
Jonathan Masters 2008-05-06 19:08:20 -04:00
parent fcf5e22a65
commit 9ed9b4e345
4 changed files with 21 additions and 5 deletions

View File

@ -33,6 +33,8 @@ if [ ! -z "$JARS" ]; then
pushd $JTMPDIR > /dev/null pushd $JTMPDIR > /dev/null
/usr/bin/unzip -qq -o $j /usr/bin/unzip -qq -o $j
find -type d -exec chmod a+rx {} \;
find -type f -exec chmod a+r {} \;
rm -f $j rm -f $j
# Create the directories first. # Create the directories first.

View File

@ -114,6 +114,7 @@ for f in $liblist $exelist ; do
(START==2) && (LIBNAME!="") && ($4!="") { (START==2) && (LIBNAME!="") && ($4!="") {
print LIBNAME "(" $4 ")'$lib64'"; print LIBNAME "(" $4 ")'$lib64'";
} }
/^[A-Za-z]/ { START=3; }
' '
done | sort -u done | sort -u

15
macros
View File

@ -20,6 +20,8 @@
%_defaultdocdir %{_usr}/share/doc %_defaultdocdir %{_usr}/share/doc
%_fmoddir %{_libdir}/gfortran/modules
%_enable_debug_packages 1 %_enable_debug_packages 1
#============================================================================== #==============================================================================
@ -28,10 +30,7 @@
%configure \ %configure \
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \ CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \ FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; 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 ; \
./configure --build=%{_build} --host=%{_host} \\\ ./configure --build=%{_build} --host=%{_host} \\\
--target=%{_target_platform} \\\ --target=%{_target_platform} \\\
--program-prefix=%{?_program_prefix} \\\ --program-prefix=%{?_program_prefix} \\\
@ -106,6 +105,7 @@
%package debuginfo \ %package debuginfo \
Summary: Debug information for package %{name}\ Summary: Debug information for package %{name}\
Group: Development/Debug\ Group: Development/Debug\
AutoReqProv: 0\
%description debuginfo\ %description debuginfo\
This package provides debug information for package %{name}.\ This package provides debug information for package %{name}.\
Debug information is useful when developing applications that use this\ Debug information is useful when developing applications that use this\
@ -136,6 +136,10 @@ export LANG\
unset DISPLAY\ unset DISPLAY\
%{nil} %{nil}
%check %%check\
unset DISPLAY\
%{nil}
%find_lang /usr/lib/rpm/find-lang.sh %{buildroot} %find_lang /usr/lib/rpm/find-lang.sh %{buildroot}
# #
@ -145,6 +149,9 @@ unset DISPLAY\
# #
# Should missing %doc files terminate a build? # Should missing %doc files terminate a build?
%_missing_doc_files_terminate_build 1 %_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? # Should unpackaged files in a build root terminate a build?

View File

@ -1,6 +1,6 @@
Summary: Red Hat specific rpm configuration files. Summary: Red Hat specific rpm configuration files.
Name: redhat-rpm-config Name: redhat-rpm-config
Version: 9.0.2 Version: 9.0.3
Release: 1%{?dist} Release: 1%{?dist}
License: GPL License: GPL
Group: Development/System Group: Development/System
@ -33,6 +33,12 @@ rm -rf ${RPM_BUILD_ROOT}
%{_prefix}/lib/rpm/redhat %{_prefix}/lib/rpm/redhat
%changelog %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 * Thu Apr 03 2008 Jon Masters <jcm@redhat.com> - 9.0.2-1
- Remove smp dependencies - Remove smp dependencies
- Update config.guess|sub files - Update config.guess|sub files