pool/pango
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 50509 from home:vuntz:branches:GNOME:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/50509
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pango?expand=0&rev=59
This commit is contained in:
Vincent Untz 2010-10-14 07:47:24 +00:00 committed by Git OBS Bridge
parent b4b45de563
commit e35f67d687
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pango.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Oct 13 20:26:17 CEST 2010 - vuntz@opensuse.org
- Do not call pango-querymodules twice in the %post of
libpango-1_0-0. Especially since the first call might fail since
it's not in the if test.
- Put comments that are in the scriptlets area of the spec file in
"%if 0" statement: if we don't do that, they actually end up in
the scriplets and can even make them fail if the scriptlets were
just "-p /sbin/ldconfig".
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 11 16:39:05 CEST 2010 - vuntz@opensuse.org Mon Oct 11 16:39:05 CEST 2010 - vuntz@opensuse.org

15
pango.spec
View File

@ -161,20 +161,22 @@ rm -rf %{buildroot}
%define _pango_querymodules_update_cache %{_pango_querymodules} > %{_sysconfdir}/pango/pango.modules %define _pango_querymodules_update_cache %{_pango_querymodules} > %{_sysconfdir}/pango/pango.modules
%endif %endif
%post -n libpango-1_0-0
/sbin/ldconfig
%if 0
# In case libpango-1_0-0 gets installed before pango-tools, we don't want to # In case libpango-1_0-0 gets installed before pango-tools, we don't want to
# fail. So we make the call to pango-querymodules dependent on the existence of # fail. So we make the call to pango-querymodules dependent on the existence of
# the binary. This is why we also have a %post for pango-tools. # the binary. This is why we also have a %post for pango-tools.
%endif
%post -n libpango-1_0-0
/sbin/ldconfig
%{_pango_querymodules_update_cache}
if test -f %{_pango_querymodules}; then if test -f %{_pango_querymodules}; then
%{_pango_querymodules_update_cache} %{_pango_querymodules_update_cache}
fi fi
%if 0
# No need to call pango-querymodules in postun: # No need to call pango-querymodules in postun:
# - if it's an upgrade, it will have been called in post # - if it's an upgrade, it will have been called in post
# - if it's an uninstall, we don't care about this anymore # - if it's an uninstall, we don't care about this anymore
%endif
%postun -n libpango-1_0-0 -p /sbin/ldconfig %postun -n libpango-1_0-0 -p /sbin/ldconfig
@ -184,12 +186,13 @@ fi
%postun module-thai-lang %postun module-thai-lang
%{_pango_querymodules_update_cache} %{_pango_querymodules_update_cache}
%post tools
%if 0
# If we install pango-tools for the first time, then we should run it in case # If we install pango-tools for the first time, then we should run it in case
# libpango-1_0-0 was installed first (ie, if # libpango-1_0-0 was installed first (ie, if
# %{_libdir}/pango/%{pango_binary_version} already exists) which means # %{_libdir}/pango/%{pango_binary_version} already exists) which means
# pango-querymodules couldn't run there. # pango-querymodules couldn't run there.
%endif
%post tools
if [ $1 == 1 ]; then if [ $1 == 1 ]; then
test -d %{_libdir}/pango/%{pango_binary_version} test -d %{_libdir}/pango/%{pango_binary_version}
if test $? -eq 0; then if test $? -eq 0; then