rpms/mediatomb/devel import.log, NONE, 1.1 mediatomb_curl.patch, NONE, 1.1 mediatomb.spec, 1.5, 1.6

[Marc Wiriadisastra]

Author: mwiriadi

Update of /cvs/pkgs/rpms/mediatomb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16105/devel

Modified Files:
	mediatomb.spec 
Added Files:
	import.log mediatomb_curl.patch 
Log Message:
Added patch from upstream for Curl
Fix F-10 build




--- NEW FILE import.log ---
mediatomb-0_11_0-2_fc9:HEAD:mediatomb-0.11.0-2.fc9.src.rpm:1223381865

mediatomb_curl.patch:

--- NEW FILE mediatomb_curl.patch ---
--- mediatomb-0.11.0/src/url.cc	2008-03-01 23:48:36.000000000 +0100
+++ ../mediatomb/src/url.cc	2008-09-23 00:00:14.000000000 +0200
@@ -24,7 +24,7 @@
     version 2 along with MediaTomb; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
     
-    $Id: url.cc 1714 2008-03-01 17:33:21Z lww $
+    $Id: url.cc 1894 2008-09-22 21:57:19Z jin_eld $
 */
 
 /// \file url.cc
@@ -75,7 +75,7 @@
 
     if (only_header)
     {
-        curl_easy_setopt(curl_handle, CURLOPT_NOBODY);
+        curl_easy_setopt(curl_handle, CURLOPT_NOBODY, 1);
         curl_easy_setopt(curl_handle, CURLOPT_HEADERFUNCTION, URL::dl);
         curl_easy_setopt(curl_handle, CURLOPT_HEADERDATA, 
                          (void *)buffer.getPtr());
@@ -212,7 +212,7 @@
     else
         mt = String(ct);
     
-    log_debug("Extracted content length: %ld\n", cl);
+    log_debug("Extracted content length: %lld\n", (long long)cl);
 
     Ref<Stat> st(new Stat((off_t)cl, mt));
 


Index: mediatomb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mediatomb/devel/mediatomb.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mediatomb.spec	28 Aug 2008 18:40:12 -0000	1.5
+++ mediatomb.spec	7 Oct 2008 12:18:29 -0000	1.6
@@ -7,6 +7,7 @@
 Group: Applications/Multimedia
 Source: http://downloads.sourceforge.net/mediatomb/%{name}-%{version}.tar.gz
 Patch0: mediatomb-service-disable.patch
+Patch1: mediatomb_curl.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
@@ -32,10 +33,11 @@
 %prep 
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %if 0%{?fedora} >= 9
-%configure --enable-inotify --enable-taglib --enable-libjs --with-js-h=%{_includedir}/xulrunner-sdk-1.9pre/js/
+%configure --enable-inotify --enable-taglib --enable-libjs --with-js-h=%{_includedir}/
 %else
 %configure --enable-inotify --enable-taglib --enable-libjs
 %endif
@@ -92,13 +94,13 @@
 %attr(-,mediatomb,mediatomb)%ghost %{_sysconfdir}/%{name}/*
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %{_bindir}/mediatomb
-%{_datadir}/%{name}/
+%{_datadir}/%{name}/*
 %{_mandir}/man1/*
 %{_initrddir}/mediatomb
 
 %changelog
-* Thu Aug 28 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 0.11.0-2
-- Include /usr/share/mediatomb directory.
+* Tue Oct 7 2008 Marc Wiriadisastra <marc at mwiriadi.id.au> 0.11.0-2
+- Added patch from upstream for Curl
 
 * Sun Mar 2 2008 Marc Wiriadisastra <marc at mwiriadi.id.au> 0.11.0-1
 - New release version 0.11.0