version update minidlna_1.0.25_src.tar.gz and patch for ffmpeg 1.0

.abf.yml

@@ -1,2 +1,3 @@
 sources:
   "minidlna_1.0.24_src.tar.gz": 5e7fe50dbac5b5784e3d7a4eb9251fa9b37e97f2
+  minidlna_1.0.25_src.tar.gz: 33742f02367006c6e4af7128b91c830026e59b9f

initscript

@@ -1,80 +0,0 @@
-#!/bin/sh
-#
-# minidlna:   DLNA media server
-#
-# chkconfig: 3457 54 02
-# description:  This is a DLNA/UPnP-AV media server.
-#
-# processname: minidlna
-# pidfile: /var/run/minidlna.pid
-### BEGIN INIT INFO
-# Required-Start: $network
-# Required-Stop: $network
-# Should-Start:
-# Default-Start: 3 4 5 7
-# Short-Description: DLNA media server
-# Description: The MiniDLNA daemon is an UPnP-A/V and DLNA service which
-#              serves multimedia content to compatible clients on the network.
-### END INIT INFO
-
-# Sanity checks.
-[ -x /usr/sbin/minidlna ] || exit 0
-
-# Source function library.
-. /etc/init.d/functions
-
-# so we can rearrange this easily
-processname=minidlna
-servicename=minidlna
-
-RETVAL=0
-
-start() {
-    gprintf "Starting $servicename: "
-    daemon --check $servicename $processname
-    RETVAL=$?
-    echo
-    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename
-}
-
-stop() {
-    gprintf "Stopping $servicename: "
-
-    killproc $servicename -TERM
-    RETVAL=$?
-    echo
-    if [ $RETVAL -eq 0 ]; then
-        rm -f /var/lock/subsys/$servicename
-        rm -f /var/run/$servicename.pid
-    fi
-}
-
-# See how we were called.
-case "$1" in
-    start)
-        start
-        ;;
-    stop)
-        stop
-        ;;
-    status)
-        status $processname
-        RETVAL=$?
-        ;;
-    restart)
-        stop
-	sleep 3
-        start
-        ;;
-    condrestart)
-        if [ -f /var/lock/subsys/$servicename ]; then
-            stop
-	    sleep 3
-            start
-        fi
-        ;;
-    *)
-        gprintf "Usage: %s {start|stop|status|restart|condrestart}\n" "$0"
-        ;;
-esac
-exit $RETVAL

minidlna-1.0.25-ffmpeg10.patch

@@ -0,0 +1,64 @@
+The new ffmpeg-1.0 comes with the headers libavutil/time.h and 
+libavutil/log.h.  These overrule /usr/include/time.h and 
+minidlna-1.0.25/log.h due to the priority of '-I' set in the
+Makefile
+
+CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
+	 -I/usr/include/ffmpeg \
+	 -I/usr/include/libavutil -I/usr/include/libavcodec -I/usr/include/libavformat \
+	 -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat
+
+Here below is a patch removing the need for these search
+directories.  Backward compatibility could be guaranteed via
+'-I/usr/include/ffmpeg'.
+
+diff -u -p -r minidlna-1.0.25/Makefile minidlna-1.0.25-new/Makefile
+--- minidlna-1.0.25/Makefile	2012-01-17 23:49:01.000000000 +0100
++++ minidlna-1.0.25-new/Makefile	2012-10-25 01:53:04.000000000 +0200
+@@ -12,10 +12,14 @@
+ #
+ #CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG
+ #CFLAGS = -Wall -g -Os -D_GNU_SOURCE
+-CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
+-	 -I/usr/include/ffmpeg \
+-	 -I/usr/include/libavutil -I/usr/include/libavcodec -I/usr/include/libavformat \
+-	 -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat
++CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/ffmpeg
++#	 -I/usr/include/libavcodec
++#	 -I/usr/include/libavformat
++# overrules /usr/include/time.h
++#	 -I/usr/include/libavutil 
++# nonexistant
++#	 -I/usr/include/ffmpeg \
++#	 -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat
+ #STATIC_LINKING: CFLAGS += -DSTATIC
+ #STATIC_LINKING: LDFLAGS = -static
+ CC = gcc
+diff -u -p -r minidlna-1.0.25/metadata.c minidlna-1.0.25-new/metadata.c
+--- minidlna-1.0.25/metadata.c	2012-06-29 23:11:29.000000000 +0200
++++ minidlna-1.0.25-new/metadata.c	2012-10-25 01:53:37.000000000 +0200
+@@ -30,9 +30,9 @@
+ #include "image_utils.h"
+ #include <jpeglib.h>
+ #include <setjmp.h>
+-#include <avutil.h>
+-#include <avcodec.h>
+-#include <avformat.h>
++#include <libavutil/avutil.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
+ #include "tagutils/tagutils.h"
+ 
+ #include "upnpglobalvars.h"
+diff -u -p -r minidlna-1.0.25/tagutils/tagutils-plist.c minidlna-1.0.25-new/tagutils/tagutils-plist.c
+--- minidlna-1.0.25/tagutils/tagutils-plist.c	2012-01-17 23:54:47.000000000 +0100
++++ minidlna-1.0.25-new/tagutils/tagutils-plist.c	2012-10-25 01:49:33.000000000 +0200
+@@ -27,7 +27,7 @@
+ #include "misc.h"
+ #include "tagutils.h"
+ #include "textutils.h"
+-#include "log.h"
++#include "../log.h"
+ 
+ 
+ #define MAX_BUF 4096

minidlna-tmpfiles.conf

@@ -0,0 +1 @@
+d /var/run/minidlna   755 minidlna minidlna

minidlna.spec

@@ -1,16 +1,12 @@
-%if "%{_unitdir}" == "%%{unitdir}"
-%define %{_unitdir} /lib/systemd/system
-%endif
-
 Summary:	A DLNA/UPnP-AV compliant media server
 Name:		minidlna
-Version:	1.0.24
+Version:	1.0.25
-Release:	%mkrel 2
+Release:	%mkrel 1
 URL:		http://sourceforge.net/projects/minidlna/
 Group:		Networking/Other
-License:	GPL
+License:	GPLv2
-Source0:	minidlna_%{version}_src.tar.gz
+Source0:	http://downloads.sourceforge.net/project/minidlna/minidlna/%{version}/minidlna_%{version}_src.tar.gz
-Source1:	initscript
+Source2:	minidlna-tmpfiles.conf
 Source3:	minidlna.1
 Source4:	minidlna.conf.5
 Source5:	%{name}.service
@@ -19,17 +15,17 @@ Source5:	%{name}.service
 #Patch100:
 # Selected patches from upstream patch tracker
 #Patch200:
-BuildRequires:	libflac-devel
+Patch0:		minidlna-1.0.25-ffmpeg10.patch
+BuildRequires:	pkgconfig(flac)
 BuildRequires:	libid3tag-devel
 BuildRequires:	libexif-devel
 BuildRequires:	libjpeg-devel
-BuildRequires:	sqlite3-devel
+BuildRequires:	pkgconfig(sqlite3)
 BuildRequires:	ffmpeg-devel
-BuildRequires:	libvorbis-devel
+BuildRequires:	pkgconfig(vorbis)
 BuildRequires:	systemd-units
 Requires(post):	rpm-helper
 Requires(preun):	rpm-helper
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 %description
 MiniDLNA (aka ReadyDLNA) is server software with the aim of being fully
@@ -41,6 +37,7 @@ and http://www.dlna.org/ for mode details on DLNA.
 
 %prep
 %setup -q
+%patch0 -p1
 
 ./genconfig.sh
 sed -i -e 's!^\(#define OS_NAME\).*!\1 "%{product_vendor}"!
@@ -63,23 +60,15 @@ sed -i 's/@$(CC)/$(CC)/' Makefile
 %make
 
 %install
-rm -rf %{buildroot}
-
 %makeinstall_std
 
-%if %mdkver >= 201100
 install -D -p -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/%{name}.service
-%else
-install -m 755 -D %{SOURCE1} %{buildroot}%{_initrddir}/minidlna
-%endif
-
 install -m 644 -D minidlna.conf %{buildroot}%{_sysconfdir}/minidlna.conf
 install -m 644 -D %{SOURCE3} %{buildroot}%{_mandir}/man1/minidlna.1
 install -m 644 -D %{SOURCE4} %{buildroot}%{_mandir}/man5/minidlna.conf.5
 
-
+mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
-%clean
+install -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
-rm -rf %{buildroot}
 
 %post
 %_post_service minidlna
@@ -91,76 +80,8 @@ rm -rf %{buildroot}
 %defattr(0644,root,root,0755)
 %doc README
 %attr(755,-,-) %{_sbindir}/minidlna
-%if %mdkver >= 201100
 %{_unitdir}/%{name}.service
-%else
-%attr(755,-,-) %{_initrddir}/minidlna
-%endif
 %config(noreplace) %{_sysconfdir}/minidlna.conf
+%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
 %{_mandir}/man1/minidlna.1*
 %{_mandir}/man5/minidlna.conf.5*
-
-
-%changelog
-* Mon Feb 27 2012 Tomasz Pawel Gajc <tpg@mandriva.org> 1.0.24-2mdv2012.0
-+ Revision: 780959
-- use upstream config file
-- update to new version 1.0.24
-
-* Sun Feb 05 2012 Tomasz Pawel Gajc <tpg@mandriva.org> 1.0.23-2
-+ Revision: 771266
-- update to new version 1.0.23
-
-  + Claudio Matsuoka <claudio@mandriva.com>
-    - address rpmlint errors
-    - make spec buildable in 2011 with undefined %%{_unitdir}
-
-* Sat Jan 07 2012 Tomasz Pawel Gajc <tpg@mandriva.org> 1.0.22-4
-+ Revision: 758635
-- obey %%optflags
-- switch to verbose mode while compiling
-- provide minidlna.service
-- spec file clean
-
-* Wed Dec 21 2011 Tomasz Pawel Gajc <tpg@mandriva.org> 1.0.22-3
-+ Revision: 744182
-- revert use os setup_compile_flags
-- make use of %%serverbuild_hardened
-- use %%setup_compile_flags
-
-* Sat Sep 17 2011 Claudio Matsuoka <claudio@mandriva.com> 1.0.22-1
-+ Revision: 700180
-- new upstream release 1.0.22
-  * includes fixes for TiVo, Marantz receivers, Roku SoundBridge and
-    Samsung series B and D TVs.
-
-* Mon Jul 04 2011 Claudio Matsuoka <claudio@mandriva.com> 1.0.20-1
-+ Revision: 688671
-- new upstream release 1.0.20
-  * Fix a crash bug when scanning MPEG-TS files with odd packet sizes
-  * Fix AVI file streaming on Samsung A-Series TV's
-  * Improve support for the NETGEAR Digital Entertainer Live (EVA2000)
-  * Add support for multiple network interfaces
-  * Add subtitle support for LG TV's and Blu-Ray players
-  * Fix some minor coding issues found by cppcheck
-  * Add client adaptation support for Toshiba Regza TV's
-  * Send known audio-only devices straight to the Music section on root request
-  * Add client adaptation support for Roku SoundBridge audio clients
-  * Improve Sony client adaptation to allow support for more file types
-  * Add support for reading tags from MP4 video files with recent lavf versions
-  * Add support for Samsung's GetFeatureList method
-
-* Wed Jan 26 2011 Claudio Matsuoka <claudio@mandriva.com> 1.0.18.2-3
-+ Revision: 633000
-- send to release repository
-
-* Sun Jan 23 2011 Claudio Matsuoka <claudio@mandriva.com> 1.0.18.2-2
-+ Revision: 632427
-- apply upstream patch to specify log directory
-- set configuration file as noreplace
-- add manual pages written by Beno?\195?\174t Knecht for Debian
-
-* Sat Jan 22 2011 Claudio Matsuoka <claudio@mandriva.com> 1.0.18.2-1
-+ Revision: 632299
-- imported package minidlna
-