Fix fedora-review warnings, etc.

- bad build circumstances fix
- s/${buildroot}/%{buildroot}/
- simplify 'make check' command
- ... viz. spec file changelog
This commit is contained in:
Pavel Raiskup 2012-10-04 16:51:44 +02:00
parent 653b3fbae0
commit 5b043ec825

View File

@ -1,9 +1,9 @@
%define gcc_version 4.7.2 %global gcc_version 4.7.2
Summary: The GNU Portable Library Tool Summary: The GNU Portable Library Tool
Name: libtool Name: libtool
Version: 2.4.2 Version: 2.4.2
Release: 8%{?dist} Release: 9%{?dist}
License: GPLv2+ and LGPLv2+ and GFDL License: GPLv2+ and LGPLv2+ and GFDL
URL: http://www.gnu.org/software/libtool/ URL: http://www.gnu.org/software/libtool/
Group: Development/Tools Group: Development/Tools
@ -16,10 +16,10 @@ Requires(preun): /sbin/install-info
BuildRequires: autoconf >= 2.59, automake >= 1.9.2, texinfo BuildRequires: autoconf >= 2.59, automake >= 1.9.2, texinfo
# we need this because tar is missing in Fedora installed with minimal profile # we need this because tar is missing in Fedora installed with minimal profile
BuildRequires: tar Requires: tar
Requires: autoconf >= 2.58, automake >= 1.4, sed Requires: autoconf >= 2.58, automake >= 1.4, sed
# make sure we can configure all supported langs # make sure we can configure all supported langs
BuildRequires: gcc, gcc-c++, libstdc++-devel, gcc-gfortran, gcc-java BuildRequires: libstdc++-devel, gcc-gfortran, gcc-java
# /usr/bin/libtool includes paths within gcc's versioned directories # /usr/bin/libtool includes paths within gcc's versioned directories
# Libtool must be rebuilt whenever a new upstream gcc is built # Libtool must be rebuilt whenever a new upstream gcc is built
Requires: gcc = %{gcc_version} Requires: gcc = %{gcc_version}
@ -56,8 +56,6 @@ These runtime libraries are needed by programs that link directly to the
system-installed ltdl libraries; they are not needed by software built using system-installed ltdl libraries; they are not needed by software built using
the rest of the GNU Autotools (including GNU Autoconf and GNU Automake). the rest of the GNU Autotools (including GNU Autoconf and GNU Automake).
%package ltdl-devel %package ltdl-devel
Summary: Tools needed for development using the GNU Libtool Dynamic Module Loader Summary: Tools needed for development using the GNU Libtool Dynamic Module Loader
Group: Development/Libraries Group: Development/Libraries
@ -67,47 +65,49 @@ License: LGPLv2+
%description ltdl-devel %description ltdl-devel
Static libraries and header files for development with ltdl. Static libraries and header files for development with ltdl.
%prep %prep
%setup -n libtool-%{version} -q %setup -n libtool-%{version} -q
%patch0 -p1 -b .rpath %patch0 -p1 -b .rpath
%build %build
./bootstrap
export CC=gcc export CC=gcc
export CXX=g++ export CXX=g++
export F77=gfortran export F77=gfortran
export CFLAGS="$RPM_OPT_FLAGS -fPIC" export CFLAGS="$RPM_OPT_FLAGS -fPIC"
# don't conflict with libtool-1.5, use own directory:
sed -e 's/pkgdatadir="\\${datadir}\/\$PACKAGE"/pkgdatadir="\\${datadir}\/\${PACKAGE}"/' configure > configure.tmp; mv -f configure.tmp configure; chmod a+x configure %configure --prefix=%{_prefix} \
./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} --mandir=%{_mandir} --infodir=%{_infodir} --exec-prefix=%{_prefix} \
# build not smp safe: --bindir=%{_bindir} \
make #%{?_smp_mflags} --sbindir=%{_sbindir} \
--sysconfdir=%{_sysconfdir} \
--datadir=%{_datadir} \
--includedir=%{_includedir} \
--libdir=%{_libdir} \
--libexecdir=%{_libexecdir} \
--localstatedir=%{_localstatedir} \
--mandir=%{_mandir} \
--infodir=%{_infodir}
## build not smp safe:
make # %%{?_smp_mflags}
for i in ChangeLog.1997 ChangeLog.1998 ChangeLog.1999 ChangeLog.2002; do for i in ChangeLog.1997 ChangeLog.1998 ChangeLog.1999 ChangeLog.2002; do
iconv -f ISO_8859-15 -t UTF8 $i > $i.tmp iconv -f ISO_8859-15 -t UTF8 $i > $i.tmp
mv -f $i.tmp $i mv -f $i.tmp $i
done done
%check %check
make check VERBOSE=yes | tee make_check.log 2>&1 # || (cat make_check.log && false) make check
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=%{buildroot}
rm -f %{buildroot}%{_infodir}/dir
rm -f %{buildroot}%{_libdir}/libltdl.la %{buildroot}%{_libdir}/libltdl.a
%post %post
/sbin/install-info %{_infodir}/libtool.info.gz %{_infodir}/dir || : /sbin/install-info %{_infodir}/libtool.info.gz %{_infodir}/dir || :
%post ltdl -p /sbin/ldconfig %post ltdl -p /sbin/ldconfig
%preun %preun
if [ "$1" = 0 ]; then if [ "$1" = 0 ]; then
/sbin/install-info --delete %{_infodir}/libtool.info.gz %{_infodir}/dir || : /sbin/install-info --delete %{_infodir}/libtool.info.gz %{_infodir}/dir || :
@ -115,8 +115,6 @@ fi
%postun ltdl -p /sbin/ldconfig %postun ltdl -p /sbin/ldconfig
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS COPYING NEWS README THANKS TODO ChangeLog* %doc AUTHORS COPYING NEWS README THANKS TODO ChangeLog*
@ -133,19 +131,27 @@ fi
%defattr(-,root,root) %defattr(-,root,root)
%doc libltdl/COPYING.LIB %doc libltdl/COPYING.LIB
%{_libdir}/libltdl.so.* %{_libdir}/libltdl.so.*
%{_libdir}/libltdl.so
%dir %{_datadir}/libtool %dir %{_datadir}/libtool
%files ltdl-devel %files ltdl-devel
%defattr(-,root,root) %defattr(-,root,root)
%doc libltdl/README %doc libltdl/README
%{_datadir}/libtool/libltdl %{_datadir}/libtool/libltdl
%{_libdir}/libltdl.so
%{_includedir}/ltdl.h %{_includedir}/ltdl.h
%{_includedir}/libltdl %{_includedir}/libltdl
%changelog %changelog
* Mon Oct 22 2012 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-9
- fix fedora-review warnings: s/RPM_BUILD_ROOT/buildroot/, remove trailing
white-spaces, move libltdl.so to ltdl sub-package, remove unnecessary BR
- remove unnecessary newlines
- fix the BuildRequire ~> Require only (#79467 related)
- fix weird build circumstances (don't call ./bootstrap, don't call autoconf
manually, do not touch configure script)
- remove 'tee' invocation for copying testsuite output (the file
'test-suite.log' is good enough)
* Thu Oct 04 2012 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-8 * Thu Oct 04 2012 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-8
- make the libtool dependant on tar (#794675) - make the libtool dependant on tar (#794675)