pbrobinson pushed to xorg-x11-drv-ivtv (f22). "fix merge"

[notifications at fedoraproject.org]

>From a9cc78b9c1703bd89243ab29bc32b7a15f1c3158 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede at redhat.com>
Date: Wed, 11 Feb 2015 17:19:48 +0100
Subject: xserver 1.17 ABI rebuild


diff --git a/xorg-x11-drv-ivtv.spec b/xorg-x11-drv-ivtv.spec
index bab25ea..c87ca5a 100644
--- a/xorg-x11-drv-ivtv.spec
+++ b/xorg-x11-drv-ivtv.spec
@@ -2,7 +2,7 @@
 
 Name:           xorg-x11-drv-ivtv
 Version:        1.2.0
-Release:        0.15%{?dist}
+Release:        0.16%{?dist}
 Summary:        Xorg X11 ivtv video driver
 
 Group:          User Interface/X Hardware Support
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Feb 11 2015 Hans de Goede <hdegoede at redhat.com> - 1.2.0-0.16
+- xserver 1.17 ABI rebuild
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-0.15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
-- 
cgit v0.10.2


>From 94b66cc7814b04babe5616029f2abc12df8b21a1 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at gmail.com>
Date: Tue, 21 Apr 2015 14:21:49 +0100
Subject: Firmware now part of linux-firmware


diff --git a/xorg-x11-drv-ivtv.spec b/xorg-x11-drv-ivtv.spec
index c87ca5a..6dbfc9d 100644
--- a/xorg-x11-drv-ivtv.spec
+++ b/xorg-x11-drv-ivtv.spec
@@ -2,7 +2,7 @@
 
 Name:           xorg-x11-drv-ivtv
 Version:        1.2.0
-Release:        0.16%{?dist}
+Release:        0.17%{?dist}
 Summary:        Xorg X11 ivtv video driver
 
 Group:          User Interface/X Hardware Support
@@ -19,8 +19,7 @@ BuildRequires: xorg-x11-server-devel >= 1.10.99.902
 BuildRequires: xorg-x11-proto-devel
 Requires: Xorg %(xserver-sdk-abi-requires ansic)
 Requires: Xorg %(xserver-sdk-abi-requires videodrv)
-Requires:  ivtv-firmware
-Obsoletes: ivtv_xdriver < %{version}
+Requires:  linux-firmware
 
 %description
 X.Org X11 ivtv video driver.
@@ -39,22 +38,19 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/ivtv_drv.la
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc ChangeLog README
 %{_libdir}/xorg/modules/drivers/ivtv_drv.so
 
 
 %changelog
+* Tue Apr 21 2015 Peter Robinson <pbrobinson at fedoraproject.org> 1.2.0-0.17
+- Firmware now part of linux-firmware
+
 * Wed Feb 11 2015 Hans de Goede <hdegoede at redhat.com> - 1.2.0-0.16
 - xserver 1.17 ABI rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/xorg-x11-drv-ivtv.git/commit/?h=f22&id=8a9add7f47639ad6d6b8a99a7e72d26a5fd2f1fd