force removal of libintl.jar if %%buildjar is 0 (#433210)
This commit is contained in:
parent
299d11db6f
commit
b4e5f1d310
10
gettext.spec
10
gettext.spec
@ -4,7 +4,7 @@
|
|||||||
Summary: GNU libraries and utilities for producing multi-lingual messages
|
Summary: GNU libraries and utilities for producing multi-lingual messages
|
||||||
Name: gettext
|
Name: gettext
|
||||||
Version: 0.17
|
Version: 0.17
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
License: GPLv3 and LGPLv2+
|
License: GPLv3 and LGPLv2+
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
URL: http://www.gnu.org/software/gettext/
|
URL: http://www.gnu.org/software/gettext/
|
||||||
@ -115,7 +115,7 @@ mv ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext/* ${RPM_BUILD_ROOT}/%{_datadir}/doc/
|
|||||||
rm -r ${RPM_BUILD_ROOT}%{_datadir}/doc/libasprintf
|
rm -r ${RPM_BUILD_ROOT}%{_datadir}/doc/libasprintf
|
||||||
rm -r ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext
|
rm -r ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext
|
||||||
|
|
||||||
## note libintl.jar is not actually built now with gcj < 4.3
|
## note libintl.jar does not build with gcj < 4.3
|
||||||
## since it would not be fully portable
|
## since it would not be fully portable
|
||||||
%if %{buildjar}
|
%if %{buildjar}
|
||||||
### this is no longer needed since examples not packaged
|
### this is no longer needed since examples not packaged
|
||||||
@ -123,6 +123,9 @@ rm -r ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext
|
|||||||
#for i in `find ${RPM_BUILD_ROOT} examples -newer ChangeLog -type f -name ChangeLog`; do
|
#for i in `find ${RPM_BUILD_ROOT} examples -newer ChangeLog -type f -name ChangeLog`; do
|
||||||
# touch -r ChangeLog $i
|
# touch -r ChangeLog $i
|
||||||
#done
|
#done
|
||||||
|
%else
|
||||||
|
# in case another java compiler is installed
|
||||||
|
rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}/libintl.jar
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# remove unpackaged files from the buildroot
|
# remove unpackaged files from the buildroot
|
||||||
@ -229,6 +232,9 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Feb 18 2008 Jens Petersen <petersen@redhat.com> - 0.17-4
|
||||||
|
- if %%buildjar is off make sure libintl.jar does not get installed (#433210)
|
||||||
|
|
||||||
* Mon Feb 18 2008 Jens Petersen <petersen@redhat.com> - 0.17-3
|
* Mon Feb 18 2008 Jens Petersen <petersen@redhat.com> - 0.17-3
|
||||||
- turn on building of libintl.jar now that we have gcc43
|
- turn on building of libintl.jar now that we have gcc43
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user