[nntpgrab/f12/master: 4/4] Merge branch 'f12/master' of ssh://pkgs.fedoraproject.org/nntpgrab into f12

[epienbro]

commit fd6446701671da365eb4b50ba1b716defeaf1d58
Merge: a86e3f1 a586d2c
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Mon Sep 6 21:58:27 2010 +0200

    Merge branch 'f12/master' of ssh://pkgs.fedoraproject.org/nntpgrab into f12

 nntpgrab.spec |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)
---
diff --cc nntpgrab.spec
index 38921cb,0521071..3d7d9d1
--- a/nntpgrab.spec
+++ b/nntpgrab.spec
@@@ -172,16 -170,9 +171,12 @@@ embedded webinterface which doesn't req
  %prep
  %setup -q
  
 +# Backport of upstream commit 1722. Fixes a dependency resolving issue
 +%patch0 -p0
 +
  
  %build
- %if 0%{?fedora}
- %configure --enable-php-module --disable-gtk3 --enable-gtk-doc
- %else
  %configure --enable-php-module --disable-gtk3
- %endif
  make %{?_smp_mflags}
  
  # The Qt frontend has a seperate build process