Changes of Revision 9
| [-] | Changed | motion.spec |
|
x 1 2 #!BuildIgnore: post-build-checks3 Name: motion4 -Version: 3.2.115 +Version: 3.2.126 Release: 17 Summary: MOTION, a Video-surveilance-system8 9 10 License: GPL11 URL: http://motion.sourceforge.net/12 Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz213 -Patch0: %{name}-init.patch14 -Patch1: ffmpeg-0.4.9.15594svn-20081010.diff15 +Patch0: %{name}-init-%{version}.patch16 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)17 BuildRequires: libjpeg-devel libffmpeg-devel18 BuildRequires: postgresql-devel mysql-devel19 20 21 %setup -q22 %patch023 -%patch124 %build25 26 %configure --sysconfdir=%{_sysconfdir}/%{name} \27 28 make %{?_smp_mflags}29 30 %install31 -rm -rf $RPM_BUILD_ROOT motion.init32 +rm -rf motion.init33 make install DESTDIR=$RPM_BUILD_ROOT34 35 (cd $RPM_BUILD_ROOT%{_sysconfdir}/%{name} ; mv motion-dist.conf motion.conf)36 37 install -D -m 0755 motion.init $RPM_BUILD_ROOT%{_initrddir}/%{name}38 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}39 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}40 +chmod -x %{buildroot}%{_sysconfdir}/%{name}/motion.conf %{buildroot}%{_mandir}/man1/motion.1*41 42 %clean43 rm -rf $RPM_BUILD_ROOT44 45 +%preun46 +%if 0%{?suse_version}47 +%stop_on_removal48 +%endif49 +50 +%postun51 +%if 0%{?suse_version}52 +%insserv_cleanup53 +%endif54 +55 %files56 %defattr (-,root,root,-)57 %doc CHANGELOG COPYING CREDITS INSTALL README motion_guide.html58 59 60 61 %changelog62 +* Wed Mar 09 2011 Carsten Schoene <cs@linux-administrator.com> - 3.2.1263 +- update to release 3.2.1264 +- reworked init patch65 +66 * Sat Dec 27 2008 Carsten Schoene <cs@linux-administrator.com> - 3.2.1167 - update to new release 3.2.1168 - added initscript patch (LSB)69 |
||
| [+] | Added | ffmpeg-detection.diff ^ |
| @@ -0,0 +1,29 @@ +Index: configure.in +=================================================================== +--- configure.in (revisión: 433) ++++ configure.in (copia de trabajo) +@@ -389,6 +389,9 @@ + elif test -f ${FFMPEG_DIR}/include/libavformat/avformat.h; then + AC_MSG_RESULT(found ${FFMPEG_DIR}/include/libavformat/avformat.h) + FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include -DFFMPEG_NEW_INCLUDES" ++ elif test -f ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h; then ++ AC_MSG_RESULT(found ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h) ++ FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg -DFFMPEG_NEW_INCLUDES" + else + AC_MSG_RESULT(not found) + FFMPEG_OK="no_found" +Index: configure +=================================================================== +--- configure (revisión: 433) ++++ configure (copia de trabajo) +@@ -3261,6 +3261,10 @@ + { echo "$as_me:$LINENO: result: found ${FFMPEG_DIR}/include/libavformat/avformat.h" >&5 + echo "${ECHO_T}found ${FFMPEG_DIR}/include/libavformat/avformat.h" >&6; } + FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include -DFFMPEG_NEW_INCLUDES" ++ elif test -f ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h; then ++ { echo "$as_me:$LINENO: result: found ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h" >&5 ++echo "${ECHO_T}found ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h" >&6; } ++ FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg -DFFMPEG_NEW_INCLUDES" + else + { echo "$as_me:$LINENO: result: not found" >&5 + echo "${ECHO_T}not found" >&6; } | ||
| [+] | Added | motion-init-3.2.12.patch ^ |
| @@ -0,0 +1,24 @@ +--- motion.init-RH.orig 2011-03-09 19:18:15.569778694 +0100 ++++ motion.init-RH 2011-03-09 19:34:33.188486855 +0100 +@@ -12,6 +12,21 @@ + # Source function library. + . /etc/rc.d/init.d/functions + ++# ++# /etc/init.d/motion ++# ++# and symbolic its link ++# ++# /usr/sbin/rcmotion ++# ++### BEGIN INIT INFO ++# Provides: motion ++# Required-Start: $local_fs $remote_fs ++# Required-Stop: $local_fs $remote_fs ++# Default-Start: 3 5 ++# Default-Stop: 0 6 ++# Description: Start the motion daemon ++### END INIT INFO + + + motion=${MOTION-/usr/local/bin/motion} | ||
| Added | motion-3.2.12.tar.bz2 ^ | |