[mediatomb/f14/master] Switched to xulrunner jsapi.h

rmattes rmattes at fedoraproject.org
Sun Apr 24 19:33:29 UTC 2011


commit f7be81cf5c726caaf1ec2963dcff20644cef2e65
Author: Rich Mattes <richmattes at gmail.com>
Date:   Wed Apr 13 22:21:55 2011 -0400

    Switched to xulrunner jsapi.h

 mediatomb.spec |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/mediatomb.spec b/mediatomb.spec
index 433ab93..1197b77 100644
--- a/mediatomb.spec
+++ b/mediatomb.spec
@@ -1,7 +1,7 @@
 Version: 0.12.1
 Summary: UPnP AV MediaServer 
 Name: mediatomb
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: MediaTomb - UPnP AV Mediaserver for Linux
 License: GPLv2
 Group: Applications/Multimedia
@@ -10,18 +10,16 @@ Source: http://downloads.sourceforge.net/mediatomb/%{name}-%{version}.tar.gz
 Patch0: mediatomb-0.12.1.fixogg.patch
 Patch1: mediatomb-0.12.1.fixbufferoverrun.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
-BuildRequires: sqlite-devel, mysql-devel, libexif-devel, id3lib-devel, file-devel, js-devel, zlib-devel, taglib-devel
+BuildRequires: sqlite-devel, mysql-devel, libexif-devel, id3lib-devel, file-devel, zlib-devel, taglib-devel
 BuildRequires: expat-devel, libcurl-devel
 BuildRequires: lastfmlib-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
@@ -43,7 +41,7 @@ be found on http://www.upnp.org/.
 %build
 # Fedora 13 on use system jsapi.h
 %if 0%{?fedora} >= 13
-%configure --enable-inotify --enable-taglib --enable-libjs
+%configure --enable-inotify --enable-taglib --enable-libjs --with-js-h=%{_includedir}/xulrunner-sdk-1.9.2/js
 %else
 # Fedora 11 and 12 use xulrunner 1.9.1 for jsapi.h
 %if 0%{?fedora} >= 11
@@ -110,12 +108,19 @@ fi
 %attr(-,mediatomb,mediatomb)%dir %{_sysconfdir}/%{name}/
 %attr(-,mediatomb,mediatomb)%ghost %{_sysconfdir}/%{name}/*
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%config(noreplace) %{_datadir}/%{name}/js/import.js
+%config(noreplace) %{_datadir}/%{name}/js/playlists.js
+%config(noreplace) %{_datadir}/%{name}/js/common.js
 %{_bindir}/mediatomb
 %{_datadir}/%{name}/
 %{_mandir}/man1/*
 %{_initrddir}/mediatomb
 
 %changelog
+* Wed Mar 23 2011 Rich Mattes <richmattes at gmail.com> - 0.12.1-6
+- Added more .js files as configuration files
+- Switch back to xulrunner jsapi.h
+
 * Mon Jan 17 2011 Rich Mattes <richmattes at gmail.com> - 0.12.1-5
 - Enable lastfmlib support (rhbz #638573)
 


More information about the scm-commits mailing list