minidlna: Update to 1.1.2.

diff --git a/minidlna/minidlna.nm b/minidlna/minidlna.nm
index 2c4d4a7301670b5323d65f249b24db99da2aa109..d6cc2d3a072017a3c40fa6262ee5ba5c8a2dccc4 100644 (file)
--- a/minidlna/minidlna.nm
+++ b/minidlna/minidlna.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = minidlna
-version    = 1.0.26
+version    = 1.1.2
 release    = 1
 
 groups     = System/Daemons
@@ -26,6 +26,7 @@ source_dl  = http://downloads.sourceforge.net/%{name}/
 
 build
        requires
+               gettext
                ffmpeg-devel
                flac-devel
                libexif-devel
@@ -36,13 +37,14 @@ build
                sqlite-devel
        end
 
-       prepare_cmds
-               # Honor our CFLAGS and include ffmpeg headers
-               sed -i 's!CFLAGS = -Wall -g -O3!CFLAGS += -I/usr/include/ffmpeg/!' Makefile
-
-               # Verbose Makefile
-               sed -i 's/@$(CC)/$(CC)/;s/&& exit 0\; \\//;/echo "The following command failed:/d' Makefile
+       configure_options += \
+               --disable-silent-rules \
+               --disable-rpath \
+               --with-db-path=%{localstatedir}/cache/%{name} \
+               --with-log-path=%{localstatedir}/log/%{name} \
+               --enable-tivo
 
+       prepare_cmds
                # Edit the default config file to run the daemon with the minidlna user
                sed -i 's/#db_dir=\/var\/cache\/minidlna/db_dir=\/var\/cache\/minidlna/' \
                        %{name}.conf
@@ -55,7 +57,15 @@ build
 
        install_cmds
                # Install configuration file.
-               make install-conf DESTDIR=%{BUILDROOT}
+               mkdir -pv %{BUILDROOT}%{sysconfdir}
+               install -m 644 %{name}.conf %{BUILDROOT}%{sysconfdir}
+
+               # Install man pages
+               mkdir -p %{BUILDROOT}%{mandir}/man5
+               install -m 644 minidlna.conf.5 %{BUILDROOT}%{mandir}/man5/
+
+               mkdir -p %{BUILDROOT}%{mandir}/man8
+               install -m 644 minidlnad.8 %{BUILDROOT}%{mandir}/man8/
 
                # Create cache and log directories.
                mkdir -pv %{BUILDROOT}%{localstatedir}/cache
@@ -64,6 +74,7 @@ build
                mkdir -pv %{BUILDROOT}%{localstatedir}/log
                install -d -m 0755 %{BUILDROOT}%{localstatedir}/log/%{name}/
 
+               # Create run directory.
                mkdir -pv %{BUILDROOT}/run/%{name}
 
                # Set correct ownership.

diff --git a/minidlna/systemd/minidlna.service b/minidlna/systemd/minidlna.service
index 263b397357485ce267c8d32b92f77297d1db220f..689aa102a9317e92c4229939c58df364c6aee3cd 100644 (file)
--- a/minidlna/systemd/minidlna.service
+++ b/minidlna/systemd/minidlna.service
@@ -1,13 +1,12 @@
-[Unit]\r
-Description=MiniDLNA is a DLNA/UPnP-AV server software\r
-After=syslog.target local-fs.target network.target\r
-\r
-[Service]\r
-User=minidlna\r
-Group=minidlna\r
-Type=forking\r
-PIDFile=/run/minidlna/minidlna.pid\r
-ExecStart=/usr/sbin/minidlna -f /etc/minidlna.conf -P /run/minidlna/minidlna.pid\r
-\r
-[Install]\r
-WantedBy=multi-user.target\r
+[Unit]
+Description=MiniDLNA is a DLNA/UPnP-AV server software
+After=syslog.target local-fs.target network.target
+
+[Service]
+User=minidlna
+Group=minidlna
+Type=simple
+ExecStart=/usr/sbin/minidlna -S
+
+[Install]
+WantedBy=multi-user.target