Hello community, here is the log from the commit of package usbprog for openSUSE:Factory checked in at 2013-05-16 11:43:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/usbprog (Old) and /work/SRC/openSUSE:Factory/.usbprog.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "usbprog" Changes: -------- --- /work/SRC/openSUSE:Factory/usbprog/usbprog.changes 2011-12-14 14:35:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.usbprog.new/usbprog.changes 2013-05-16 11:43:20.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 9 06:01:17 UTC 2013 - [email protected] + +- Place udev rules in the correct directory, /etc/udev/* + will be soon blacklisted for use in packages. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ usbprog.spec ++++++ --- /var/tmp/diff_new_pack.D0UzIS/_old 2013-05-16 11:43:21.000000000 +0200 +++ /var/tmp/diff_new_pack.D0UzIS/_new 2013-05-16 11:43:21.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package usbprog # -# Copyright (c) 2011 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 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + # RHEL and CentOS have no wxGTK, so we cannot build the GUI here %if 0%{?rhel_version} || 0%{?centos_version} %define build_gui 0 @@ -56,7 +57,7 @@ BuildRequires: libusb-devel BuildRequires: libxml2-devel BuildRequires: readline-devel - +BuildRequires: pkgconfig(udev) %if %{build_gui} %if 0%{?suse_version} > 1130 BuildRequires: python-wxWidgets @@ -84,6 +85,9 @@ %define __find_requires %wx_requires %endif +%define _udevdir %(pkg-config --variable=udevdir udev) +%define _udevrulesdir %{_udevdir}/rules.d + %description USBprog is a programmer for the USBprog hardware. @@ -96,6 +100,7 @@ %package gui Requires: %{name} = %{version} Summary: GUI program of USBprog +Group: Development/Tools/Other %description gui A wxGTK version of the USBprog programmer. @@ -109,6 +114,7 @@ %package -n libusbprog0 Requires: %{name} = %{version} Summary: USBprog Library +Group: Development/Tools/Other %description -n libusbprog0 Library for USBprog. @@ -121,6 +127,7 @@ %package devel Requires: %{name} = %{version} Summary: Development files for libusbprog +Group: Development/Tools/Other %description devel Header files for libusbprog. @@ -136,7 +143,7 @@ %build %configure -make +make %{?_smp_mflags} %install %makeinstall @@ -145,9 +152,9 @@ rm -f $RPM_BUILD_ROOT/%{_datadir}/pixmaps/usbprog_icon.xpm %endif rm -f $RPM_BUILD_ROOT/%{_libdir}/*.*a -mkdir -p $RPM_BUILD_ROOT/etc/udev/rules.d +mkdir -p %{buildroot}%{_udevrulesdir} sed -e 's/@@USBPROG_GROUP@@/'%{group_name}'/g' usbprog.rules.in \ - > $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/98-usbprog.rules + > %{buildroot}%{_udevrulesdir}/98-usbprog.rules sed -e 's/@@USBPROG_GROUP@@/'%{group_name}'/g' %{S:1} > %{readme_name} %clean @@ -164,9 +171,7 @@ %dir %{_datadir}/doc/usbprog %{_bindir}/usbprog %{_mandir}/man1/usbprog.1* -%config %{_sysconfdir}/udev/rules.d/98-usbprog.rules -%dir %{_sysconfdir}/udev -%dir %{_sysconfdir}/udev/rules.d +%{_udevrulesdir}/98-usbprog.rules %files -n libusbprog0 %defattr(-,root,root) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
