6:54 p.m.
Author: moixs
Update of /cvs/free/rpms/motion/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28614
Modified Files:
.cvsignore motion.spec sources
Removed Files:
ffmpeg-0.5.patch ffmpeg-detection.patch
Log Message:
* Tue Aug 11 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11.1-1
- Drop patch for ffmpeg 0.5 compatibility
- Drop ffmpeg detection patch
- Moved default output directory to /var/motion
- New startup script with added v4l2convert to support more cameras -
https://bugzilla.rpmfusion.org/show_bug.cgi?id=681
- Fix Segfault on reload or quit for vloopback (maybe other v4l1 devices too)
- Fix fd leaks in external pipe
- Avoid possible stack smashing in v4l_open_vidpipe()
- Fix segfault for new libjpeg v7
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/motion/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 25 Mar 2009 21:43:14 -0000 1.2
+++ .cvsignore 11 Aug 2009 18:54:16 -0000 1.3
@@ -1 +1 @@
-motion-3.2.11.tar.gz
+motion-3.2.11.1.tar.gz
Index: motion.spec
===================================================================
RCS file: /cvs/free/rpms/motion/devel/motion.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- motion.spec 5 Apr 2009 10:22:13 -0000 1.3
+++ motion.spec 11 Aug 2009 18:54:16 -0000 1.4
@@ -1,6 +1,6 @@
Name: motion
-Version: 3.2.11
-Release: 5%{?dist}
+Version: 3.2.11.1
+Release: 1%{?dist}
Summary: A motion detection system
Group: Applications/Multimedia
@@ -8,11 +8,11 @@
URL: http://motion.sourceforge.net/
Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1: motion-initscript
-Patch0: ffmpeg-detection.patch
-Patch1: ffmpeg-0.5.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel ffmpeg-devel zlib-devel
+#This requires comes from the startup script, it will be there until motion supports
libv4l calls in the code
+Requires: libv4l
Requires(post): chkconfig
Requires(preun): chkconfig initscripts
Requires(postun): initscripts
@@ -27,13 +27,9 @@
%prep
%setup -q
-#ffmpeg detection patch in version 3.2.11. This is an upstream patch.
-%patch0 -p0
-#ffmpeg 0.5 patch for rawhide/F11
-%patch1 -p0
%build
-%configure --sysconfdir=%{_sysconfdir}/%{name} --without-optimizecpu --with-ffmpeg
--without-mysql --without-pgsql
+%configure --sysconfdir=%{_sysconfdir}/%{name} --without-optimizecpu --with-ffmpeg
--without-mysql --without-pgsql
#We convert 2 files to UTF-8, otherwise rpmlint complains
iconv -f iso8859-1 -t utf-8 CREDITS > CREDITS.conv && mv -f CREDITS.conv
CREDITS
iconv -f iso8859-1 -t utf-8 CHANGELOG > CHANGELOG.conv && mv -f CHANGELOG.conv
CHANGELOG
@@ -52,6 +48,11 @@
sed -i 's|sql_log_mpeg|; sql_log_mpeg|g'
%{buildroot}%{_sysconfdir}/%{name}/motion.conf
sed -i 's|sql_log_timelapse|; sql_log_timelapse|g'
%{buildroot}%{_sysconfdir}/%{name}/motion.conf
sed -i 's|sql_query|; sql_query|g'
%{buildroot}%{_sysconfdir}/%{name}/motion.conf
+#We set the log file and target directory - logging is for 3.3 branch
+#sed -i 's|;logfile|logfile /var/log/motion.log|g'
%{buildroot}%{_sysconfdir}/%{name}/motion.conf
+sed -i 's|target_dir /usr/local/apache2/htdocs/cam1|target_dir /var/motion|g'
%{buildroot}%{_sysconfdir}/%{name}/motion.conf
+#We install our startup script - for future 3.3
+#install -D -m 0755 motion.init-RH %{buildroot}%{_initrddir}/%{name}
#We install our startup script
install -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
@@ -96,7 +97,17 @@
%attr(0755,root,root) %{_initrddir}/%{name}
%changelog
-* Sun Apr 05 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11-5
+* Tue Aug 11 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11.1-1
+- Drop patch for ffmpeg 0.5 compatibility
+- Drop ffmpeg detection patch
+- Moved default output directory to /var/motion
+- New startup script with added v4l2convert to support more cameras -
https://bugzilla.rpmfusion.org/show_bug.cgi?id=681
+- Fix Segfault on reload or quit for vloopback (maybe other v4l1 devices too)
+- Fix fd leaks in external pipe
+- Avoid possible stack smashing in v4l_open_vidpipe()
+- Fix segfault for new libjpeg v7
+
+* Sun Jun 05 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11-5
- Patch and rebuild for ffmpeg 0.5
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.2.11-4
Index: sources
===================================================================
RCS file: /cvs/free/rpms/motion/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 25 Mar 2009 21:43:14 -0000 1.2
+++ sources 11 Aug 2009 18:54:16 -0000 1.3
@@ -1 +1 @@
-3a26c00f3250eacf6fa93c7a7e0249d9 motion-3.2.11.tar.gz
+4e729f129d8f9b9abaed5121c3cd0037 motion-3.2.11.1.tar.gz
--- ffmpeg-0.5.patch DELETED ---
--- ffmpeg-detection.patch DELETED ---