[ffgtk/f15: 6/8] Merge branch 'master' into f15

[Louis Lagendijk]

commit dc2e6ba6216b107627fe4f473f39aaeee04952c7
Merge: 2180fc1 aa3f43e
Author: Louis Lagendijk <louis at lagendijk.xs4all.nl>
Date:   Tue Jul 5 15:00:26 2011 +0200

    Merge branch 'master' into f15
    
    Conflicts:
    	.gitignore
    	ffgtk-use-old-spooler.patch
    	ffgtk.spec
    	sources

 .gitignore                  |    2 +-
 ffgtk-use-old-spooler.patch |   36 +++-----------------
 ffgtk.spec                  |   75 ++++++++++++++++++++++++------------------
 sources                     |    2 +-
 4 files changed, 51 insertions(+), 64 deletions(-)
---
diff --cc .gitignore
index f0096a4,241608e..03010d9
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--/ffgtk-0.7.8.tar.bz2
+ /ffgtk-0.7.94.tar.bz2
diff --cc ffgtk.spec
index 9ea33e6,a9fae9c..020d6e7
--- a/ffgtk.spec
+++ b/ffgtk.spec
@@@ -170,11 -169,7 +169,6 @@@ rm -rf %{buildroot
  %{_libdir}/ffgtk/plugins/lib_ab_ebook.so.0.0.0
  
  %files plugin-capifax
- %defattr(-,root,root,-)
- %{_libdir}/ffgtk/plugins/lib_fax_capifax.so.0
- %{_libdir}/ffgtk/plugins/lib_fax_capifax.so.0.0.0
- %{_datadir}/cups/model/ffgtk-fax.ppd
--
  %files plugin-gstreamer
  %defattr(-,root,root,-)
  %{_libdir}/ffgtk/plugins/lib_audio_gstreamer.so.0