Author: musuruan Update of /cvs/free/rpms/minidlna/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5536 Modified Files: .cvsignore minidlna-tmpfiles.conf minidlna.service minidlna.spec sources Log Message: * Sun Sep 15 2013 Andrea Musuruane <musuruan(a)gmail.com&gt; - 1.1.0-1 - Updated to upstream 1.1.0 - Better systemd integration Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/minidlna/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 19 May 2013 10:57:37 -0000 1.7 +++ .cvsignore 15 Sep 2013 11:57:41 -0000 1.8 @@ -1,2 +1 @@ -minidlna-1.0.26.tar.gz -minidlna-1.0.24-debian-manpages.tar.gz +minidlna-1.1.0.tar.gz Index: minidlna-tmpfiles.conf =================================================================== RCS file: /cvs/free/rpms/minidlna/devel/minidlna-tmpfiles.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- minidlna-tmpfiles.conf 1 May 2012 10:39:24 -0000 1.1 +++ minidlna-tmpfiles.conf 15 Sep 2013 11:57:41 -0000 1.2 @@ -1 +1,2 @@ -d /var/run/minidlna 755 minidlna minidlna \ No newline at end of file +d /run/minidlna 0755 minidlna minidlna - + Index: minidlna.service =================================================================== RCS file: /cvs/free/rpms/minidlna/devel/minidlna.service,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- minidlna.service 3 Nov 2012 18:33:06 -0000 1.2 +++ minidlna.service 15 Sep 2013 11:57:41 -0000 1.3 @@ -5,9 +5,8 @@ [Service] User=minidlna Group=minidlna -Type=forking -PIDFile=/var/run/minidlna/minidlna.pid -ExecStart=/usr/sbin/minidlna -f /etc/minidlna.conf -P /var/run/minidlna/minidlna.pid +Type=simple +ExecStart=/usr/sbin/minidlnad -S [Install] WantedBy=multi-user.target Index: minidlna.spec =================================================================== RCS file: /cvs/free/rpms/minidlna/devel/minidlna.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- minidlna.spec 15 Aug 2013 10:17:35 -0000 1.12 +++ minidlna.spec 15 Sep 2013 11:57:41 -0000 1.13 @@ -1,18 +1,16 @@ Name: minidlna -Version: 1.0.26 -Release: 3%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: Lightweight DLNA/UPnP-AV server targeted at embedded systems Group: System Environment/Daemons License: GPLv2 URL: http://sourceforge.net/projects/minidlna/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/%{name}/%{version}/%{name}-%{version}.ta... # Systemd unit file Source1: %{name}.service -# Debian man pages -Source2: %{name}-1.0.24-debian-manpages.tar.gz -# tmpfiles.d configuration for the /var/run directory -Source3: %{name}-tmpfiles.conf +# tmpfiles configuration for the /run directory +Source2: %{name}-tmpfiles.conf BuildRequires: libuuid-devel BuildRequires: ffmpeg-devel @@ -41,62 +39,44 @@ %prep %setup -q -%setup -D -T -q -a 2 -# Honor RPM_OPT_FLAGS 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 - -# 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 -sed -i 's/#log_dir=\/var\/log/log_dir=\/var\/log\/minidlna/' \ +# Edit the default config file +sed -i 's/#log_dir=\/var\/log/#log_dir=\/var\/log\/minidlna/' \ %{name}.conf %build -export CFLAGS="%{optflags}" -make %{?_smp_mflags} +%configure \ + --disable-silent-rules \ + --with-db-path=%{_localstatedir}/cache/%{name} \ + --with-log-path=%{_localstatedir}/log/%{name} \ + --enable-tivo -# Build language catalogs -pushd po -for catsrc in *.po; do - lang="${catsrc%.po}" - msgfmt -o "$lang.mo" "$catsrc" -done -popd +make %{?_smp_mflags} %install make install DESTDIR=%{buildroot} -make install-conf DESTDIR=%{buildroot} + +# Install config file +mkdir -p %{buildroot}%{_sysconfdir} +install -m 644 minidlna.conf %{buildroot}%{_sysconfdir} # Install systemd unit file mkdir -p %{buildroot}%{_unitdir} install -m 644 %{SOURCE1} %{buildroot}%{_unitdir} # Install man pages -mkdir -p %{buildroot}%{_mandir}/man1 -install -m 644 debian-manpages/*.1 %{buildroot}%{_mandir}/man1/ mkdir -p %{buildroot}%{_mandir}/man5 -install -m 644 debian-manpages/*.5 %{buildroot}%{_mandir}/man5/ - -# Install language catalogs -pushd po -for catalog in *.mo; do - lang="${catalog%.mo}" - install -d -m 0755 "%{buildroot}%{_datadir}/locale/${lang}/LC_MESSAGES" - install -m 0644 "$catalog" "%{buildroot}%{_datadir}/locale/${lang}/LC_MESSAGES/minidlna.mo" -done -popd - -# Install tmpfiles.d -mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d -install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf -mkdir -p %{buildroot}%{_localstatedir}/run/ -install -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name}/ +install -m 644 minidlna.conf.5 %{buildroot}%{_mandir}/man5/ +mkdir -p %{buildroot}%{_mandir}/man8 +install -m 644 minidlnad.8 %{buildroot}%{_mandir}/man8/ + +# Install tmpfiles configuration +mkdir -p %{buildroot}%{_tmpfilesdir} +install -m 0644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/%{name}.conf +mkdir -p %{buildroot}/run/ +install -d -m 0755 %{buildroot}/run/%{name}/ # Create cache and log directories mkdir -p %{buildroot}%{_localstatedir}/cache @@ -140,18 +120,22 @@ %files -f %{name}.lang %attr(-,minidlna,minidlna) %config(noreplace) %{_sysconfdir}/minidlna.conf -%{_sbindir}/minidlna +%{_sbindir}/minidlnad %{_unitdir}/minidlna.service -%{_mandir}/man1/%{name}.1* %{_mandir}/man5/%{name}.conf.5* -%dir %attr(-,minidlna,minidlna) %{_localstatedir}/run/%{name} -%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf +%{_mandir}/man8/minidlnad.8* +%dir %attr(-,minidlna,minidlna) /run/%{name} +%{_tmpfilesdir}/%{name}.conf %dir %attr(-,minidlna,minidlna) %{_localstatedir}/cache/%{name}/ %dir %attr(-,minidlna,minidlna) %{_localstatedir}/log/%{name}/ -%doc LICENCE LICENCE.miniupnpd NEWS README TODO +%doc AUTHORS COPYING LICENCE.miniupnpd NEWS README TODO %changelog +* Sun Sep 15 2013 Andrea Musuruane <musuruan(a)gmail.com&gt; - 1.1.0-1 +- Updated to upstream 1.1.0 +- Better systemd integration + * Thu Aug 15 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.0.26-3 - Rebuilt for FFmpeg 2.0.x Index: sources =================================================================== RCS file: /cvs/free/rpms/minidlna/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 19 May 2013 10:57:37 -0000 1.7 +++ sources 15 Sep 2013 11:57:41 -0000 1.8 @@ -1,2 +1 @@ -c8347c0ce44579f9ff2ca24676dcc5f7 minidlna-1.0.26.tar.gz -2b0eae77aa45ef7f72d7ead1b45e857f minidlna-1.0.24-debian-manpages.tar.gz +26484a84af3fceafdee26595aae097f7 minidlna-1.1.0.tar.gz