Hello community,

here is the log from the commit of package ivtv for openSUSE:Factory checked in 
at 2014-04-11 13:32:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ivtv (Old)
 and      /work/SRC/openSUSE:Factory/.ivtv.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ivtv"

Changes:
--------
--- /work/SRC/openSUSE:Factory/ivtv/ivtv.changes        2013-03-12 
06:55:46.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.ivtv.new/ivtv.changes   2014-04-11 
13:32:18.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Apr  8 19:41:27 UTC 2014 - [email protected]
+
+- Removed ivtv-ctl and v4l2-ctl utilities which are now provided by v4l-utils
+  package (avoid conflicts during installation) and added a dependency to
+  v4l-utils package for them.
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ivtv.spec ++++++
--- /var/tmp/diff_new_pack.wdDKMn/_old  2014-04-11 13:32:19.000000000 +0200
+++ /var/tmp/diff_new_pack.wdDKMn/_new  2014-04-11 13:32:19.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package ivtv
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,6 +30,7 @@
 Patch0:         ivtv-optflags.patch
 Patch1:         ivtv-splice.patch
 Patch2:         ivtv-buffer.patch
+Requires:       v4l-utils
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -61,6 +62,9 @@
 # install suspend file
 mkdir -p "%{buildroot}/usr/lib/pm/config.d"
 echo "SUSPEND_MODULES=\"ivtv\"" > %{buildroot}/usr/lib/pm/config.d/ivtv.config
+# Remove ivtv-ctl and v4l2-ctl which are now provided by v4l-utils package 
(avoid conflicts during installation)
+rm -f %{buildroot}/usr/bin/ivtv-ctl
+rm -f %{buildroot}/usr/bin/v4l2-ctl
 
 #
 rm -fv doc/install.txt.orig
@@ -68,9 +72,6 @@
 rm -f %{buildroot}/usr/include/linux/ivtv.h
 rm -f %{buildroot}/usr/include/linux/ivtvfb.h
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root)
 %doc COPYING README ChangeLog doc utils/ivtvfwextract.pl

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to