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

OBS-URL: https://build.opensuse.org/request/show/50400
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pango?expand=0&rev=58
This commit is contained in:
Dominique Leuenberger 2010-10-12 21:23:11 +00:00 committed by Git OBS Bridge
parent 0055ff0086
commit b4b45de563
4 changed files with 217 additions and 93 deletions

View File

@ -1,15 +1,31 @@
pango
libpango-1_0-0
+/etc/pango/pango(64)?.modules
requires "pango-tools-<targettype>"
provides "pango-<targettype> = <version>"
obsoletes "pango-<targettype> <= <version>"
post "%if "%_lib" == "lib64""
post "if test -f <prefix>%{_bindir}/pango-querymodules-64; then <prefix>%{_bindir}/pango-querymodules-64 > <prefix>%{_sysconfdir}/pango/pango64.modules; fi"
post "%else"
post "if test -f <prefix>%{_bindir}/pango-querymodules; then <prefix>%{_bindir}/pango-querymodules > <prefix>%{_sysconfdir}/pango/pango.modules; fi"
post "%endif"
pango-tools
+/usr/bin/pango-querymodules(-64)?
prereq "filesystem glib2 xorg-x11-libs xorg-x11-libXrender xorg-x11-libX11"
postun "/sbin/ldconfig"
targettype 64bit postun "if [ -x usr/bin/pango-querymodules-64 ] ; then"
targettype 64bit postun "LD_LIBRARY_PATH=usr/lib64 usr/bin/pango-querymodules-64 > etc/pango/pango64.modules || echo pango-querymodules-64 did not run properly in postun."
targettype 64bit postun "fi"
targettype 32bit postun "if [ -x usr/bin/pango-querymodules ] ; then"
targettype 32bit postun "LD_LIBRARY_PATH=usr/lib usr/bin/pango-querymodules > etc/pango/pango.modules"
targettype 32bit postun "fi"
targettype 64bit post "LD_LIBRARY_PATH=usr/lib64 usr/bin/pango-querymodules-64 > etc/pango/pango64.modules || echo pango-querymodules-64 did not run properly in postin."
targettype 32bit post "LD_LIBRARY_PATH=usr/lib usr/bin/pango-querymodules > etc/pango/pango.modules"
post "%if "%_lib" == "lib64""
post "if [ $1 == 1 ]; then test -d <prefix>%{_libdir}/pango/1.6.0; if test $? -eq 0; then <prefix>%{_bindir}/pango-querymodules-64 > <prefix>%{_sysconfdir}/pango/pango64.modules; fi; fi"
post "%else"
post "if [ $1 == 1 ]; then test -d <prefix>%{_libdir}/pango/1.6.0; if test $? -eq 0; then <prefix>%{_bindir}/pango-querymodules > <prefix>%{_sysconfdir}/pango/pango.modules; fi; fi"
post "%endif"
pango-module-thai-lang
requires "pango-<targettype>"
post "%if "%_lib" == "lib64""
post "<prefix>%{_bindir}/pango-querymodules-64 > <prefix>%{_sysconfdir}/pango/pango64.modules"
post "%else"
post "<prefix>%{_bindir}/pango-querymodules > <prefix>%{_sysconfdir}/pango/pango.modules"
post "%endif"
postun "%if "%_lib" == "lib64""
postun "<prefix>%{_bindir}/pango-querymodules-64 > <prefix>%{_sysconfdir}/pango/pango64.modules"
postun "%else"
postun "<prefix>%{_bindir}/pango-querymodules > <prefix>%{_sysconfdir}/pango/pango.modules"
postun "%endif"
arch ppc package pango-devel
arch sparcv9 package pango-devel

35
macros.pango Normal file
View File

@ -0,0 +1,35 @@
# RPM macros for packages installing a Pango module
#
###
#
# When a package installs a Pango module, it should use all
# three macros:
#
# - %pango_module_requires in the preamble
# - %pango_module_post in %post
# - %pango_module_postun in %postun
#
###
%pango_module_requires \
Requires(post): pango-tools \
Requires(postun): pango-tools
# On install, update the cache
%pango_module_post \
%if "%_lib" == "lib64" \
%{_bindir}/pango-querymodules-64 > %{_sysconfdir}/pango/pango64.immodules \
%else \
%{_bindir}/pango-querymodules > %{_sysconfdir}/pango/pango.immodules \
%endif
# On uninstall, update the cache. Note: we ignore upgrades (already
# handled in %post of the new package).
%pango_module_postun \
if [ $1 -eq 0 ]; then \
%if "%_lib" == "lib64" \
%{_bindir}/pango-querymodules-64 > %{_sysconfdir}/pango/pango64.immodules \
%else \
%{_bindir}/pango-querymodules > %{_sysconfdir}/pango/pango.immodules \
%endif \
fi

View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Mon Oct 11 16:39:05 CEST 2010 - vuntz@opensuse.org
- Update packaging to use the shared library packaging policy:
+ Create libpango-1_0-0 and pango-tools subpackages.
+ Add pango-tools Requires to libpango-1_0-0 for the call to
pango-querymodules in %post.
+ Make libpango-1_0-0 Provides/Obsoletes pango.
+ We need %post/%postun scriptlets for libpango-1_0-0 and
pango-tools that call pango-querymodules when possible.
+ Update baselibs.conf accordingly, and simplify it a bit.
- Add RPM macros (macros.pango) to make it easier to handle
installation of a Pango module.
- Add pango-tools Requires to pango-module-thai-lang for the call
to pango-querymodules in %post/%postun.
- Add pango-module-thai-lang to baselibs.conf, since people want
the 32-bit module if they have the 32-bit library.
- Update summaries and descriptions.
- Use a find to remove .la files.
- Use <prefix> in baselibs.conf since we use full paths there, and
this is needed for x86 packages that put files in
/emul/ia32-linux.
-------------------------------------------------------------------
Wed Sep 29 13:18:13 CEST 2010 - vuntz@opensuse.org

View File

@ -15,10 +15,23 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
# When updating the binary version, do not forget to also update baselibs.conf
%define pango_binary_version 1.6.0
Name: pango
License: LGPLv2.1+
Group: System/Libraries
Version: 1.28.3
Release: 2
# NOTE: on upgrade to a new upstream version, change the Obsoletes from <= to < (here and in baselibs.conf)
Summary: Library for Layout and Rendering of Text
Source: ftp://ftp.gnome.org/pub/GNOME/sources/pango/1.18/%{name}-%{version}.tar.bz2
Source1: README.SuSE
Source2: macros.pango
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM pango64.patch bgo129534 -- needed for biarch. Unfortunately, this is not good enough for usptream.
Patch0: pango64.patch
BuildRequires: gcc-c++
BuildRequires: gtk-doc
BuildRequires: pkg-config
@ -30,44 +43,67 @@ BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(libthai)
BuildRequires: pkgconfig(xft)
BuildRequires: pkgconfig(xrender)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Pango is a library for layout and rendering of text, with an emphasis
on internationalization. It can be used anywhere that text layout
is needed.
Pango forms the core of text and font handling for GTK+.
%package -n libpango-1_0-0
License: LGPLv2.1+
Summary: Library for Layout and Rendering of Text
Group: System/Libraries
Requires(post): %{name}-tools
Provides: %{name} = %{version}
# Note: we keep <= (and a rpmlint warning...) until we get a version higher than 1.28.3 (when this provides/obsoletes was introduced)
Obsoletes: %{name} <= %{version}
# bug437293
%ifarch ppc64
Obsoletes: pango-64bit
%endif
#
Version: 1.28.3
Release: 2
Summary: System for Layout and Rendering of Internationalised Text
Source: ftp://ftp.gnome.org/pub/GNOME/sources/pango/1.18/%{name}-%{version}.tar.bz2
Source1: README.SuSE
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM pango64.patch bgo129534 -- needed for biarch. Unfortunately, this is not good enough for usptream.
Patch0: pango64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: xorg-x11-libXrender xorg-x11-libX11 xorg-x11-libXdmcp
%description
%description -n libpango-1_0-0
Pango is a library for layout and rendering of text, with an emphasis
on internationalisation. It forms the core of text and font handling in
GTK+.
on internationalization. It can be used anywhere that text layout
is needed.
Pango forms the core of text and font handling for GTK+.
%package tools
License: LGPLv2.1+
Summary: Library for Layout and Rendering of Text -- Tools
Group: System/Libraries
%description tools
Pango is a library for layout and rendering of text, with an emphasis
on internationalization. It can be used anywhere that text layout
is needed.
Pango forms the core of text and font handling for GTK+.
%package module-thai-lang
License: LGPLv2.1+
Summary: System for Layout and Rendering of Internationalised Text
Summary: Library for Layout and Rendering of Text -- Module for the Thai Language
Group: System/Libraries
Requires(post): %{name}-tools
Requires(postun): %{name}-tools
Provides: locale(pango:th_TH)
%description module-thai-lang
Pango is a library for layout and rendering of text, with an emphasis
on internationalisation. It forms the core of text and font handling in
GTK+.
on internationalization. It can be used anywhere that text layout
is needed.
Pango forms the core of text and font handling for GTK+.
%package devel
License: LGPLv2.1+
Requires: %{name} = %{version} cairo-devel fontconfig-devel freetype2-devel glib2-devel %(rpm -q --whatprovides XFree86-devel --queryformat '%{NAME}')
Summary: Include files and libraries mandatory for development
Requires: libpango-1_0-0 = %{version}
Summary: Library for Layout and Rendering of Text -- Development Files
Group: Development/Libraries/GNOME
# bug437293
%ifarch ppc64
@ -77,6 +113,12 @@ Obsoletes: pango-doc <= %{version}
Provides: pango-doc = %{version}
%description devel
Pango is a library for layout and rendering of text, with an emphasis
on internationalization. It can be used anywhere that text layout
is needed.
Pango forms the core of text and font handling for GTK+.
This package contains all necessary include files and libraries needed
to develop applications that require these.
@ -93,96 +135,95 @@ make %{?jobs:-j%jobs}
%install
%makeinstall
touch $RPM_BUILD_ROOT%{_sysconfdir}/pango/pango.modules
find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
touch %{buildroot}%{_sysconfdir}/pango/pango.modules
%if "%_lib" == "lib64"
mv $RPM_BUILD_ROOT%{_bindir}/pango-querymodules\
$RPM_BUILD_ROOT%{_bindir}/pango-querymodules-64
mv $RPM_BUILD_ROOT%{_sysconfdir}/pango/pango.modules\
$RPM_BUILD_ROOT%{_sysconfdir}/pango/pango64.modules
mv %{buildroot}%{_bindir}/pango-querymodules %{buildroot}%{_bindir}/pango-querymodules-64
mv %{buildroot}%{_sysconfdir}/pango/pango.modules %{buildroot}%{_sysconfdir}/pango/pango64.modules
%endif
rm $RPM_BUILD_ROOT%{_libdir}/*/*/*/*.*a
rm $RPM_BUILD_ROOT%{_libdir}/*.la
# Install rpm macros
mkdir -p %{buildroot}%{_sysconfdir}/rpm
cp %{S:2} %{buildroot}%{_sysconfdir}/rpm
%clean
rm -rf $RPM_BUILD_ROOT
rm -rf %{buildroot}
%post
/sbin/ldconfig
###########################################################################
# Note: when updating scriptlets, don't forget to also update baselibs.conf
###########################################################################
# Convenient %define for the scriplets
%if "%_lib" == "lib64"
# it is not fatal if execution fails on 32bit systems
LD_LIBRARY_PATH=usr/%{_lib}\
usr/bin/pango-querymodules-64\
> etc/pango/pango64.modules || echo "pango-querymodules-64 did not run properly in postin."
%define _pango_querymodules %{_bindir}/pango-querymodules-64
%define _pango_querymodules_update_cache %{_pango_querymodules} > %{_sysconfdir}/pango/pango64.modules
%else
LD_LIBRARY_PATH=usr/%{_lib}\
usr/bin/pango-querymodules\
> etc/pango/pango.modules
%define _pango_querymodules %{_bindir}/pango-querymodules
%define _pango_querymodules_update_cache %{_pango_querymodules} > %{_sysconfdir}/pango/pango.modules
%endif
%postun
# 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
# the binary. This is why we also have a %post for pango-tools.
%post -n libpango-1_0-0
/sbin/ldconfig
%if "%_lib" == "lib64"
if [ -x usr/bin/pango-querymodules-64 ] ; then
# it is not fatal if execution fails on 32bit systems
LD_LIBRARY_PATH=usr/%{_lib}\
usr/bin/pango-querymodules-64\
> etc/pango/pango64.modules || echo "pango-querymodules-64 did not run properly in postun."
%{_pango_querymodules_update_cache}
if test -f %{_pango_querymodules}; then
%{_pango_querymodules_update_cache}
fi
%else
if [ -x usr/bin/pango-querymodules ] ; then
LD_LIBRARY_PATH=usr/%{_lib}\
usr/bin/pango-querymodules\
> etc/pango/pango.modules
fi
%endif
# No need to call pango-querymodules in postun:
# - if it's an upgrade, it will have been called in post
# - if it's an uninstall, we don't care about this anymore
%postun -n libpango-1_0-0 -p /sbin/ldconfig
%post module-thai-lang
%if "%_lib" == "lib64"
# it is not fatal if execution fails on 32bit systems
LD_LIBRARY_PATH=usr/%{_lib}\
usr/bin/pango-querymodules-64\
> etc/pango/pango64.modules || echo "pango-querymodules-64 did not run properly in postin."
%else
LD_LIBRARY_PATH=usr/%{_lib}\
usr/bin/pango-querymodules\
> etc/pango/pango.modules
%endif
%{_pango_querymodules_update_cache}
%postun module-thai-lang
%if "%_lib" == "lib64"
if [ -x usr/bin/pango-querymodules-64 ] ; then
# it is not fatal if execution fails on 32bit systems
LD_LIBRARY_PATH=usr/%{_lib}\
usr/bin/pango-querymodules-64\
> etc/pango/pango64.modules || echo "pango-querymodules-64 did not run properly in postun."
fi
%else
if [ -x usr/bin/pango-querymodules ] ; then
LD_LIBRARY_PATH=usr/%{_lib}\
usr/bin/pango-querymodules\
> etc/pango/pango.modules
fi
%endif
%{_pango_querymodules_update_cache}
%files
# 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
# %{_libdir}/pango/%{pango_binary_version} already exists) which means
# pango-querymodules couldn't run there.
%post tools
if [ $1 == 1 ]; then
test -d %{_libdir}/pango/%{pango_binary_version}
if test $? -eq 0; then
%{_pango_querymodules_update_cache}
fi
fi
%files -n libpango-1_0-0
%defattr(-,root,root)
%if "%_lib" == "lib64"
%doc README AUTHORS COPYING ChangeLog README.SuSE
%else
%doc README AUTHORS COPYING ChangeLog
%endif
%{_bindir}/pango-*
%dir %{_libdir}/pango
%dir %{_libdir}/pango/1.6.0
%dir %{_libdir}/pango/1.6.0/modules
%{_libdir}/pango/1.6.0/modules/*.so
%exclude %{_libdir}/pango/1.6.0/modules/pango-thai-lang.so
%dir %{_libdir}/pango/%{pango_binary_version}
%dir %{_libdir}/pango/%{pango_binary_version}/modules
%{_libdir}/pango/%{pango_binary_version}/modules/pango-arabic-fc.so
%{_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-basic-x.so
%{_libdir}/pango/%{pango_binary_version}/modules/pango-hangul-fc.so
%{_libdir}/pango/%{pango_binary_version}/modules/pango-hebrew-fc.so
%{_libdir}/pango/%{pango_binary_version}/modules/pango-indic-fc.so
%{_libdir}/pango/%{pango_binary_version}/modules/pango-indic-lang.so
%{_libdir}/pango/%{pango_binary_version}/modules/pango-khmer-fc.so
%{_libdir}/pango/%{pango_binary_version}/modules/pango-syriac-fc.so
%{_libdir}/pango/%{pango_binary_version}/modules/pango-thai-fc.so
%{_libdir}/pango/%{pango_binary_version}/modules/pango-tibetan-fc.so
%{_libdir}/lib*.so.*
%{_libdir}/girepository-1.0/Pango-1.0.typelib
%{_libdir}/girepository-1.0/PangoCairo-1.0.typelib
%{_libdir}/girepository-1.0/PangoFT2-1.0.typelib
%{_libdir}/girepository-1.0/PangoXft-1.0.typelib
%doc %{_mandir}/man?/*.*
%dir %{_sysconfdir}/pango
%{_sysconfdir}/pango/pangox.aliases
%if "%_lib" == "lib64"
@ -191,9 +232,17 @@ fi
%ghost %{_sysconfdir}/pango/pango.modules
%endif
%files tools
%defattr(-, root, root)
%{_bindir}/pango-querymodules*
%{_bindir}/pango-view
%doc %{_mandir}/man1/pango-querymodules.1*
%doc %{_mandir}/man1/pango-view.1*
# We have this module in a subpackage because it requires additional libraries.
%files module-thai-lang
%defattr(-, root, root)
%{_libdir}/pango/1.6.0/modules/pango-thai-lang.so
%{_libdir}/pango/%{pango_binary_version}/modules/pango-thai-lang.so
%files devel
%defattr(-, root, root)
@ -202,5 +251,6 @@ fi
%{_includedir}/pango-1.0/
%{_datadir}/gir-1.0/*.gir
%doc %{_datadir}/gtk-doc/html/pango/
%{_sysconfdir}/rpm/macros.pango
%changelog