don't build against aalib on RHEL
This commit is contained in:
		
							parent
							
								
									a2ccfe2d6c
								
							
						
					
					
						commit
						5cbbbe04c4
					
				
							
								
								
									
										26
									
								
								gimp.spec
									
									
									
									
									
								
							
							
						
						
									
										26
									
								
								gimp.spec
									
									
									
									
									
								
							| @ -19,12 +19,19 @@ | |||||||
| %bcond_without gutenprint | %bcond_without gutenprint | ||||||
| # convenience: install convenience symlinks | # convenience: install convenience symlinks | ||||||
| %bcond_without convenience | %bcond_without convenience | ||||||
|  | # aalib:       build with AAlib (ASCII art gfx library) | ||||||
|  | %if 0%{?rhel} != 0 | ||||||
|  | # don't use aalib on RHEL | ||||||
|  | %bcond_with aalib | ||||||
|  | %else | ||||||
|  | %bcond_without aalib | ||||||
|  | %endif | ||||||
| 
 | 
 | ||||||
| Summary:        GNU Image Manipulation Program | Summary:        GNU Image Manipulation Program | ||||||
| Name:           gimp | Name:           gimp | ||||||
| Epoch:          2 | Epoch:          2 | ||||||
| Version:        2.6.6 | Version:        2.6.6 | ||||||
| Release:        3%{?dist} | Release:        4%{?dist} | ||||||
| %define binver 2.6 | %define binver 2.6 | ||||||
| %define gimp_lang_ver 20 | %define gimp_lang_ver 20 | ||||||
| %define interfacever 2.0 | %define interfacever 2.0 | ||||||
| @ -38,7 +45,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n) | |||||||
| Obsoletes:      gimp-perl < 2:2.0 | Obsoletes:      gimp-perl < 2:2.0 | ||||||
| Obsoletes:      gimp < 2:2.6.0-3 | Obsoletes:      gimp < 2:2.6.0-3 | ||||||
| BuildRequires:  chrpath | BuildRequires:  chrpath | ||||||
|  | %if %{with aalib} | ||||||
| BuildRequires:  aalib-devel | BuildRequires:  aalib-devel | ||||||
|  | %endif | ||||||
| BuildRequires:  alsa-lib-devel >= 1.0.0 | BuildRequires:  alsa-lib-devel >= 1.0.0 | ||||||
| BuildRequires:  babl-devel >= 0.0.22 | BuildRequires:  babl-devel >= 0.0.22 | ||||||
| BuildRequires:  cairo-devel >= 1.4.10 | BuildRequires:  cairo-devel >= 1.4.10 | ||||||
| @ -182,6 +191,7 @@ build the print plugin:                   %{with print} | |||||||
| prefer gutenprint over (external) gimp-print plugin: | prefer gutenprint over (external) gimp-print plugin: | ||||||
|                                           %{with gutenprint} |                                           %{with gutenprint} | ||||||
| %endif | %endif | ||||||
|  | build ASCII art plugin                    %{with aalib} | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| EOF | EOF | ||||||
| @ -192,9 +202,10 @@ EOF | |||||||
| %patch2 -p1 -b .minimize-dialogs | %patch2 -p1 -b .minimize-dialogs | ||||||
| 
 | 
 | ||||||
| %build | %build | ||||||
| if [ ! -f configure ]; then | # if [ ! -f configure ]; then | ||||||
|   ./autogen.sh --quiet $MYARCH_FLAGS --prefix=%{_prefix} | #   ./autogen.sh --quiet $MYARCH_FLAGS --prefix=%{_prefix} | ||||||
| fi | # fi | ||||||
|  | 
 | ||||||
| # Use PIC/PIE because gimp is likely to deal with files coming from untrusted | # Use PIC/PIE because gimp is likely to deal with files coming from untrusted | ||||||
| # sources | # sources | ||||||
| CFLAGS='-fPIC %optflags -fno-strict-aliasing' | CFLAGS='-fPIC %optflags -fno-strict-aliasing' | ||||||
| @ -228,7 +239,11 @@ LDFLAGS='-pie' | |||||||
|     --without-lcms \ |     --without-lcms \ | ||||||
| %endif | %endif | ||||||
|     --enable-gimp-console \ |     --enable-gimp-console \ | ||||||
|  | %if %{with aalib} | ||||||
|     --with-aa \ |     --with-aa \ | ||||||
|  | %else | ||||||
|  |     --without-aa \ | ||||||
|  | %endif | ||||||
| %ifos linux | %ifos linux | ||||||
|     --with-linux-input \ |     --with-linux-input \ | ||||||
| %endif | %endif | ||||||
| @ -475,6 +490,9 @@ fi | |||||||
| %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser | %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser | ||||||
| 
 | 
 | ||||||
| %changelog | %changelog | ||||||
|  | * Thu Jun 04 2009 Nils Philippsen <nils@redhat.com> - 2:2.6.6-4 | ||||||
|  | - don't build against aalib on RHEL | ||||||
|  | 
 | ||||||
| * Tue Apr 14 2009 Nils Philippsen <nils@redhat.com> - 2:2.6.6-3 | * Tue Apr 14 2009 Nils Philippsen <nils@redhat.com> - 2:2.6.6-3 | ||||||
| - remove rpaths from binaries (#495670) | - remove rpaths from binaries (#495670) | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user