Accepting request 223135 from home:sbrabec:branches:GNOME:Factory

- Check for libpango instead of pango directory in pango-tools
  %post (bnc#864561).
- Package modules.cache (bnc#864561#c3).
- Fix location of pango.modules.

OBS-URL: https://build.opensuse.org/request/show/223135
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pango?expand=0&rev=123
This commit is contained in:
Dominique Leuenberger 2014-02-23 00:38:37 +00:00 committed by Git OBS Bridge
parent b6e00dbb29
commit e54fbcf5bd
2 changed files with 13 additions and 3 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Feb 19 19:37:59 CET 2014 - sbrabec@suse.cz
- Check for libpango instead of pango directory in pango-tools
%post (bnc#864561).
- Package modules.cache (bnc#864561#c3).
- Fix location of pango.modules.
-------------------------------------------------------------------
Wed Feb 5 10:43:09 UTC 2014 - dimstar@opensuse.org

View File

@ -146,7 +146,8 @@ make %{?_smp_mflags}
%make_install
find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
mkdir -p %{buildroot}%{_sysconfdir}/pango/
touch %{buildroot}%{_libdir}/pango/%{pango_binary_version}/pango.modules
touch %{buildroot}%{_sysconfdir}/pango/pango.modules
touch %{buildroot}%{_libdir}/pango/%{pango_binary_version}/modules.cache
%if "%{_lib}" == "lib64"
mv %{buildroot}%{_bindir}/pango-querymodules %{buildroot}%{_bindir}/pango-querymodules-64
%endif
@ -199,7 +200,7 @@ fi
# pango-querymodules couldn't run there.
%endif
if [ $1 == 1 ]; then
test -d %{_libdir}/pango/%{pango_binary_version}
test -f %{_libdir}/libpango-1.0.so.0
if test $? -eq 0; then
%{_pango_querymodules_update_cache}
fi
@ -214,13 +215,14 @@ fi
%endif
%dir %{_libdir}/pango
%dir %{_libdir}/pango/%{pango_binary_version}
%ghost %{_libdir}/pango/%{pango_binary_version}/pango.modules
%ghost %{_libdir}/pango/%{pango_binary_version}/modules.cache
%dir %{_libdir}/pango/%{pango_binary_version}/modules
%{_libdir}/pango/%{pango_binary_version}/modules/pango-arabic-lang.so
%{_libdir}/pango/%{pango_binary_version}/modules/pango-basic-fc.so
%{_libdir}/pango/%{pango_binary_version}/modules/pango-indic-lang.so
%{_libdir}/lib*.so.*
%dir %{_sysconfdir}/pango
%config %ghost %{_sysconfdir}/pango/pango.modules
%files -n typelib-1_0-Pango-1_0
%defattr(-,root,root)