Allow multi-arch install, build with -O2

- Install the real makegeo binary, also solving BZ #1235027
- Re-enable multiple compiler workers
- Actually build with -O2
- Remove outdated prep-section changes
- Remove rpath
This commit is contained in:
Volker Froehlich 2015-10-29 16:25:39 +01:00
parent d98a70352d
commit 2f4154dd68
1 changed files with 13 additions and 16 deletions

View File

@ -1,6 +1,6 @@
Name: libgeotiff
Version: 1.4.0
Release: 5%{?dist}
Release: 6%{?dist}
Summary: GeoTIFF format library
Group: System Environment/Libraries
License: MIT
@ -44,14 +44,6 @@ for f in `find . -type f` ; do
done
set -x
# remove junks
find . -name ".cvsignore" -exec rm -rf '{}' \;
# disable -g flag removal
sed -i 's| \| sed \"s\/-g \/\/\"||g' configure
# use gcc -shared instead of ld -shared to build with -fstack-protector
sed -i 's|LD_SHARED=@LD_SHARED@|LD_SHARED=@CC@ -shared|' Makefile.in
%build
%configure \
@ -60,20 +52,18 @@ sed -i 's|LD_SHARED=@LD_SHARED@|LD_SHARED=@CC@ -shared|' Makefile.in
--with-proj \
--with-jpeg \
--with-zip \
--enable-debug \
--disable-static
# WARNING
# disable %{?_smp_mflags}
# it breaks compile
make
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"
# install manualy some file
install -p -m 755 bin/makegeo %{buildroot}%{_bindir}
# install pkgconfig file
cat > %{name}.pc <<EOF
prefix=%{_prefix}
@ -120,6 +110,13 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/%{name}.pc
%changelog
* Thu Oct 29 2015 Volker Fröhlich <volker27@gmx.at> - 1.4.0-6
- Install the real makegeo binary, also solving BZ #1235027
- Re-enable multiple compiler workers
- Actually build with -O2
- Remove outdated prep-section changes
- Remove rpaths
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild