work around a kernel problem
This commit is contained in:
		
							parent
							
								
									40ea37ec11
								
							
						
					
					
						commit
						04a32bcd5e
					
				
							
								
								
									
										11
									
								
								atomiclookup-collision.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								atomiclookup-collision.patch
									
									
									
									
									
										Normal file
									
								
							| @ -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' ; \ | ||||||
| @ -43,6 +43,9 @@ Patch5: im-setting.patch | |||||||
| # fix a gtk-doc issue | # fix a gtk-doc issue | ||||||
| Patch6: gtkdoc-rebase.patch | Patch6: gtkdoc-rebase.patch | ||||||
| 
 | 
 | ||||||
|  | # work around a kernel bug on build systems | ||||||
|  | Patch7: atomiclookup-collision.patch | ||||||
|  | 
 | ||||||
| BuildRequires: atk-devel >= %{atk_version} | BuildRequires: atk-devel >= %{atk_version} | ||||||
| BuildRequires: pango-devel >= %{pango_version} | BuildRequires: pango-devel >= %{pango_version} | ||||||
| BuildRequires: glib2-devel >= %{glib2_version} | BuildRequires: glib2-devel >= %{glib2_version} | ||||||
| @ -123,6 +126,7 @@ docs for the GTK+ widget toolkit. | |||||||
| %patch4 -p1 -b .tab-label | %patch4 -p1 -b .tab-label | ||||||
| %patch5 -p1 -b .im-setting | %patch5 -p1 -b .im-setting | ||||||
| %patch6 -p1 -b .gtkdoc-rebase | %patch6 -p1 -b .gtkdoc-rebase | ||||||
|  | %patch7 -p1 -b .atomiclookup-collision | ||||||
| 
 | 
 | ||||||
| for i in config.guess config.sub ; do | for i in config.guess config.sub ; do | ||||||
|   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i . |   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i . | ||||||
| @ -142,7 +146,7 @@ if ! pkg-config --exists pangoxft ; then | |||||||
|         exit 1 |         exit 1 | ||||||
| fi | 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  | ## smp_mflags doesn't work for now due to gdk-pixbuf.loaders, may be fixed  | ||||||
| ## past gtk 2.1.2 | ## past gtk 2.1.2 | ||||||
| @ -307,6 +311,7 @@ rm -rf $RPM_BUILD_ROOT | |||||||
| %changelog | %changelog | ||||||
| * Tue Dec 18 2007 Matthias Clasen <mclasen@redhat.com> - 2.12.3-4 | * Tue Dec 18 2007 Matthias Clasen <mclasen@redhat.com> - 2.12.3-4 | ||||||
| - Fix a gtk-doc problem | - Fix a gtk-doc problem | ||||||
|  | - Work around a kernel problem in the build system | ||||||
| 
 | 
 | ||||||
| * Mon Dec 17 2007 Matthias Clasen <mclasen@redhat.com> - 2.12.3-3 | * Mon Dec 17 2007 Matthias Clasen <mclasen@redhat.com> - 2.12.3-3 | ||||||
| - Add a setting to change input methods | - Add a setting to change input methods | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user