Hello community, here is the log from the commit of package v4l-utils for openSUSE:Factory checked in at 2012-10-22 22:13:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/v4l-utils (Old) and /work/SRC/openSUSE:Factory/.v4l-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "v4l-utils", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/v4l-utils/v4l-utils.changes 2012-06-01 07:24:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.v4l-utils.new/v4l-utils.changes 2012-10-22 22:13:04.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Oct 17 13:53:54 UTC 2012 - [email protected] + +- Add udev-rules-dir.patch and BuildRequires udev to fix build with + new udev rules directory location. + +------------------------------------------------------------------- New: ---- udev-rules-dir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ v4l-utils.spec ++++++ --- /var/tmp/diff_new_pack.XT3zu0/_old 2012-10-22 22:13:06.000000000 +0200 +++ /var/tmp/diff_new_pack.XT3zu0/_new 2012-10-22 22:13:06.000000000 +0200 @@ -16,6 +16,12 @@ # +%if %( echo `rpm -q --queryformat %%{version} udev` ) > 190 +%define _udevrulesdir /usr/lib/udev/rules.d +%else +%define _udevrulesdir /lib/udev/rules.d +%endif + Name: v4l-utils Version: 0.8.8 Release: 0 @@ -30,6 +36,8 @@ Patch0: disable_rds_compilation.patch # PATCH-FIX-UPSTREAM libdvbv5-Add-missing-includes.patch [email protected] -- Fix compilation due to missing includes (taken from Fedora) Patch1: libdvbv5-Add-missing-includes.patch +# PATCH-FIX-UPSTREAM udev-rules-dir.patch [email protected] -- allow udev rules directory to be overridden +Patch2: udev-rules-dir.patch # Only needed to patch broken images in the upstream tarball BuildRequires: ImageMagick BuildRequires: kernel-headers @@ -41,9 +49,7 @@ BuildRequires: sysfsutils %endif # Only needed for directory ownership (/lib/udev/rules.d) -%if 0%{?sles_version} BuildRequires: udev -%endif %if 0%{?suse_version} BuildRequires: update-desktop-files %endif @@ -142,12 +148,13 @@ %setup -q %patch0 %patch1 -p1 +%patch2 -p1 %build make CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optflags}" %{?_smp_mflags} %install -make install PREFIX=%{_prefix} LIBDIR=%{_libdir} DESTDIR=%{buildroot} +make install PREFIX=%{_prefix} LIBDIR=%{_libdir} DESTDIR=%{buildroot} UDEVRULESDIR=%{_udevrulesdir} # Patch image with wrong dimensions - fix rpmlint warning "wrong-icon-size" mogrify -extent "36x36" -background transparent -gravity "south" %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/qv4l2.png @@ -175,7 +182,7 @@ %dir %{_sysconfdir}/rc_keymaps %config(noreplace) %{_sysconfdir}/rc_keymaps/* %config(noreplace) %{_sysconfdir}/rc_maps.cfg -/lib/udev/rules.d/70-infrared.rules +%{_udevrulesdir}/70-infrared.rules %{_bindir}/cx18-ctl %{_bindir}/dvb-* %{_bindir}/dvbv5-* ++++++ udev-rules-dir.patch ++++++ Index: v4l-utils-0.8.8/utils/keytable/Makefile =================================================================== --- v4l-utils-0.8.8.orig/utils/keytable/Makefile +++ v4l-utils-0.8.8/utils/keytable/Makefile @@ -1,4 +1,5 @@ TARGETS = ir-keytable +UDEVRULESDIR=/lib/udev/rules.d all: $(TARGETS) @@ -37,8 +38,8 @@ install: $(TARGETS) install -m 644 -p rc_maps.cfg $(DESTDIR)/etc install -m 755 -d $(DESTDIR)/etc/rc_keymaps install -m 644 -p rc_keymaps/* $(DESTDIR)/etc/rc_keymaps - install -m 755 -d $(DESTDIR)/lib/udev/rules.d - install -m 644 -p 70-infrared.rules $(DESTDIR)/lib/udev/rules.d + install -m 755 -d $(DESTDIR)/$(UDEVRULESDIR) + install -m 644 -p 70-infrared.rules $(DESTDIR)/$(UDEVRULESDIR) install -m 755 -d $(DESTDIR)$(MANDIR)/man1 install -m 644 -p ir-keytable.1 $(DESTDIR)$(MANDIR)/man1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
