diff --git a/atomiclookup-collision.patch b/atomiclookup-collision.patch new file mode 100644 index 0000000..3df776c --- /dev/null +++ b/atomiclookup-collision.patch @@ -0,0 +1,11 @@ +diff -up gtk+-2.12.3/gtk-doc.make.atomiclookup-collision gtk+-2.12.3/gtk-doc.make +--- gtk+-2.12.3/gtk-doc.make.atomiclookup-collision 2007-12-18 13:36:12.000000000 -0500 ++++ gtk+-2.12.3/gtk-doc.make 2007-12-18 13:36:42.000000000 -0500 +@@ -128,6 +128,7 @@ maintainer-clean-local: clean + cd $(srcdir) && rm -rf xml html + + install-data-local: ++ ls $(srcdir)/html > /dev/null; \ + installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ diff --git a/gtk2.spec b/gtk2.spec index abc676c..87c2c21 100644 --- a/gtk2.spec +++ b/gtk2.spec @@ -43,6 +43,9 @@ Patch5: im-setting.patch # fix a gtk-doc issue Patch6: gtkdoc-rebase.patch +# work around a kernel bug on build systems +Patch7: atomiclookup-collision.patch + BuildRequires: atk-devel >= %{atk_version} BuildRequires: pango-devel >= %{pango_version} BuildRequires: glib2-devel >= %{glib2_version} @@ -123,6 +126,7 @@ docs for the GTK+ widget toolkit. %patch4 -p1 -b .tab-label %patch5 -p1 -b .im-setting %patch6 -p1 -b .gtkdoc-rebase +%patch7 -p1 -b .atomiclookup-collision for i in config.guess config.sub ; do test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i . @@ -142,7 +146,7 @@ if ! pkg-config --exists pangoxft ; then exit 1 fi -%configure --with-xinput=xfree --disable-gtk-doc --disable-rebuilds --with-included-loaders=png --enable-debug +%configure --with-xinput=xfree --disable-gtk-doc --disable-rebuilds --with-included-loaders=png ## smp_mflags doesn't work for now due to gdk-pixbuf.loaders, may be fixed ## past gtk 2.1.2 @@ -307,6 +311,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Tue Dec 18 2007 Matthias Clasen - 2.12.3-4 - Fix a gtk-doc problem +- Work around a kernel problem in the build system * Mon Dec 17 2007 Matthias Clasen - 2.12.3-3 - Add a setting to change input methods