rpms/minidlna/F-19 .cvsignore, 1.6, 1.7 minidlna.spec, 1.9, 1.10 sources, 1.6, 1.7 minidlna-1.0.25-ffmpeg10.patch, 1.1, NONE
Author: musuruan
Update of /cvs/free/rpms/minidlna/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10579
Modified Files:
.cvsignore minidlna.spec sources
Removed Files:
minidlna-1.0.25-ffmpeg10.patch
Log Message:
* Wed May 08 2013 Andrea Musuruane <musuruan(a)gmail.com> - 1.0.26-1
- Updated to upstream 1.0.26
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/minidlna/F-19/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 14 Jul 2012 11:52:08 -0000 1.6
+++ .cvsignore 19 May 2013 11:15:24 -0000 1.7
@@ -1,2 +1,2 @@
-minidlna_1.0.25_src.tar.gz
+minidlna-1.0.26.tar.gz
minidlna-1.0.24-debian-manpages.tar.gz
Index: minidlna.spec
===================================================================
RCS file: /cvs/free/rpms/minidlna/F-19/minidlna.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- minidlna.spec 30 Jan 2013 16:53:37 -0000 1.9
+++ minidlna.spec 19 May 2013 11:15:24 -0000 1.10
@@ -1,21 +1,18 @@
Name: minidlna
-Version: 1.0.25
-Release: 4%{?dist}
+Version: 1.0.26
+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}_src.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# 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
-# Fix FTBFS for ffmpeg-1.0
-# http://inmmc.org/ftp/soft/minidlna.diff
-Patch0: %{name}-1.0.25-ffmpeg10.patch
BuildRequires: libuuid-devel
BuildRequires: ffmpeg-devel
@@ -45,13 +42,12 @@
%prep
%setup -q
%setup -D -T -q -a 2
-%patch0 -p1
-# Honor RPM_OPT_FLAGS
-sed -i 's/CFLAGS = -Wall -g -O3/CFLAGS +=/' Makefile
+# 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)/' 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/' \
@@ -156,6 +152,9 @@
%changelog
+* Wed May 08 2013 Andrea Musuruane <musuruan(a)gmail.com> - 1.0.26-1
+- Updated to upstream 1.0.26
+
* Wed Jan 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.25-4
- Rebuilt for ffmpeg
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minidlna/F-19/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 14 Jul 2012 11:52:08 -0000 1.6
+++ sources 19 May 2013 11:15:24 -0000 1.7
@@ -1,2 +1,2 @@
-d966256baf2f9b068b9de871ab5dade5 minidlna_1.0.25_src.tar.gz
+c8347c0ce44579f9ff2ca24676dcc5f7 minidlna-1.0.26.tar.gz
2b0eae77aa45ef7f72d7ead1b45e857f minidlna-1.0.24-debian-manpages.tar.gz
--- minidlna-1.0.25-ffmpeg10.patch DELETED ---