From 2d90822949e84ac8f3c185233d23cd619d66e7f7 Mon Sep 17 00:00:00 2001
From: Alain Portal <dionysos@fedoraproject.org>
Date: Mar 10 2010 14:35:15 +0000
Subject: - New upstream version

- Remove patches 2 & 3 that are no more needed

---

diff --git a/.cvsignore b/.cvsignore
index 4b0ccae..3288b04 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-piklab-0.15.3.tar.bz2
+piklab-0.15.7.tar.bz2
diff --git a/piklab.spec b/piklab.spec
index bc1601f..6ee18d0 100644
--- a/piklab.spec
+++ b/piklab.spec
@@ -1,8 +1,8 @@
 %define unstable 1
 
 Name:       piklab
-Version:    0.15.3
-Release:    5%{?dist}
+Version:    0.15.7
+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
 
@@ -18,10 +18,8 @@ Source4:    %{name}-pickit2.perms
 Source5:    %{name}-README.Fedora
 Source6:    %{name}-LISEZMOI.Fedora
 
-Patch0:     %{name}-%{version}.desktop-fr.patch
+Patch0:     %{name}-0.15.3.desktop-fr.patch
 Patch1:     %{name}-0.12.1.x-desktop-fr.patch
-Patch2:     %{name}-%{version}.fr.po.patch
-Patch3:     %{name}-pickit2.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -53,10 +51,8 @@ comment finir l'installation.
 %prep
 %setup -q
 
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
+%patch0 -p0 -b .desktop-fr
+%patch1 -p0 -b .x-desktop-fr
 
 %{__install} -pm 644 %{SOURCE5} README.Fedora
 %{__install} -pm 644 %{SOURCE6} LISEZMOI.Fedora
@@ -82,11 +78,8 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 desktop-file-install --vendor=fedora \
   --dir %{buildroot}%{_datadir}/applications \
-  --add-category "Electronics" \
   --remove-category "Development" \
   --remove-category "IDE" \
-  --remove-category "Science" \
-  --remove-key="Patterns" \
   --delete-original \
   %{buildroot}/usr/share/applications/kde/piklab.desktop
 
@@ -142,6 +135,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Wed Mar 10 2010  Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 0.15.7-1
+  - New upstream version
+  - Remove patches 2 & 3 that are no more needed
+
 * Sun Feb  7 2010  Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 0.15.3-5
   - Fix typo: this is Piklab, not Pikdev
   - New desktop-fr patch
diff --git a/sources b/sources
index aa0dac0..9a2353d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5b73d7340fd64bab7cb56a5f961f79f1  piklab-0.15.3.tar.bz2
+d99f692901dfe414b57f5bef61e71339  piklab-0.15.7.tar.bz2