From eeecfcd701a0d3533e12964f5127c6d36c1ad981 Mon Sep 17 00:00:00 2001 From: Valera Zorchenko Date: Wed, 4 Jul 2012 11:59:16 +0300 Subject: [PATCH] update to minidlna-1.0.24-2 --- .abf.yml | 2 - initscript | 7 ++-- minidlna.conf | 47 --------------------- minidlna.spec | 111 +++++++++++++++++++++++++++++++++++++++----------- 4 files changed, 90 insertions(+), 77 deletions(-) delete mode 100644 .abf.yml mode change 100755 => 100644 initscript delete mode 100644 minidlna.conf diff --git a/.abf.yml b/.abf.yml deleted file mode 100644 index f3fac5b..0000000 --- a/.abf.yml +++ /dev/null @@ -1,2 +0,0 @@ -sources: - "minidlna_1.0.20_src.tar.gz": dadc604af00d6b0fdd1145ce2dfe79e774215df0 diff --git a/initscript b/initscript old mode 100755 new mode 100644 index bd1edad..e9f871e --- a/initscript +++ b/initscript @@ -8,10 +8,9 @@ # processname: minidlna # pidfile: /var/run/minidlna.pid ### BEGIN INIT INFO -# Provides: haldaemon -# Required-Start: -# Required-Stop: -# Should-Start: acpid +# Required-Start: $network +# Required-Stop: $network +# Should-Start: # Default-Start: 3 4 5 7 # Short-Description: DLNA media server # Description: The MiniDLNA daemon is an UPnP-A/V and DLNA service which diff --git a/minidlna.conf b/minidlna.conf deleted file mode 100644 index 51c9b23..0000000 --- a/minidlna.conf +++ /dev/null @@ -1,47 +0,0 @@ -# port for HTTP (descriptions, SOAP, media transfer) traffic -port=8200 - -# network interface to bind to (this is the only interface that will serve files) -network_interface=eth0 - -# set this to the directory you want scanned. -# * if have multiple directories, you can have multiple media_dir= lines -# * if you want to restrict a media_dir to a specific content type, you -# can prepend the type, followed by a comma, to the directory: -# + "A" for audio (eg. media_dir=A,/home/jmaggard/Music) -# + "V" for video (eg. media_dir=V,/home/jmaggard/Videos) -# + "P" for images (eg. media_dir=P,/home/jmaggard/Pictures) -media_dir=/srv/media - -# set this if you want to customize the name that shows up on your clients -#friendly_name=My DLNA Server - -# set this if you would like to specify the directory where you want MiniDLNA to store its database and album art cache -#db_dir=/var/cache/minidlna - -# this should be a list of file names to check for when searching for album art -# note: names should be delimited with a forward slash ("/") -album_art_names=Cover.jpg/cover.jpg/AlbumArtSmall.jpg/albumartsmall.jpg/AlbumArt.jpg/albumart.jpg/Album.jpg/album.jpg/Folder.jpg/folder.jpg/Thumb.jpg/thumb.jpg - -# set this to no to disable inotify monitoring to automatically discover new files -# note: the default is yes -inotify=yes - -# set this to yes to enable support for streaming .jpg and .mp3 files to a TiVo supporting HMO -enable_tivo=no - -# set this to strictly adhere to DLNA standards. -# * This will allow server-side downscaling of very large JPEG images, -# which may hurt JPEG serving performance on (at least) Sony DLNA products. -strict_dlna=no - -# default presentation url is http address on port 80 -#presentation_url=http://www.mylan/index.php - -# notify interval in seconds. default is 895 seconds. -notify_interval=900 - -# serial and model number the daemon will report to clients -# in its XML description -serial=12345678 -model_number=1 diff --git a/minidlna.spec b/minidlna.spec index f2a8475..1ddcbac 100644 --- a/minidlna.spec +++ b/minidlna.spec @@ -1,23 +1,35 @@ -Name: minidlna -Version: 1.0.20 -Release: %mkrel 1 -Summary: A DLNA/UPnP-AV compliant media server -URL: http://sourceforge.net/projects/minidlna/ -Group: Networking/Other -License: GPL -Source: minidlna_%{version}_src.tar.gz -Source1: initscript -Source2: minidlna.conf -Source3: minidlna.1 -Source4: minidlna.conf.5 +%if "%{_unitdir}" == "%%{unitdir}" +%define %{_unitdir} /lib/systemd/system +%endif + +Summary: A DLNA/UPnP-AV compliant media server +Name: minidlna +Version: 1.0.24 +Release: %mkrel 2 +URL: http://sourceforge.net/projects/minidlna/ +Group: Networking/Other +License: GPL +Source0: minidlna_%{version}_src.tar.gz +Source1: initscript +Source3: minidlna.1 +Source4: minidlna.conf.5 +Source5: %{name}.service # Local patches # Selected patches from development tree #Patch100: # Selected patches from upstream patch tracker #Patch200: -BuildRequires: libflac-devel libid3tag-devel libexif-devel libjpeg-devel -BuildRequires: libsqlite3-devel libffmpeg-devel libvorbis-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: libflac-devel +BuildRequires: libid3tag-devel +BuildRequires: libexif-devel +BuildRequires: libjpeg-devel +BuildRequires: sqlite3-devel +BuildRequires: ffmpeg-devel +BuildRequires: libvorbis-devel +BuildRequires: systemd-units +Requires(post): rpm-helper +Requires(preun): rpm-helper +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description MiniDLNA (aka ReadyDLNA) is server software with the aim of being fully @@ -37,19 +49,34 @@ sed -i -e 's!^\(#define OS_NAME\).*!\1 "%{product_vendor}"! s!^\(#define DEFAULT_DB_PATH\).*!\1 "/var/cache/%{name}"! s!^\(#define DEFAULT_LOG_PATH\).*!\1 "/var/log"!' config.h + %build +%serverbuild +%setup_compile_flags + +#(tpg) obey %optflags +sed -i 's/CFLAGS = -Wall -g -O3/CFLAGS +=/' Makefile + +#(tpg) verbose make +sed -i 's/@$(CC)/$(CC)/' Makefile + %make %install rm -rf %{buildroot} -install -m 755 -D %{_sourcedir}/initscript %{buildroot}%{_initrddir}/minidlna -install -m 644 -D %{_sourcedir}/minidlna.conf \ - %{buildroot}%{_sysconfdir}/minidlna.conf -install -m 755 -D minidlna %{buildroot}%{_sbindir}/minidlna -install -m 644 -D %{_sourcedir}/minidlna.1 \ - %{buildroot}%{_mandir}/man1/minidlna.1 -install -m 644 -D %{_sourcedir}/minidlna.conf.5 \ - %{buildroot}%{_mandir}/man5/minidlna.conf.5 + +%makeinstall_std + +%if %mdkver >= 201100 +install -D -p -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/%{name}.service +%else +install -m 755 -D %{SOURCE1} %{buildroot}%{_initrddir}/minidlna +%endif + +install -m 644 -D minidlna.conf %{buildroot}%{_sysconfdir}/minidlna.conf +install -m 644 -D %{SOURCE3} %{buildroot}%{_mandir}/man1/minidlna.1 +install -m 644 -D %{SOURCE4} %{buildroot}%{_mandir}/man5/minidlna.conf.5 + %clean rm -rf %{buildroot} @@ -64,14 +91,50 @@ rm -rf %{buildroot} %defattr(0644,root,root,0755) %doc README %attr(755,-,-) %{_sbindir}/minidlna +%if %mdkver >= 201100 +%{_unitdir}/%{name}.service +%else %attr(755,-,-) %{_initrddir}/minidlna +%endif %config(noreplace) %{_sysconfdir}/minidlna.conf %{_mandir}/man1/minidlna.1* %{_mandir}/man5/minidlna.conf.5* %changelog -* Mon Jul 04 2011 Claudio Matsuoka 1.0.20-1mdv2011.0 +* Mon Feb 27 2012 Tomasz Pawel Gajc 1.0.24-2mdv2012.0 ++ Revision: 780959 +- use upstream config file +- update to new version 1.0.24 + +* Sun Feb 05 2012 Tomasz Pawel Gajc 1.0.23-2 ++ Revision: 771266 +- update to new version 1.0.23 + + + Claudio Matsuoka + - address rpmlint errors + - make spec buildable in 2011 with undefined %%{_unitdir} + +* Sat Jan 07 2012 Tomasz Pawel Gajc 1.0.22-4 ++ Revision: 758635 +- obey %%optflags +- switch to verbose mode while compiling +- provide minidlna.service +- spec file clean + +* Wed Dec 21 2011 Tomasz Pawel Gajc 1.0.22-3 ++ Revision: 744182 +- revert use os setup_compile_flags +- make use of %%serverbuild_hardened +- use %%setup_compile_flags + +* Sat Sep 17 2011 Claudio Matsuoka 1.0.22-1 ++ Revision: 700180 +- new upstream release 1.0.22 + * includes fixes for TiVo, Marantz receivers, Roku SoundBridge and + Samsung series B and D TVs. + +* Mon Jul 04 2011 Claudio Matsuoka 1.0.20-1 + Revision: 688671 - new upstream release 1.0.20 * Fix a crash bug when scanning MPEG-TS files with odd packet sizes