- up to 1.1.1

Signed-off-by: Bartlomiej Zimon <uzi18@o2.pl>

diff --git a/config.patch b/config.patch
index 9431a01720e728258216720f7148338c2cea68fa..df9f70521d0de561ec959d6af9377136220ef9f3 100644 (file)
--- a/config.patch
+++ b/config.patch
@@ -1,9 +1,9 @@
 --- minidlna-1.0.25/minidlna.conf.wiget        2012-11-18 11:12:19.015994831 +0100
 +++ minidlna-1.0.25/minidlna.conf      2012-11-18 11:19:02.359311611 +0100
-@@ -11,16 +11,16 @@ port=8200
- #   + "A" for audio  (eg. media_dir=A,/home/jmaggard/Music)
+@@ -15,16 +15,16 @@
  #   + "V" for video  (eg. media_dir=V,/home/jmaggard/Videos)
  #   + "P" for images (eg. media_dir=P,/home/jmaggard/Pictures)
+ #   + "PV" for pictures and video (eg. media_dir=AV,/home/jmaggard/digital_camera)
 -media_dir=/opt
 +#media_dir=/opt
  

diff --git a/minidlna.init b/minidlna.init
index 1904501da6b1aee33bd1852cf30a325b31ca4fe5..d3f87ab273d0679d2b216e14e9f3c5054f87d768 100644 (file)
--- a/minidlna.init
+++ b/minidlna.init
@@ -7,7 +7,7 @@
 # description: MiniDLNA (aka ReadyDLNA) is server software with the aim of being
 #              fully compliant with DLNA/UPnP-AV clients.
 #
-# processname: minidlna
+# processname: minidlnad
 # config:      /etc/minidlna.conf
 # pidfile:     /var/run/minidlna.pid
 #
@@ -44,7 +44,7 @@ start() {
        fi
 
        msg_starting "minidlna"
-       daemon --user minidlna /usr/sbin/minidlna -P $pidfile -f /etc/minidlna.conf
+       daemon --user minidlna /usr/sbin/minidlnad -P $pidfile -f /etc/minidlna.conf
        RETVAL=$?
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/minidlna
 }
@@ -57,7 +57,7 @@ stop() {
 
        # Stop daemons.
        msg_stopping "minidlna"
-       killproc minidlna
+       killproc minidlnad
        rm -f /var/lock/subsys/minidlna
 }
 
@@ -94,7 +94,7 @@ case "$1" in
        condrestart 7
        ;;
   status)
-       status minidlna
+       status minidlnad
        RETVAL=$?
        ;;
   *)

diff --git a/minidlna.service b/minidlna.service
index 28f7997d5bd17c1018f4cd89d8d1a7c9a5dda0fc..eebe9554c1c8e7f94b585b17dcc7001a23d86463 100644 (file)
--- a/minidlna.service
+++ b/minidlna.service
@@ -5,7 +5,7 @@ After=syslog.target local-fs.target network.target
 [Service]
 Type=forking
 PIDFile=/var/run/minidlna/minidlna.pid
-ExecStart=/usr/sbin/minidlna -P /var/run/minidlna/minidlna.pid -f /etc/minidlna.conf
+ExecStart=/usr/sbin/minidlnad -P /var/run/minidlna/minidlna.pid -f /etc/minidlna.conf
 User=minidlna
 Group=minidlna
 

diff --git a/minidlna.spec b/minidlna.spec
index 6c7ffa583b3a355f6f2db52af8272745e865006d..b281285a927a04d70f3a52c772f8b962d9f05d21 100644 (file)
--- a/minidlna.spec
+++ b/minidlna.spec
@@ -4,12 +4,12 @@
 Summary:       DLNA server software
 Summary(pl.UTF-8):     Oprogramowanie serwerowe DLNA
 Name:          minidlna
-Version:       1.0.25
-Release:       6
+Version:       1.1.1
+Release:       1
 License:       GPL v2
 Group:         Networking/Daemons
-Source0:       http://downloads.sourceforge.net/minidlna/%{name}_%{version}_src.tar.gz
-# Source0-md5: d966256baf2f9b068b9de871ab5dade5
+Source0:       http://downloads.sourceforge.net/minidlna/%{name}-%{version}.tar.gz
+# Source0-md5: 653405555ac3f8eb4aacc54c1be7b5fa
 Source1:       %{name}.init
 Source2:       %{name}.service
 Source3:       %{name}.tmpfiles
@@ -45,18 +45,18 @@ którego celem jest pełna zgodność z klientami DLNA/UPnP-AV.
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 
-%{__sed} -i -e 's#-g -O3#$(OPTFLAGS)#g' Makefile
-
-# Verbose Makefile
-sed -i 's/@$(CC)/$(CC)/' Makefile
-
 %build
-%{__make} -j1 \
-       CC="%{__cc}" \
-       OPTFLAGS="%{rpmcflags} %{rpmcppflags}"
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure
+
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -67,8 +67,7 @@ install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_mandir}/man{1,5}} \
 %{__make} -j1 install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__make} -j1 install-conf \
-       DESTDIR=$RPM_BUILD_ROOT
+cp -p %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
@@ -119,7 +118,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENCE.miniupnpd NEWS README TODO
 %attr(754,root,root) /etc/rc.d/init.d/minidlna
 %attr(640,root,minidlna) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/minidlna.conf
-%attr(755,root,root) %{_sbindir}/minidlna
+%attr(755,root,root) %{_sbindir}/minidlnad
 %{systemdtmpfilesdir}/%{name}.conf
 %{systemdunitdir}/%{name}.service
 %dir %attr(755,minidlna,minidlna) /var/run/%{name}