Another fixes for spec file

- disable static compilation of libltdl.a (it was deleted anyway)
- do not own /usr/share/libtool/ by libtool-ltdl
This commit is contained in:
Pavel Raiskup 2012-10-25 08:02:37 +02:00
parent 742d286e38
commit 4460f68b01

View File

@ -89,7 +89,8 @@ export CFLAGS="$RPM_OPT_FLAGS -fPIC"
--libexecdir=%{_libexecdir} \ --libexecdir=%{_libexecdir} \
--localstatedir=%{_localstatedir} \ --localstatedir=%{_localstatedir} \
--mandir=%{_mandir} \ --mandir=%{_mandir} \
--infodir=%{_infodir} --infodir=%{_infodir} \
--disable-static
## build not smp safe: ## build not smp safe:
make # %%{?_smp_mflags} make # %%{?_smp_mflags}
@ -104,6 +105,10 @@ make check VERBOSE=yes
%install %install
make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot}
# info's TOP dir (by default owned by info)
rm -f %{buildroot}%{_infodir}/dir
# *.la files generated by libtool shouldn't be distributed
rm -f %{buildroot}%{_libdir}/libltdl.la
%post %post
/sbin/install-info %{_infodir}/libtool.info.gz %{_infodir}/dir || : /sbin/install-info %{_infodir}/libtool.info.gz %{_infodir}/dir || :
@ -133,8 +138,6 @@ 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
%files ltdl-devel %files ltdl-devel
%defattr(-,root,root) %defattr(-,root,root)
@ -142,12 +145,16 @@ fi
%{_datadir}/libtool/libltdl %{_datadir}/libtool/libltdl
%{_includedir}/ltdl.h %{_includedir}/ltdl.h
%{_includedir}/libltdl %{_includedir}/libltdl
# .so files without version must be in -devel subpackage
%{_libdir}/libltdl.so
%changelog %changelog
* Wed Oct 24 2012 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-10 * Thu Oct 25 2012 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-10
- temporarily disable the 'gcj' tests (#869578) -- this is just to (1) allow - temporarily disable the 'gcj' tests (#869578) -- this is just to (1) allow
build under f18+ and RHEL-7.0 and (2) don't through out upstream testsuite. build under f18+ and RHEL-7.0 and (2) don't through out upstream testsuite.
Added patch must be removed once the 'ecj' utility is fixed Added patch must be removed once the 'ecj' utility is fixed
- libtool-ltdl shouldn't own /usr/share/libtool/ directory
- move the .so file without version back to devel package (sorry for that)
* Mon Oct 22 2012 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-9 * Mon Oct 22 2012 Pavel Raiskup <praiskup@redhat.com> - 2.4.2-9
- fix fedora-review warnings: s/RPM_BUILD_ROOT/buildroot/, remove trailing - fix fedora-review warnings: s/RPM_BUILD_ROOT/buildroot/, remove trailing