10:39 a.m.
Author: musuruan
Update of /cvs/free/rpms/minidlna/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28975
Modified Files:
.cvsignore minidlna.spec sources
Added Files:
minidlna-tmpfiles.conf
Log Message:
* Wed Apr 25 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.24-2
- Run the daemon with the minidlna user (BZ #2294)
- Updated Debian man pages
--- NEW FILE minidlna-tmpfiles.conf ---
d /var/run/minidlna 755 minidlna minidlna
Index: minidlna.spec
===================================================================
RCS file: /cvs/free/rpms/minidlna/devel/minidlna.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- minidlna.spec 19 Feb 2012 12:06:48 -0000 1.3
+++ minidlna.spec 1 May 2012 10:39:24 -0000 1.4
@@ -1,6 +1,6 @@
Name: minidlna
Version: 1.0.24
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Lightweight DLNA/UPnP-AV server targeted at embedded systems
Group: System Environment/Daemons
@@ -10,7 +10,9 @@
# Systemd unit file
Source1: %{name}.service
# Debian man pages
-Source2: %{name}-1.0.21-debian-manpages.tar.gz
+Source2: %{name}-1.0.24-debian-manpages.tar.gz
+# tmpfiles.d configuration for the /var/run directory
+Source3: %{name}-tmpfiles.conf
BuildRequires: libuuid-devel
BuildRequires: ffmpeg-devel
@@ -47,6 +49,12 @@
# Verbose Makefile
sed -i 's/@$(CC)/$(CC)/' 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/' \
+ %{name}.conf
+
%build
export CFLAGS="%{optflags}"
@@ -84,6 +92,18 @@
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}/
+
+# Create cache and log directories
+mkdir -p %{buildroot}%{_localstatedir}/cache
+install -d -m 0755 %{buildroot}%{_localstatedir}/cache/%{name}/
+mkdir -p %{buildroot}%{_localstatedir}/log
+install -d -m 0755 %{buildroot}%{_localstatedir}/log/%{name}/
+
%find_lang %{name}
@@ -119,15 +139,23 @@
%files -f %{name}.lang
-%attr(-,minidlna,minidlna)%config(noreplace) %{_sysconfdir}/minidlna.conf
+%attr(-,minidlna,minidlna) %config(noreplace) %{_sysconfdir}/minidlna.conf
%{_sbindir}/minidlna
%{_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
+%dir %attr(-,minidlna,minidlna) %{_localstatedir}/cache/%{name}/
+%dir %attr(-,minidlna,minidlna) %{_localstatedir}/log/%{name}/
%doc LICENCE LICENCE.miniupnpd NEWS README TODO
%changelog
+* Wed Apr 25 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.24-2
+- Run the daemon with the minidlna user (BZ #2294)
+- Updated Debian man pages
+
* Sun Feb 19 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.24-1
- Updated to upstream 1.0.24
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minidlna/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 19 Feb 2012 12:06:48 -0000 1.4
+++ sources 1 May 2012 10:39:24 -0000 1.5
@@ -1,2 +1,2 @@
be9b4c91e3fcde592dc3f9828098ca0f minidlna_1.0.24_src.tar.gz
-34a13ba9d1edf066c1884947633dfa33 minidlna-1.0.21-debian-manpages.tar.gz
+2b0eae77aa45ef7f72d7ead1b45e857f minidlna-1.0.24-debian-manpages.tar.gz