Accepting request 175180 from hardware

Forward

OBS-URL: https://build.opensuse.org/request/show/175180
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/isight-firmware-tools?expand=0&rev=9

isight-firmware-tools.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu May  9 04:47:32 UTC 2013 - crrodriguez@opensuse.org
+
+-  isight-ft-udev.patch: detect the udev directories 
+   at compile time.
+
 -------------------------------------------------------------------
 Wed Oct 10 19:56:50 UTC 2012 - coolo@suse.com
 

isight-firmware-tools.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package isight-firmware-tools
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -25,13 +25,18 @@ Group:          Amusements/Toys/Graphics
 Url:            http://bersace03.free.fr/ift/
 Source:         isight-firmware-tools-%{version}.tar.gz
 Patch0:         isight-firmware-tools-older_isight-1.6.0.diff
+Patch1:         isight-ft-udev.patch
+BuildRequires:  automake
 BuildRequires:  gcc
 BuildRequires:  intltool
 BuildRequires:  libgcrypt-devel
 BuildRequires:  libusb-devel
+BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(udev)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
+%define _udevdir %(pkg-config --variable=udevdir udev)
+%define _udevrulesdir %{_udevdir}/rules.d
 %description
 This project provide tools to manipulate firmware for Built-in iSight
 found on Apple machine since iMac G5 iSight
@@ -39,8 +44,9 @@ found on Apple machine since iMac G5 iSight
 %prep
 %setup -q
 %patch0 -p1
-
+%patch1 -p1
 %build
+autoreconf -fiv
 %configure
 make %{?_smp_mflags}
 
@@ -68,15 +74,11 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%config %{_sysconfdir}/udev/rules.d/isight.rules
-%dir %{_libdir}/udev
+%{_udevrulesdir}/isight.rules
 %dir %{_datadir}/doc/packages/%{name}
 %{_bindir}/ift-export
 %{_bindir}/ift-extract
-%dir %{_libdir}/udev
-%dir %{_sysconfdir}/udev/rules.d
-%dir %{_sysconfdir}/udev
-%{_libdir}/udev/ift-load
+%{_udevdir}/ift-load
 %doc %{_datadir}/doc/packages/%{name}/HOWTO
 %{_infodir}/*
 %{_mandir}/man1/*.1%{ext_man}

isight-ft-udev.patch

@@ -0,0 +1,24 @@
+--- isight-firmware-tools-1.6.orig/configure.ac
++++ isight-firmware-tools-1.6/configure.ac
+@@ -24,8 +24,8 @@ AC_SUBST(IFT_LIBS)
+ PKG_CHECK_MODULES(LOAD, [libusb])
+ AC_SUBST(LOAD_CFLAGS)
+ AC_SUBST(LOAD_LIBS)
+-
+-udevdir=${libdir}/udev
++PKG_PROG_PKG_CONFIG
++udevdir=$($PKG_CONFIG --variable=udevdir udev)
+ AC_SUBST(udevdir)
+ 
+ dnl GETTEXT
+--- isight-firmware-tools-1.6.orig/src/Makefile.am
++++ isight-firmware-tools-1.6/src/Makefile.am
+@@ -21,7 +21,7 @@ ift_load_SOURCES = udev.c load.c load.h
+ ift_load_CFLAGS = $(IFT_CFLAGS) $(LOAD_CFLAGS) $(AM_CFLAGS)
+ ift_load_LDADD = $(IFT_LIBS) $(LOAD_LIBS)
+ 
+-rulesdir = ${sysconfdir}/udev/rules.d
++rulesdir = ${udevdir}/rules.d
+ rules_DATA = isight.rules
+ 
+ # AC_SUBST sucks