Accepting request 132788 from GNOME:Next
Starting to push GNOME:Next... OBS-URL: https://build.opensuse.org/request/show/132788 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pango?expand=0&rev=81
This commit is contained in:
parent
6d4959b23c
commit
c8360d2905
@ -11,9 +11,9 @@ libpango-1_0-0
|
||||
pango-tools
|
||||
+/usr/bin/pango-querymodules(-64)?
|
||||
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 "if [ $1 == 1 ]; then test -d <prefix>%{_libdir}/pango/1.8.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 "if [ $1 == 1 ]; then test -d <prefix>%{_libdir}/pango/1.8.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>"
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe
|
||||
size 1162828
|
3
pango-1.31.0.tar.xz
Normal file
3
pango-1.31.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:bac8eec76710150a6f7a40b565d8c7b0cfb946fa2879a19fae8f7563b551eb96
|
||||
size 1022764
|
@ -1,13 +0,0 @@
|
||||
Index: pango-1.30.1/pango/pango-utils.h
|
||||
===================================================================
|
||||
--- pango-1.30.1.orig/pango/pango-utils.h
|
||||
+++ pango-1.30.1/pango/pango-utils.h
|
||||
@@ -48,6 +48,8 @@ void pango_lookup_aliases (const cha
|
||||
int *n_families);
|
||||
#endif /* PANGO_ENABLE_BACKEND */
|
||||
|
||||
+char * pango_config_key_get_system (const char *key);
|
||||
+
|
||||
gboolean pango_parse_enum (GType type,
|
||||
const char *str,
|
||||
int *value,
|
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 21 15:28:34 UTC 2012 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 1.31.0:
|
||||
+ Port to harfbuzz 0.9.x, use external harfbuzz
|
||||
+ Remove Arabic, Syriac, Hangul Hebrew, Khmer, Tibetan and Thai
|
||||
shapers (replaced by harfbuzz)
|
||||
+ Remove Indic module (replaced by harfbuzz)
|
||||
+ Remove Atsui support (superseded by CoreText)
|
||||
+ Remove PangoX
|
||||
+ Bugs fixed: bgo#679654, bgo#680965, bgo#681423.
|
||||
- Drop pango-implicit.patch: fixed upstream.
|
||||
- Add pkgconfig(harfbuzz) BuildRequires: new dependency.
|
||||
- Bump pango_binary_version defines to 1.8.0 (baselibs.conf too).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 6 19:30:03 UTC 2012 - dimstar@opensuse.org
|
||||
|
||||
|
49
pango.spec
49
pango.spec
@ -17,23 +17,21 @@
|
||||
|
||||
|
||||
# When updating the binary version, do not forget to also update baselibs.conf
|
||||
%define pango_binary_version 1.6.0
|
||||
%define pango_binary_version 1.8.0
|
||||
|
||||
Name: pango
|
||||
Version: 1.30.1
|
||||
Version: 1.31.0
|
||||
Release: 0
|
||||
Summary: Library for Layout and Rendering of Text
|
||||
License: LGPL-2.1+
|
||||
Group: System/Libraries
|
||||
Url: http://www.pango.org/
|
||||
Source: http://download.gnome.org/sources/pango/1.30/%{name}-%{version}.tar.xz
|
||||
Source: http://download.gnome.org/sources/pango/1.31/%{name}-%{version}.tar.xz
|
||||
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
|
||||
# PATCH-FIX-UPSTREAM pango-implicit.patch bgo#677627 dimstar@opensuse.org -- Add missing function prototype
|
||||
Patch1: pango-implicit.patch
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: gtk-doc
|
||||
BuildRequires: pkg-config
|
||||
@ -42,6 +40,7 @@ BuildRequires: pkgconfig(fontconfig)
|
||||
BuildRequires: pkgconfig(freetype2)
|
||||
BuildRequires: pkgconfig(gobject-2.0)
|
||||
BuildRequires: pkgconfig(gobject-introspection-1.0)
|
||||
BuildRequires: pkgconfig(harfbuzz)
|
||||
BuildRequires: pkgconfig(libthai) >= 0.1.9
|
||||
BuildRequires: pkgconfig(xft)
|
||||
BuildRequires: pkgconfig(xrender)
|
||||
@ -57,9 +56,9 @@ Pango forms the core of text and font handling for GTK+.
|
||||
%package -n libpango-1_0-0
|
||||
Summary: Library for Layout and Rendering of Text
|
||||
Group: System/Libraries
|
||||
Requires(post): %{name}-tools
|
||||
Provides: %{name} = %{version}
|
||||
Obsoletes: %{name} < %{version}
|
||||
Requires(post): %{name}-tools
|
||||
# bug437293
|
||||
%ifarch ppc64
|
||||
Obsoletes: pango-64bit
|
||||
@ -100,9 +99,9 @@ Pango forms the core of text and font handling for GTK+.
|
||||
%package module-thai-lang
|
||||
Summary: Library for Layout and Rendering of Text -- Module for the Thai Language
|
||||
Group: System/Libraries
|
||||
Provides: locale(pango:th_TH)
|
||||
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
|
||||
@ -112,13 +111,13 @@ is needed.
|
||||
Pango forms the core of text and font handling for GTK+.
|
||||
|
||||
%package devel
|
||||
Requires: libpango-1_0-0 = %{version}
|
||||
Requires: typelib-1_0-Pango-1_0 = %{version}
|
||||
Summary: Library for Layout and Rendering of Text -- Development Files
|
||||
Group: Development/Libraries/GNOME
|
||||
Requires: libpango-1_0-0 = %{version}
|
||||
Requires: typelib-1_0-Pango-1_0 = %{version}
|
||||
# bug437293
|
||||
%ifarch ppc64
|
||||
Obsoletes: pango-devel-64bit
|
||||
Obsoletes: pkgconfig(pango)-64bit
|
||||
%endif
|
||||
Provides: pango-doc = %{version}
|
||||
Obsoletes: pango-doc < %{version}
|
||||
@ -135,27 +134,27 @@ to develop applications that require these.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%if "%_lib" == "lib64"
|
||||
cp -a %{S:1} .
|
||||
%if "%{_lib}" == "lib64"
|
||||
cp -a %{SOURCE1} .
|
||||
%patch0 -p0
|
||||
%endif
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
%configure --disable-static --with-pic
|
||||
make %{?jobs:-j%jobs}
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
%makeinstall
|
||||
%make_install
|
||||
find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/pango/
|
||||
touch %{buildroot}%{_sysconfdir}/pango/pango.modules
|
||||
%if "%_lib" == "lib64"
|
||||
%if "%{_lib}" == "lib64"
|
||||
mv %{buildroot}%{_bindir}/pango-querymodules %{buildroot}%{_bindir}/pango-querymodules-64
|
||||
mv %{buildroot}%{_sysconfdir}/pango/pango.modules %{buildroot}%{_sysconfdir}/pango/pango64.modules
|
||||
%endif
|
||||
# Install rpm macros
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/rpm
|
||||
cp %{S:2} %{buildroot}%{_sysconfdir}/rpm
|
||||
cp %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
@ -165,7 +164,7 @@ rm -rf %{buildroot}
|
||||
###########################################################################
|
||||
|
||||
# Convenient %define for the scriplets
|
||||
%if "%_lib" == "lib64"
|
||||
%if "%{_lib}" == "lib64"
|
||||
%define _pango_querymodules %{_bindir}/pango-querymodules-64
|
||||
%define _pango_querymodules_update_cache %{_pango_querymodules} > %{_sysconfdir}/pango/pango64.modules
|
||||
%else
|
||||
@ -214,7 +213,7 @@ fi
|
||||
|
||||
%files -n libpango-1_0-0
|
||||
%defattr(-,root,root)
|
||||
%if "%_lib" == "lib64"
|
||||
%if "%{_lib}" == "lib64"
|
||||
%doc README AUTHORS COPYING ChangeLog README.SuSE
|
||||
%else
|
||||
%doc README AUTHORS COPYING ChangeLog
|
||||
@ -222,22 +221,12 @@ fi
|
||||
%dir %{_libdir}/pango
|
||||
%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.*
|
||||
%dir %{_sysconfdir}/pango
|
||||
%{_sysconfdir}/pango/pangox.aliases
|
||||
%if "%_lib" == "lib64"
|
||||
%if "%{_lib}" == "lib64"
|
||||
%ghost %{_sysconfdir}/pango/pango64.modules
|
||||
%else
|
||||
%ghost %{_sysconfdir}/pango/pango.modules
|
||||
|
Loading…
Reference in New Issue
Block a user