rpms/motion/devel motion.spec,1.29,1.30

[Tomasz Torcz]

Author: ttorcz

Update of /cvs/free/rpms/motion/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31367

Modified Files:
	motion.spec 
Log Message:
* Sun Dec 14 2014 Tomasz Torcz <ttorcz at fedoraproject.org> - 3.3.0.trunkREV557-10
- restore lost changes (should fix #3460):
  * Sat Jan 11 2014 Tomasz Torcz <ttorcz at fedoraproject.org> - 3.3.0-trunkREV557.9
  - use the same sources and BRs as F-19 (trunkREV557.11) branch (fixes #3106)
  - adjust for UnversionedDocdirs



Index: motion.spec
===================================================================
RCS file: /cvs/free/rpms/motion/devel/motion.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- motion.spec	12 Oct 2014 02:13:31 -0000	1.29
+++ motion.spec	14 Dec 2014 12:13:55 -0000	1.30
@@ -1,7 +1,7 @@
 %global nextver 3.3.0
 Name:           motion
 Version:        %{nextver}.trunkREV557
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A motion detection system
 
 Group:          Applications/Multimedia
@@ -14,7 +14,7 @@
 Patch1:         motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libjpeg-devel ffmpeg-compat-devel zlib-devel
+BuildRequires:  libjpeg-devel ffmpeg-compat-devel zlib-devel ffmpeg-devel
 Buildrequires:  pkgconfig(sqlite3)
 BuildRequires:  systemd-units
 #This requires comes from the startup script, it will be there until motion supports libv4l calls in the code
@@ -120,6 +120,12 @@
 %attr(0755,root,root) %{_tmpfilesdir}/%{name}.conf
 
 %changelog
+* Sun Dec 14 2014 Tomasz Torcz <ttorcz at fedoraproject.org> - 3.3.0.trunkREV557-10
+- restore lost changes (should fix #3460):
+  * Sat Jan 11 2014 Tomasz Torcz <ttorcz at fedoraproject.org> - 3.3.0-trunkREV557.9
+  - use the same sources and BRs as F-19 (trunkREV557.11) branch (fixes #3106)
+  - adjust for UnversionedDocdirs
+
 * Sat Oct 11 2014 Sérgio Basto <sergio at serjux.com> - 3.3.0.trunkREV557-9
 - Rebuild for new gcc https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 - Change naming, NamingGuideline