diff --git a/.abf.yml b/.abf.yml index b204c29..46b4634 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - minidlna-1.3.0.tar.gz: 6563a881884879b2aef52611934e08bb42985964 + minidlna-1.3.2.tar.gz: 71750adadc34490d52f0b9a930c2731a47f9772d diff --git a/minidlna-tmpfiles.conf b/minidlna-tmpfiles.conf index 07a1eca..d3223a3 100644 --- a/minidlna-tmpfiles.conf +++ b/minidlna-tmpfiles.conf @@ -1,2 +1,2 @@ -d /var/run/minidlna 0755 minidlna minidlna +d /run/minidlna 0755 minidlna minidlna d /var/cache/minidlna 0755 minidlna minidlna diff --git a/minidlna.service b/minidlna.service index 489da51..c2b2321 100644 --- a/minidlna.service +++ b/minidlna.service @@ -4,9 +4,8 @@ After=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 +ExecStart=/usr/sbin/minidlnad -f /etc/minidlna.conf -P /run/minidlna/minidlna.pid [Install] WantedBy=multi-user.target \ No newline at end of file diff --git a/minidlna.spec b/minidlna.spec index 5107929..d61d776 100644 --- a/minidlna.spec +++ b/minidlna.spec @@ -1,6 +1,6 @@ Summary: A DLNA/UPnP-AV compliant media server Name: minidlna -Version: 1.3.0 +Version: 1.3.2 Release: 1 License: GPLv2+ Group: Networking/Other @@ -10,6 +10,7 @@ Source2: minidlna-tmpfiles.conf Source3: minidlna.1 Source4: minidlna.conf.5 Source5: %{name}.service +Source6: minidlna.sysusers.conf BuildRequires: pkgconfig(flac) BuildRequires: libid3tag-devel BuildRequires: libexif-devel @@ -17,18 +18,16 @@ BuildRequires: jpeg-devel BuildRequires: pkgconfig(sqlite3) BuildRequires: ffmpeg-devel >= 1.1 BuildRequires: pkgconfig(vorbis) -BuildRequires: pkgconfig(libavcodec) -BuildRequires: pkgconfig(libavformat) -BuildRequires: pkgconfig(libavutil) +BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavformat) +BuildRequires: pkgconfig(libavutil) BuildRequires: systemd BuildRequires: pkgconfig -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libtool -BuildRequires: gettext-devel -Requires(post): rpm-helper -Requires(preun): rpm-helper -Requires(postun): rpm-helper +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +BuildRequires: gettext-devel +Requires: /bin/systemd-sysusers %description MiniDLNA (aka ReadyDLNA) is server software with the aim of being fully @@ -75,23 +74,22 @@ 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 +# install sysuser config +install -d %{buildroot}%{_sysusersdir} +install -m0644 %{SOURCE6} %{buildroot}%{_sysusersdir}/minidlna.conf + %find_lang %{name} %pre -%_pre_useradd %{name} /run/%{name} /sbin/nologin -%_pre_groupadd minidlna minidlna +%sysusers_create_package minidlna %{SOURCE6} %post %create_ghostfile %{_localstatedir}/cache/%{name}/files.db %{name} %{name} 0644 -%_post_service minidlna +%systemd_post minidlna.service %tmpfiles_create %{name}.conf %preun -%_preun_service minidlna - -%postun -%_postun_userdel minidlna -%_postun_groupdel minidlna minidlna +%systemd_preun minidlna.service %files -f %{name}.lang %doc README @@ -103,3 +101,4 @@ touch %{buildroot}%{_localstatedir}/cache/%{name}/files.db %{_sysconfdir}/tmpfiles.d/%{name}.conf %{_mandir}/man1/minidlna.1* %{_mandir}/man5/minidlna.conf.5* +%{_sysusersdir}/%{name}.conf diff --git a/minidlna.sysusers.conf b/minidlna.sysusers.conf new file mode 100644 index 0000000..01ca948 --- /dev/null +++ b/minidlna.sysusers.conf @@ -0,0 +1,3 @@ +u minidlna - "Minidlna user" /run/minidlna /sbin/nologin +g minidlna - - +m minidlna minidlna