rpms/gimp/devel gimp.spec,1.190,1.191

[Nils Philippsen]

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31682

Modified Files:
	gimp.spec 
Log Message:
don't build against aalib on RHEL



Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -p -r1.190 -r1.191
--- gimp.spec	14 Apr 2009 15:39:24 -0000	1.190
+++ gimp.spec	4 Jun 2009 15:23:53 -0000	1.191
@@ -19,12 +19,19 @@
 %bcond_without gutenprint
 # convenience: install convenience symlinks
 %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
 Name:           gimp
 Epoch:          2
 Version:        2.6.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 %define binver 2.6
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -38,7 +45,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Obsoletes:      gimp-perl < 2:2.0
 Obsoletes:      gimp < 2:2.6.0-3
 BuildRequires:  chrpath
+%if %{with aalib}
 BuildRequires:  aalib-devel
+%endif
 BuildRequires:  alsa-lib-devel >= 1.0.0
 BuildRequires:  babl-devel >= 0.0.22
 BuildRequires:  cairo-devel >= 1.4.10
@@ -182,6 +191,7 @@ build the print plugin:                 
 prefer gutenprint over (external) gimp-print plugin:
                                           %{with gutenprint}
 %endif
+build ASCII art plugin                    %{with aalib}
 
 
 EOF
@@ -192,9 +202,10 @@ EOF
 %patch2 -p1 -b .minimize-dialogs
 
 %build
-if [ ! -f configure ]; then
-  ./autogen.sh --quiet $MYARCH_FLAGS --prefix=%{_prefix}
-fi
+# if [ ! -f configure ]; then
+#   ./autogen.sh --quiet $MYARCH_FLAGS --prefix=%{_prefix}
+# fi
+
 # Use PIC/PIE because gimp is likely to deal with files coming from untrusted
 # sources
 CFLAGS='-fPIC %optflags -fno-strict-aliasing'
@@ -228,7 +239,11 @@ LDFLAGS='-pie'
     --without-lcms \
 %endif
     --enable-gimp-console \
+%if %{with aalib}
     --with-aa \
+%else
+    --without-aa \
+%endif
 %ifos linux
     --with-linux-input \
 %endif
@@ -475,6 +490,9 @@ fi
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Thu Jun 04 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.6-4
+- don't build against aalib on RHEL
+
 * Tue Apr 14 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.6-3
 - remove rpaths from binaries (#495670)