diff --git a/.abf.yml b/.abf.yml index ccafde6..434cf4e 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,3 +1,4 @@ ---- -sources: +removed_sources: minidlna-1.1.1.tar.gz: 97c28d2b861957620d319929f904225e906830c7 +sources: + minidlna-1.1.2.tar.gz: ba03d691b9aa95b55ac822905571ab1127492344 diff --git a/minidlna.service b/minidlna.service index 489da51..f23a947 100644 --- a/minidlna.service +++ b/minidlna.service @@ -1,12 +1,12 @@ [Unit] Description=MiniDLNA is a DLNA/UPnP-AV server software -After=network.target +After=syslog.target local-fs.target network.target [Service] -Type=forking -PIDFile=/var/run/minidlna.pid -ExecStart=/usr/sbin/minidlnad -f /etc/minidlna.conf -P /run/minidlna/minidlna.pid -PIDFile=/run/minidlna/minidlna.pid +User=minidlna +Group=minidlna +Type=simple +ExecStart=/usr/sbin/minidlnad -S [Install] -WantedBy=multi-user.target \ No newline at end of file +WantedBy=multi-user.target diff --git a/minidlna.spec b/minidlna.spec index 6a68865..a8b959d 100644 --- a/minidlna.spec +++ b/minidlna.spec @@ -1,7 +1,7 @@ Summary: A DLNA/UPnP-AV compliant media server Name: minidlna -Version: 1.1.1 -Release: 2 +Version: 1.1.2 +Release: 1 URL: http://sourceforge.net/projects/minidlna/ Group: Networking/Other License: GPLv2 @@ -20,6 +20,7 @@ BuildRequires: pkgconfig(vorbis) BuildRequires: systemd Requires(post): rpm-helper Requires(preun): rpm-helper +Requires(postun): rpm-helper %description MiniDLNA (aka ReadyDLNA) is server software with the aim of being fully @@ -55,13 +56,17 @@ install -m 644 -D %{SOURCE4} %{buildroot}%{_mandir}/man5/minidlna.conf.5 mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d install -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf +install -d -m 0755 %{buildroot}%{_localstatedir}/cache/%{name}/ +touch %{buildroot}%{_localstatedir}/cache/%{name}/files.db + %find_lang %{name} %pre -%_pre_useradd minidlna %{_var}/run/%{name} /bin/false +%_pre_useradd %{name} /run/%{name} /sbin/nologin %_pre_groupadd minidlna minidlna %post +%create_ghostfile %{_localstatedir}/cache/%{name}/files.db %{name} %{name} 0644 %_post_service minidlna %tmpfiles_create %{name}.conf @@ -74,9 +79,11 @@ install -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf %files -f %{name}.lang %doc README +%dir %attr(-,minidlna,minidlna) %{_localstatedir}/cache/%{name}/ +%ghost %attr(-,minidlna,minidlna) %{_localstatedir}/cache/%{name}/files.db %attr(755,-,-) %{_sbindir}/minidlna* %{_unitdir}/%{name}.service %config(noreplace) %{_sysconfdir}/minidlna.conf -%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf +%{_sysconfdir}/tmpfiles.d/%{name}.conf %{_mandir}/man1/minidlna.1* %{_mandir}/man5/minidlna.conf.5*