rpms/mediatomb/devel mediatomb.spec,1.16,1.17

[rmattes]

Author: rmattes

Update of /cvs/pkgs/rpms/mediatomb/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19215

Modified Files:
	mediatomb.spec 
Log Message:
* Sun Jun 20 2010 Rich Mattes <richmattes at gmail.com> - 0.12.1-2
- Fixed specfile dependancies so configure only runs once
- Removed dependency on xulrunner, use system jsapi.h



Index: mediatomb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mediatomb/devel/mediatomb.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- mediatomb.spec	12 Jun 2010 20:49:30 -0000	1.16
+++ mediatomb.spec	21 Jun 2010 03:47:14 -0000	1.17
@@ -1,7 +1,7 @@
 Version: 0.12.1
 Summary: UPnP AV MediaServer 
 Name: mediatomb
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: MediaTomb - UPnP AV Mediaserver for Linux
 License: GPLv2
 Group: Applications/Multimedia
@@ -11,11 +11,14 @@ Buildroot: %{_tmppath}/%{name}-%{version
 BuildRequires: sqlite-devel, mysql-devel, libexif-devel, id3lib-devel, file-devel, js-devel, zlib-devel, taglib-devel
 BuildRequires: expat-devel, libcurl-devel
 BuildRequires: libmp4v2-devel
+%if 0%{?fedora} >= 13
+%else
 %if 0%{?fedora} >= 9
 BuildRequires: xulrunner-devel
 %else
 BuildRequires: firefox-devel
 %endif
+%endif
 Requires: mysql-libs, expat
 Requires(pre): shadow-utils
 Requires(post): /sbin/chkconfig
@@ -33,13 +36,23 @@ be found on http://www.upnp.org/.
 %setup -q
 
 %build
-%if 0%{?fedora} >= 11
+# Fedora 13 on use system jsapi.h
+%if 0%{?fedora} >= 13
 %configure --enable-inotify --enable-taglib --enable-libjs
-%else if 0%{?fedora} = 10
+%else
+# Fedora 11 and 12 use xulrunner 1.9.1 for jsapi.h
+%if 0%{?fedora} >= 11
+%configure --enable-inotify --enable-taglib --enable-libjs --with-js-h=%{_includedir}/xulrunner-sdk-1.9.1/js
+%else
+# Fedora 10 uses xulrunner 1.9 for jsapi.h
+%if 0%{?fedora} = 10
 %configure --enable-inotify --enable-taglib --enable-libjs --with-js-h=%{_includedir}/xulrunner-sdk-1.9/js
+# Fedora 9 and below use system libjs
 %else
 %configure --enable-inotify --enable-taglib --enable-libjs
 %endif
+%endif
+%endif
 %{__make} %{?_smp_mflags}
 
 
@@ -98,6 +111,10 @@ fi
 %{_initrddir}/mediatomb
 
 %changelog
+* Sun Jun 20 2010 Rich Mattes <richmattes at gmail.com> - 0.12.1-2
+- Fixed specfile dependancies so configure only runs once
+- Removed dependency on xulrunner, use system jsapi.h
+
 * Sat Jun 12 2010 Rich Mattes <richmattes at gmail.com> - 0.12.1-1
 - Update to version 12.1
 - Remove some patches, now included upstream