rpms/gtk2/devel atomiclookup-collision.patch, NONE, 1.1 gtk2.spec, 1.273, 1.274

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5700

Modified Files:
	gtk2.spec 
Added Files:
	atomiclookup-collision.patch 
Log Message:
work around a kernel problem


atomiclookup-collision.patch:

--- NEW FILE atomiclookup-collision.patch ---
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' ; \


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -r1.273 -r1.274
--- gtk2.spec	18 Dec 2007 17:14:12 -0000	1.273
+++ gtk2.spec	18 Dec 2007 18:39:11 -0000	1.274
@@ -43,6 +43,9 @@
 # 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 @@
 %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 @@
         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 @@
 %changelog
 * Tue Dec 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.3-4
 - Fix a gtk-doc problem
+- Work around a kernel problem in the build system
 
 * Mon Dec 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.3-3
 - Add a setting to change input methods