diff --git a/.cvsignore b/.cvsignore index cdfc20d..0965abc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pango-1.25.1.tar.bz2 +pango-1.25.2.tar.bz2 diff --git a/pango-1.25.1-cxx.patch b/pango-1.25.1-cxx.patch deleted file mode 100644 index 267cbdc..0000000 --- a/pango-1.25.1-cxx.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up pango-1.25.1/pango/opentype/Makefile.in.cxx pango-1.25.1/pango/opentype/Makefile.in ---- pango-1.25.1/pango/opentype/Makefile.in.cxx 2009-08-10 13:58:16.000000000 -0400 -+++ pango-1.25.1/pango/opentype/Makefile.in 2009-08-10 13:57:47.000000000 -0400 -@@ -105,7 +105,7 @@ CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CXX = $(CC) -fno-rtti -fno-exceptions -Wabi -Wpadded -Wcast-align -+CXX = @CXX@ - CXXCPP = @CXXCPP@ - CXXDEPMODE = @CXXDEPMODE@ - CXXFLAGS = @CXXFLAGS@ -@@ -264,6 +264,9 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - NULL = -+ -+# The following warning options are useful for debugging: -Wpadded -Wcast-align -+AM_CXXFLAGS = -fno-rtti -fno-exceptions - noinst_LTLIBRARIES = libharfbuzz.la - HBSOURCES = \ - hb-blob.c \ diff --git a/pango.spec b/pango.spec index ac9cf05..1def896 100644 --- a/pango.spec +++ b/pango.spec @@ -8,8 +8,8 @@ Summary: System for layout and rendering of internationalized text Name: pango -Version: 1.25.1 -Release: 7%{?dist} +Version: 1.25.2 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: http://download.gnome.org/sources/pango/1.25/pango-%{version}.tar.bz2 @@ -37,7 +37,6 @@ BuildRequires: gtk-doc # Look for pango.modules in an arch-specific directory Patch0: pango-1.21.4-lib64.patch -Patch1: pango-1.25.1-cxx.patch %description Pango is a library for laying out and rendering of text, with an emphasis @@ -73,7 +72,6 @@ for the pango package. %setup -q -n pango-%{version} %patch0 -p1 -b .lib64 -%patch1 -p1 -b .cxx %build @@ -228,6 +226,9 @@ fi %changelog +* Tue Aug 11 2009 Behdad Esfahbod - 1.25.2-1 +- 1.25.2 + * Mon Aug 10 2009 Behdad Esfahbod - 1.25.1-7 - Yes, I am stupid. diff --git a/sources b/sources index d1f25cb..212b43b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3bf29f8ac93e87b8719795f703e6e97d pango-1.25.1.tar.bz2 +22cc2affdb660049932b16b61c76214a pango-1.25.2.tar.bz2