[piklab/f14/master] New upstream version. Fix rules (BZ #594932), patch from David Dillow.

[Alain Portal]

commit 17df0f4ba6b573a53186e922f04a8d9fd10549a0
Author: Alain Portal <alain.portal at free.fr>
Date:   Sat Jan 29 19:14:57 2011 +0100

    New upstream version.  Fix rules (BZ #594932), patch from David Dillow.

 .gitignore                 |    1 +
 piklab-026-microchip.rules |    8 ++++----
 piklab.spec                |   22 ++++++++--------------
 sources                    |    2 +-
 4 files changed, 14 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a89c42f..1c1f07a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 piklab-0.15.8.tar.bz2
+/piklab-0.15.10.tar.bz2
diff --git a/piklab-026-microchip.rules b/piklab-026-microchip.rules
index c6374a4..8f0d193 100644
--- a/piklab-026-microchip.rules
+++ b/piklab-026-microchip.rules
@@ -1,8 +1,8 @@
 #PICKit
-SUBSYSTEM=="usb", ACTION=="add", SYSFS{idVendor}=="04d8", SYSFS{idProduct}=="0032", SYMLINK+="pickit1-%k"
+SUBSYSTEM=="usb", ACTION=="add", ATTR{idVendor}=="04d8", ATTR{idProduct}=="0032", SYMLINK+="pickit1-%k"
 #PICKit2
-SUBSYSTEM=="usb", ACTION=="add", SYSFS{idVendor}=="04d8", SYSFS{idProduct}=="0033", SYMLINK+="pickit2-%k"
+SUBSYSTEM=="usb", ACTION=="add", ATTR{idVendor}=="04d8", ATTR{idProduct}=="0033", SYMLINK+="pickit2-%k"
 #ICD2
-SUBSYSTEM=="usb", ACTION=="add", SYSFS{idVendor}=="04d8", SYSFS{idProduct}=="8000", SYMLINK+="icd2-%k"
+SUBSYSTEM=="usb", ACTION=="add", ATTR{idVendor}=="04d8", ATTR{idProduct}=="8000", SYMLINK+="icd2-%k"
 #ICD21
-SUBSYSTEM=="usb", ACTION=="add", SYSFS{idVendor}=="04d8", SYSFS{idProduct}=="8001", SYMLINK+="icd2-%k"
+SUBSYSTEM=="usb", ACTION=="add", ATTR{idVendor}=="04d8", ATTR{idProduct}=="8001", SYMLINK+="icd2-%k"
diff --git a/piklab.spec b/piklab.spec
index b4efb0e..1111a58 100644
--- a/piklab.spec
+++ b/piklab.spec
@@ -1,8 +1,8 @@
 %define unstable 1
 
 Name:       piklab
-Version:    0.15.8
-Release:    3.rev2721%{?dist}
+Version:    0.15.10
+Release:    1%{?dist}
 Summary:    Development environment for applications based on PIC & dsPIC microcontrollers
 Summary(fr):IDE pour applications à base de microcontrôleurs PIC et de dsPIC
 
@@ -20,10 +20,7 @@ Source6:    %{name}-LISEZMOI.Fedora
 
 Patch0:     %{name}-0.15.3.desktop-fr.patch
 Patch1:     %{name}-0.12.1.x-desktop-fr.patch
-Patch10:    %{name}-%{version}.new-pic.patch
-Patch11:    %{name}-%{version}.use-fedora-docdir.patch
-Patch12:    %{name}-%{version}.DSO-linking.patch
-Patch13:    %{name}-%{version}.rename-likeback-icons.patch
+Patch2:     %{name}-0.15.8.use-fedora-docdir.patch
 
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,10 +56,7 @@ comment finir l'installation.
 
 %patch0 -p0 -b .desktop-fr
 %patch1 -p0 -b .x-desktop-fr
-%patch10 -p1 -b .new-pic
-%patch11 -p0 -b .use-fedora-docdir
-%patch12 -p0 -b .linking-kparts
-%patch13 -p1 -b .rename-likeback-icons
+%patch2 -p0 -b .use-fedora-docdir
 
 %{__install} -pm 644 %{SOURCE5} README.Fedora
 %{__install} -pm 644 %{SOURCE6} LISEZMOI.Fedora
@@ -78,10 +72,6 @@ comment finir l'installation.
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 
-%{__mv} %{buildroot}%{_datadir}/icons/hicolor/16x16/actions/likeback_bug.png %{buildroot}%{_datadir}/icons/hicolor/16x16/actions/%{name}_likeback_bug.png
-%{__mv} %{buildroot}%{_datadir}/icons/hicolor/16x16/actions/likeback_dislike.png %{buildroot}%{_datadir}/icons/hicolor/16x16/actions/%{name}_likeback_dislike.png
-%{__mv} %{buildroot}%{_datadir}/icons/hicolor/16x16/actions/likeback_like.png %{buildroot}%{_datadir}/icons/hicolor/16x16/actions/%{name}_likeback_like.png
-
 desktop-file-install --vendor=fedora \
   --dir %{buildroot}%{_datadir}/applications \
   --remove-category "Development" \
@@ -146,6 +136,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Sat Jan 30 2011  Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 0.15.10-1
+  - New upstream version
+  - Fix rules (BZ #594932), patch from David Dillow
+
 * Sat May 22 2010  Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 0.15.8-3
   - Change name of likeback icons to fix BZ #594932
 
diff --git a/sources b/sources
index 5606718..d18ecae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8bc329bfbdef33172c3d958431d72029  piklab-0.15.8.tar.bz2
+21afd675a35a991f4b33562965504e0f  piklab-0.15.10.tar.bz2