Changes - j0ke.net Open Build Service

Changes of Revision 9

[-] [+]	Changed	motion.spec
@@ -1,6 +1,6 @@ #!BuildIgnore: post-build-checks Name: motion -Version: 3.2.11 +Version: 3.2.12 Release: 1 Summary: MOTION, a Video-surveilance-system @@ -8,8 +8,7 @@ License: GPL URL: http://motion.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 -Patch0: %{name}-init.patch -Patch1: ffmpeg-0.4.9.15594svn-20081010.diff +Patch0: %{name}-init-%{version}.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libjpeg-devel libffmpeg-devel BuildRequires: postgresql-devel mysql-devel @@ -27,7 +26,6 @@ %setup -q %patch0 -%patch1 %build %configure --sysconfdir=%{_sysconfdir}/%{name} \ @@ -37,7 +35,7 @@ make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT motion.init +rm -rf motion.init make install DESTDIR=$RPM_BUILD_ROOT (cd $RPM_BUILD_ROOT%{_sysconfdir}/%{name} ; mv motion-dist.conf motion.conf) @@ -46,10 +44,21 @@ install -D -m 0755 motion.init $RPM_BUILD_ROOT%{_initrddir}/%{name} rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version} rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version} +chmod -x %{buildroot}%{_sysconfdir}/%{name}/motion.conf %{buildroot}%{_mandir}/man1/motion.1* %clean rm -rf $RPM_BUILD_ROOT +%preun +%if 0%{?suse_version} +%stop_on_removal +%endif + +%postun +%if 0%{?suse_version} +%insserv_cleanup +%endif + %files %defattr (-,root,root,-) %doc CHANGELOG COPYING CREDITS INSTALL README motion_guide.html @@ -62,6 +71,10 @@ %changelog +* Wed Mar 09 2011 Carsten Schoene <cs@linux-administrator.com> - 3.2.12 +- update to release 3.2.12 +- reworked init patch + * Sat Dec 27 2008 Carsten Schoene <cs@linux-administrator.com> - 3.2.11 - update to new release 3.2.11 - added initscript patch (LSB)
[-] [+]	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 ^