rpms/mediatomb/F-12 .cvsignore, 1.3, 1.4 mediatomb.spec, 1.15, 1.16 sources, 1.3, 1.4

[rmattes]

Author: rmattes

Update of /cvs/pkgs/rpms/mediatomb/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8816

Modified Files:
	.cvsignore mediatomb.spec sources 
Log Message:
* Sun Jun 20 2010 Rich Mattes <richmattes at gmail.com> - 0.12.1-1
- Update to version 12.1
- Remove some patches, now included upstream
- Fixed include paths for xulrunner jsapi.h



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mediatomb/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	2 Mar 2008 16:54:36 -0000	1.3
+++ .cvsignore	20 Jun 2010 16:09:41 -0000	1.4
@@ -1 +1 @@
-mediatomb-0.11.0.tar.gz
+mediatomb-0.12.1.tar.gz


Index: mediatomb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mediatomb/F-12/mediatomb.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- mediatomb.spec	21 Aug 2009 14:30:27 -0000	1.15
+++ mediatomb.spec	20 Jun 2010 16:09:41 -0000	1.16
@@ -1,17 +1,16 @@
-Version: 0.11.0
+Version: 0.12.1
 Summary: UPnP AV MediaServer 
 Name: mediatomb
-Release: 11%{?dist}
+Release: 1%{?dist}
 Summary: MediaTomb - UPnP AV Mediaserver for Linux
 License: GPLv2
 Group: Applications/Multimedia
 Source: http://downloads.sourceforge.net/mediatomb/%{name}-%{version}.tar.gz
-Patch0: mediatomb-service-disable.patch
-Patch1: mediatomb_fedora11.patch
 URL: http://mediatomb.cc
 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: expat-devel, libcurl-devel
+BuildRequires: libmp4v2-devel
 %if 0%{?fedora} >= 9
 BuildRequires: xulrunner-devel
 %else
@@ -32,17 +31,21 @@ MediaTomb implements the UPnP MediaServe
 be found on http://www.upnp.org/.
 %prep 
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
-%if 0%{?fedora} >= 11
-%configure --enable-inotify --enable-taglib --enable-libjs --with-js-h=%{_includedir}/xulrunner-sdk-1.9.1/js/
-%else if 0%{?fedora} = 10
-%configure --enable-inotify --enable-taglib --enable-libjs --with-js-h=%{_includedir}/xulrunner-sdk-1.9/js/
+%if 0%{?fedora} == 12
+%configure --enable-inotify --enable-taglib --enable-libjs --with-js-h=%{_includedir}/xulrunner-sdk-1.9.1/js
+%else
+%if 0%{?fedora} == 11
+%configure --enable-inotify --enable-taglib --enable-libjs --with-js-h=%{_includedir}/xulrunner-sdk-1.9.1/js
+%else
+%if 0%{?fedora} == 10
+%configure --enable-inotify --enable-taglib --enable-libjs --with-js-h=%{_includedir}/xulrunner-sdk-1.9/js
 %else
 %configure --enable-inotify --enable-taglib --enable-libjs
 %endif
+%endif
+%endif
 %{__make} %{?_smp_mflags}
 
 
@@ -101,6 +104,11 @@ fi
 %{_initrddir}/mediatomb
 
 %changelog
+* Sun Jun 20 2010 Rich Mattes <richmattes at gmail.com> - 0.12.1-1
+- Update to version 12.1
+- Remove some patches, now included upstream
+- Fixed include paths for xulrunner jsapi.h
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.11.0-11
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mediatomb/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	2 Mar 2008 16:54:36 -0000	1.3
+++ sources	20 Jun 2010 16:09:41 -0000	1.4
@@ -1 +1 @@
-661f08933830d920de21436fe122fb15  mediatomb-0.11.0.tar.gz
+e927dd5dc52d3cfcebd8ca1af6f0d3c2  mediatomb-0.12.1.tar.gz