rpms/piklab/EL-5 piklab-0.15.3.desktop-fr.patch, NONE, 1.1 piklab-LISEZMOI.Fedora, 1.2, 1.3 piklab.spec, 1.18, 1.19

Tue Feb 9 07:04:25 UTC 2010

Author: dionysos

Update of /cvs/pkgs/rpms/piklab/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23187

Modified Files:
	piklab-LISEZMOI.Fedora piklab.spec 
Added Files:
	piklab-0.15.3.desktop-fr.patch 
Log Message:
  - Fix typo: this is Piklab, not Pikdev
  - New desktop-fr patch
  - Update and apply patch2
  - Add update-mime-database in scriptlets
  - Update gtk-update-icon-cache use in scriptlets
  - Add %%posttrans scriptlet


piklab-0.15.3.desktop-fr.patch:
 piklab.desktop |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE piklab-0.15.3.desktop-fr.patch ---
--- src/data/app_data/piklab.desktop.orig	2008-03-23 16:43:30.000000000 +0100
+++ src/data/app_data/piklab.desktop	2010-02-07 12:17:37.000000000 +0100
@@ -6,7 +6,10 @@
 X-DocPath=piklab/index.html
 Categories=Qt;KDE;Development;IDE;Electronics;
 Comment=Integrated development environment for applications based on PIC microcontrollers.
+Comment[fr]=Environnement de développement intégré pour applications à base de microcontrôleurs PIC
 Terminal=false
 Name=Piklab
+Name[fr]=Piklab
 GenericName=IDE
+GenericName[fr]=Environnement de développement intégré
 MimeType=text/x-hex;application/x-piklab


Index: piklab-LISEZMOI.Fedora
===================================================================
RCS file: /cvs/pkgs/rpms/piklab/EL-5/piklab-LISEZMOI.Fedora,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- piklab-LISEZMOI.Fedora	9 Mar 2007 10:18:38 -0000	1.2
+++ piklab-LISEZMOI.Fedora	9 Feb 2010 07:04:25 -0000	1.3
@@ -1,4 +1,4 @@
-Pour utiliser pikdev, les utilisateurs ont besoin d'accéder au(x) port(s)
+Pour utiliser piklab, les utilisateurs ont besoin d'accéder au(x) port(s)
 série et/ou parallèle en mode lecture/écriture, suivant le programmateur
 utilisé. Aussi, le super-utilisateur doit ajouter les utilisateurs
 susceptibles d'utiliser le programmateur aux groupes uucp (pour le port série)


Index: piklab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/piklab/EL-5/piklab.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- piklab.spec	22 Oct 2007 09:01:42 -0000	1.18
+++ piklab.spec	9 Feb 2010 07:04:25 -0000	1.19
@@ -1,14 +1,15 @@
 %define unstable 1
 
 Name:       piklab
-Version:    0.15.0
-Release:    1%{?dist}
+Version:    0.15.3
+Release:    5%{?dist}
 Summary:    Development environment for applications based on PIC & dsPIC microcontrollers
 Summary(fr):IDE pour applications à base de microcontrôleurs PIC et de dsPIC
 
 Group:      Development/Tools
 License:    GPLv2+
 URL:        http://piklab.sourceforge.net
+
 Source:     http://switch.dl.sourceforge.net/piklab/%{name}-%{version}.tar.bz2
 Source1:    %{name}-026-microchip.rules
 Source2:    %{name}-icd2.perms
@@ -16,15 +17,20 @@ Source3:    %{name}-pickit1.perms
 Source4:    %{name}-pickit2.perms
 Source5:    %{name}-README.Fedora
 Source6:    %{name}-LISEZMOI.Fedora
-#Patch0:     %{name}-0.12.1.desktop.typo-fr.patch
+
+Patch0:     %{name}-%{version}.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)
 
 BuildRequires:  desktop-file-utils, kdelibs-devel, libusb-devel, readline-devel
 # Needed for FC6
 BuildRequires:  ncurses-devel, gettext
 
+Requires: electronics-menu
+
 %description
 Piklab is a graphic development environment for PIC and dsPIC microcontrollers.
 It interfaces with various toochains for compiling and assembling and it
@@ -35,7 +41,7 @@ in the %{_docdir}/%{name}-%{version} dir
 to complete full feature installation.
 
 %description -l fr
-Pikdev est un environnement de développement graphique pour les
+Piklab est un environnement de développement graphique pour les
 microcontrôleurs PIC et dsPIC. Il s'interface avec diverses chaînes d'outils
 pour la compilation et l'assemblage et gère plusieurs programmateurs y compris
 ceux de Microchip.
@@ -47,14 +53,17 @@ comment finir l'installation.
 %prep
 %setup -q
 
-#%patch0 -p0
+%patch0 -p0
 %patch1 -p0
 %patch2 -p0
+%patch3 -p0
 
 %{__install} -pm 644 %{SOURCE5} README.Fedora
 %{__install} -pm 644 %{SOURCE6} LISEZMOI.Fedora
 
 %build
+# compile with Qt 3.3
+unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 #%{__make} -f admin/Makefile.common
 %configure --disable-rpath \
@@ -70,14 +79,16 @@ comment finir l'installation.
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 
-mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor="" \
-  --dir %{buildroot}%{_datadir}/applications/kde \
-  --add-category "Application" \
-  --remove-category "QT" \
+
+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 \
-  src/data/app_data/%{name}.desktop
+  %{buildroot}/usr/share/applications/kde/piklab.desktop
 
 %{__install} -d %{buildroot}%{_sysconfdir}/udev/rules.d/
 %{__install} -d %{buildroot}%{_sysconfdir}/security/console.perms.d/
@@ -101,19 +112,26 @@ cd $BKP_PWD
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-update-desktop-database %{_datadir}/applications/kde > /dev/null 2>&1 || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-update-desktop-database %{_datadir}/applications/kde > /dev/null 2>&1 || :
+if [ $1 -eq 0 ]
+then
+  touch --no-create %{_datadir}/icons/hicolor || :
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f %{name}.lang
 %defattr(-, root, root)
 %doc Changelog COPYING README TODO README.Fedora LISEZMOI.Fedora
 %{_bindir}/*
-%{_datadir}/applications/kde/%{name}.desktop
+%{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/apps/%{name}/
 %{_datadir}/apps/katepart/syntax/*
 %{_datadir}/doc/HTML/en/%{name}/
@@ -124,10 +142,41 @@ update-desktop-database %{_datadir}/appl
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* 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
+  - Update and apply patch2
+  - Add update-mime-database in scriptlets
+  - Update gtk-update-icon-cache use in scriptlets
+  - Add %%posttrans scriptlet
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Nov 10 2008 Thibault North <tnorth [AT] fedoraproject DOT org> - 0.15.3-2
+  - Fix %%patch3
+
+* Sat Jun 07 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.15.3-1
+  - New upstream release
+  - compiling with Qt 3.3
+
+* Fri Jun 06 2008  Aanjhan Ranganathan <aanjhan [AT] tuxmaniac[DOT]com> 0.15.0-2
+  - Fixed build issues with Fedora 9
+  - Changed build dep from kdelibs-devel to kdelibs3-devel
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.15.0-2
+  - Autorebuild for GCC 4.3
+
 * Mon Oct 22 2007  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.15.0-1
   - New upstream version
   - Update %%patch2
 
+* Sun Sep 02 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.14.5-2
+  - fixing desktop file
+
 * Fri Aug 17 2007  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.14.5-1
   - New upstream version
   - %%patch0 is no more needed

