rpms/piklab/FC-5 piklab-0.12.0.desktop.typo-fr.patch, NONE, 1.1 piklab-0.12.0.x-desktop-fr.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 piklab.spec, 1.1, 1.2 sources, 1.2, 1.3

[Alain Portal (dionysos)]

Author: dionysos

Update of /cvs/extras/rpms/piklab/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5195

Modified Files:
	.cvsignore piklab.spec sources 
Added Files:
	piklab-0.12.0.desktop.typo-fr.patch 
	piklab-0.12.0.x-desktop-fr.patch 
Log Message:
New upstream version.

piklab-0.12.0.desktop.typo-fr.patch:

--- NEW FILE piklab-0.12.0.desktop.typo-fr.patch ---
--- src/data/app_data/piklab.desktop.orig	2006-09-08 00:10:29.000000000 +0200
+++ src/data/app_data/piklab.desktop	2006-09-24 17:01:25.000000000 +0200
@@ -5,8 +5,8 @@
 Icon=piklab.png
 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évelopement intégré pour application utilisant des microcontroleurs PIC.
+Comment=Integrated development environment for applications based on PIC microcontrollers
+Comment[fr]=Environnement de dévelopement intégré pour applications à base de microcontrôleurs PIC
 Terminal=false
 Name=Piklab
 GenericName=IDE

piklab-0.12.0.x-desktop-fr.patch:

--- NEW FILE piklab-0.12.0.x-desktop-fr.patch ---
--- src/data/app_data/x-piklab.desktop.orig	2006-09-08 00:10:29.000000000 +0200
+++ src/data/app_data/x-piklab.desktop	2006-09-25 16:06:11.000000000 +0200
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Encoding=UTF-8
 Comment=Piklab Project File
+Comment[fr]=Fichier de projet Piklab
 DefaultApp=piklab
 Icon=piklab_project
 Type=MimeType
 MimeType=application/x-piklab
-Patterns=*.piklab;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Sep 2006 16:44:24 -0000	1.2
+++ .cvsignore	2 Oct 2006 11:39:54 -0000	1.3
@@ -1 +1 @@
-piklab-0.11.3.tar.bz2
+piklab-0.12.0.tar.bz2


Index: piklab.spec
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/piklab.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- piklab.spec	29 Sep 2006 16:44:24 -0000	1.1
+++ piklab.spec	2 Oct 2006 11:39:54 -0000	1.2
@@ -1,8 +1,8 @@
 %define unstable 1
 
 Name:		piklab
-Version:	0.11.3
-Release:	5%{?dist}
+Version:	0.12.0
+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
 
@@ -17,7 +17,7 @@
 Source5:	%{name}-README.Fedora
 Source6:	%{name}-LISEZMOI.Fedora
 #Patch0:		%{name}-%{version}.Makefile.am.no_rules.patch
-Patch1:		%{name}-%{version}.Makefile.in.no_rules.patch
+#Patch1:		%{name}-%{version}.Makefile.in.no_rules.patch
 Patch2:		%{name}-%{version}.desktop.typo-fr.patch
 Patch3:		%{name}-%{version}.x-desktop-fr.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,7 +49,7 @@
 %setup -q
 
 #%patch0 -p0
-%patch1 -p0
+#%patch1 -p0
 %patch2 -p0
 %patch3 -p0
 
@@ -77,7 +77,6 @@
   --dir %{buildroot}%{_datadir}/applications/kde \
   --add-category "Application" \
   --add-category "X-Fedora" \
-  --remove-only-show-in="KDE" \
   --remove-key="Patterns" \
   src/data/app_data/%{name}.desktop
 
@@ -96,7 +95,7 @@
 ln -s ../common .
 cd $BKP_PWD
 
-#%find_lang %{name}
+%find_lang %{name}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -111,8 +110,7 @@
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 update-desktop-database %{_datadir}/applications/kde > /dev/null 2>&1 || :
 
-#%files -f %{name}.lang
-%files
+%files -f %{name}.lang
 %defattr(-, root, root)
 %doc Changelog COPYING README TODO README.Fedora LISEZMOI.Fedora
 %{_bindir}/*
@@ -126,6 +124,10 @@
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
 
 %changelog
+* Mon Oct  2 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.12.0-1
+  - New upstream version
+  - Remove patch1 that is no more needed
+
 * Fri Sep 29 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.11.3-5
   - Fix typo in pickit2.perms
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/piklab/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Sep 2006 16:44:24 -0000	1.2
+++ sources	2 Oct 2006 11:39:54 -0000	1.3
@@ -1 +1 @@
-0509671541cfc69a3c8b3ce95a9c3beb  piklab-0.11.3.tar.bz2
+2769340a8a221fd5ef001c21e441eaaa  piklab-0.12.0.tar.bz2