Преглед на файлове

* add Obsoletes: ivtv-firmware (was included in Vine-5.x main)

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6802 ec354946-7b23-47d6-9f5a-488ba84defc7
shaolin преди 12 години
родител
ревизия
670904ef9f
променени са 1 файла, в които са добавени 10 реда и са изтрити 6 реда
  1. 10 6
      l/linux-firmware/linux-firmware-vl.spec

+ 10 - 6
l/linux-firmware/linux-firmware-vl.spec

@@ -3,7 +3,7 @@ Summary(ja):	Linux Kernel で利用されるファームウェアファイル
 
 Name:		linux-firmware
 Version:	20120709
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 
 Group:		System Environment/Kernel
 License:	GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted
@@ -16,6 +16,7 @@ Provides:	kernel-firmware = %{version} xorg-x11-drv-ati-firmware = 7.0
 Obsoletes:	kernel-firmware < %{version} XOrg-drv-ati-firmware < 6.13.0-0.22
 Obsoletes:	ueagle-atm4-firmware < 1.0-5
 Obsoletes:	rt2870-firmware
+Obsoletes:	ivtv-firmware
 Requires:	udev
 
 %description
@@ -34,13 +35,13 @@ rm iwlwifi-*.ucode LICENCE.iwlwifi_firmware
 rm -f usbdux/*dux */*.asm
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/lib/firmware
-cp -r * $RPM_BUILD_ROOT/lib/firmware
-rm $RPM_BUILD_ROOT/lib/firmware/{WHENCE,LICENCE.*,LICENSE.*,README*}
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/lib/firmware
+cp -r * %{buildroot}/lib/firmware
+rm %{buildroot}/lib/firmware/{WHENCE,LICENCE.*,LICENSE.*,README*}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -49,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/*
 
 %changelog
+* Fri Sep 14 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 20120709-2
+- add Obsoletes: ivtv-firmware (included in Vine-5.x main)
+
 * Wed Jul 18 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 20120709-1
 - update to new git snapshot (20120709)