rpms/xine-lib-extras-freeworld/F-8 xine-lib-extras-freeworld.spec, 1.3, 1.4

[Rex Dieter]

Author: rdieter

Update of /cvs/free/rpms/xine-lib-extras-freeworld/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4591

Modified Files:
	xine-lib-extras-freeworld.spec 
Log Message:
* Thu Sep 25 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.15-3
- drop "nonfree" verbage from summary/description



Index: xine-lib-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/F-8/xine-lib-extras-freeworld.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xine-lib-extras-freeworld.spec	16 Sep 2008 14:19:27 -0000	1.3
+++ xine-lib-extras-freeworld.spec	25 Sep 2008 12:26:47 -0000	1.4
@@ -3,10 +3,14 @@
 
 %define abiver  1.24
 
+%if 0%{?fedora} > 6
+%define _with_external_ffmpeg --with-external-ffmpeg
+%endif
+
 Name:           xine-lib-extras-freeworld
-Summary:        Non-free extra codecs for the Xine library
+Summary:        Extra codecs for the Xine multimedia library
 Version:        1.1.15
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -19,7 +23,7 @@
 BuildRequires:  zlib-devel
 BuildRequires:  gawk
 # External libs
-BuildRequires:  ffmpeg-devel >= 0.4.9-0.22.20060804
+%{?_with_external_ffmpeg:BuildRequires:  ffmpeg-devel >= 0.4.9-0.22.20060804}
 BuildRequires:  a52dec-devel
 BuildRequires:  libmad-devel
 BuildRequires:  libdca-devel
@@ -45,8 +49,10 @@
 Obsoletes:      xine-lib-moles < 1.1.12-2
 
 %description
-This package adds extra functionality to the Xine library. Those
-plugins may contain patented code.
+This package contains extra codecs for the Xine multimedia library.  These
+are free and opensource but left out of the official Fedora repository for 
+one reason or another.  Once installed, applications using the xine library
+will automatically regcognize and use these additional codecs.
 
 
 %prep
@@ -65,7 +71,6 @@
 # Keep order of options the same as in ./configure --help for easy maintenance
 %configure \
     --disable-dependency-tracking \
-    --with-external-ffmpeg \
     --enable-ipv6 \
     --disable-opengl \
     --disable-xvmc \
@@ -85,7 +90,7 @@
     --disable-gnomevfs \
     --disable-gdkpixbuf \
     --disable-samba \
-    --with-external-ffmpeg \
+    %{?_with_external_ffmpeg} \
     --with-external-a52dec \
     --with-external-libmad \
     --with-external-libdts
@@ -172,6 +177,9 @@
 
 
 %changelog
+* Thu Sep 25 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.15-3
+- drop "nonfree" verbage from summary/description
+
 * Thu Sep 04 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.15-2
 - bump Obsoletes: xine-lib-extras-nonfree
 - spec cosmetics