rpms/piklab/devel piklab-0.11.3.Makefile.in.no_rules.patch, NONE, 1.1 piklab-0.11.3.desktop.typo-fr.patch, NONE, 1.1 piklab-0.11.3.x-desktop-fr.patch, NONE, 1.1 piklab-026-microchip.rules, NONE, 1.1 piklab-LISEZMOI.Fedora, NONE, 1.1 piklab-README.Fedora, NONE, 1.1 piklab-icd2.perms, NONE, 1.1 piklab-pickit1.perms, NONE, 1.1 piklab-pickit2.perms, NONE, 1.1 piklab.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Fri Sep 29 16:44:24 UTC 2006

Author: dionysos

Update of /cvs/extras/rpms/piklab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25899/devel

Modified Files:
	.cvsignore sources 
Added Files:
	piklab-0.11.3.Makefile.in.no_rules.patch 
	piklab-0.11.3.desktop.typo-fr.patch 
	piklab-0.11.3.x-desktop-fr.patch piklab-026-microchip.rules 
	piklab-LISEZMOI.Fedora piklab-README.Fedora piklab-icd2.perms 
	piklab-pickit1.perms piklab-pickit2.perms piklab.spec 
Log Message:
auto-import piklab-0.11.3-5 on branch devel from piklab-0.11.3-5.src.rpm

piklab-0.11.3.Makefile.in.no_rules.patch:

--- NEW FILE piklab-0.11.3.Makefile.in.no_rules.patch ---
--- src/data/Makefile.in.orig	2006-09-08 00:11:21.000000000 +0200
+++ src/data/Makefile.in	2006-09-27 11:55:00.000000000 +0200
@@ -738,7 +738,7 @@
 	uninstall-syntaxkateDATA
 
 
-asm-pic.xml: syntax_xml_generator
+asm-pic.xml coff-pic.xml: syntax_xml_generator
 	./syntax_xml_generator
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

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

--- NEW FILE piklab-0.11.3.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.11.3.x-desktop-fr.patch:

--- NEW FILE piklab-0.11.3.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;


--- NEW FILE piklab-026-microchip.rules ---
#PICKit
SUBSYSTEM=="usb_device", ACTION=="add", SYSFS{idVendor}=="04d8", SYSFS{idProduct}=="0032", SYMLINK+="pickit1-%k"
#PICKit2
SUBSYSTEM=="usb_device", ACTION=="add", SYSFS{idVendor}=="04d8", SYSFS{idProduct}=="0033", SYMLINK+="pickit2-%k"
#ICD2
SUBSYSTEM=="usb_device", ACTION=="add", SYSFS{idVendor}=="04d8", SYSFS{idProduct}=="8000", SYMLINK+="icd2-%k"
#ICD21
SUBSYSTEM=="usb_device", ACTION=="add", SYSFS{idVendor}=="04d8", SYSFS{idProduct}=="8001", SYMLINK+="icd2-%k"


--- NEW FILE piklab-LISEZMOI.Fedora ---
Pour utiliser pikdev, 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)
et/ou lp (pour le port parallÃ¨le).
Pour ce faire, taper la commande suivante :

	useradd -G lp,uucp utilisateur

pour chaque utilisateur que vous souhaitez ajouter.

De plus, si un programmateur sur port parallÃ¨le est utilisÃ©, il est
nÃ©cessaire de charger le module ppdev, grÃ¢ce Ã  la commande :

	modprobe ppdev


--- NEW FILE piklab-README.Fedora ---
This application needs the users to access serial and/or paralell port
in RW mode, depends upon the programmer is used.
So, administrator have to add allowed users to uucp and/or lp groups.
To do this, type the following command line:

	useradd -G lp,uucp allowed_user

for each allowed_user you want to add.

And if a paralell port programmer is used, you need to load the ppdev module,
by typing the following command line:

	modprobe ppdev


--- NEW FILE piklab-icd2.perms ---
<icd2>=/dev/icd2*
<console> 0600 <icd2> 0600 root


--- NEW FILE piklab-pickit1.perms ---
<pickit1>=/dev/pickit1*
<console> 0600 <pickit1> 0600 root


--- NEW FILE piklab-pickit2.perms ---
<pickit2>=/dev/pickit2*
<console> 0600 <pickit2> 0600 root


--- NEW FILE piklab.spec ---
%define unstable 1

Name:		piklab
Version:	0.11.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:	GPL
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
Source3:	%{name}-pickit1.perms
Source4:	%{name}-pickit2.perms
Source5:	%{name}-README.Fedora
Source6:	%{name}-LISEZMOI.Fedora
#Patch0:		%{name}-%{version}.Makefile.am.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)

BuildRequires:	desktop-file-utils, kdelibs-devel, libusb-devel, readline-devel
# Needed for FC6
BuildRequires:	ncurses-devel

%description
Piklab is a graphic development environment for PIC and dsPIC microcontrollers.
It interfaces with various toochains for compiling and assembling and it
supports several Microchip and direct programmers.

WARNING: Administrator have to see the README.Fedora file locate
in the %{_docdir}/%{name}-%{version} directory
to complete full feature installation.

%description -l fr
Pikdev 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.

ATTENTION : l'installateur du paquetage doit lire le fichier LISEZMOI.Fedora,
situÃ© dans le rÃ©pertoire %{_docdir}/%{name}-%{version}, afin de voir
comment finir l'installation.

%prep
%setup -q

#%patch0 -p0
%patch1 -p0
%patch2 -p0
%patch3 -p0

%{__install} -pm 644 %{SOURCE5} README.Fedora
%{__install} -pm 644 %{SOURCE6} LISEZMOI.Fedora

%build

#%{__make} -f admin/Makefile.common
%configure --disable-rpath \
%if %unstable
  --enable-debug=full
%else
  --disable-debug
%endif

%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install

mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor="" \
  --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

%{__install} -d %{buildroot}%{_sysconfdir}/udev/rules.d/
%{__install} -d %{buildroot}%{_sysconfdir}/security/console.perms.d/
%{__install} -pm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/udev/rules.d/026-microchip.rules
%{__install} -pm 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/console.perms.d/icd2.perms
%{__install} -pm 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/security/console.perms.d/pickit1.perms
%{__install} -pm 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/security/console.perms.d/pickit2.perms


# Fix absolute symlink
%{__rm} -f %{buildroot}%{_docdir}/HTML/*/%{name}/common
BKP_PWD=`pwd`
cd %{buildroot}%{_docdir}/HTML/en/%{name}/
ln -s ../common .
cd $BKP_PWD

#%find_lang %{name}

%clean
%{__rm} -rf %{buildroot}

%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 || :

%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 || :

#%files -f %{name}.lang
%files
%defattr(-, root, root)
%doc Changelog COPYING README TODO README.Fedora LISEZMOI.Fedora
%{_bindir}/*
%{_datadir}/applications/kde/%{name}.desktop
%{_datadir}/apps/%{name}/
%{_datadir}/apps/katepart/syntax/*
%{_datadir}/doc/HTML/en/%{name}/
%{_datadir}/icons/hicolor/*/*/*.png
%{_datadir}/mimelnk/application/x-%{name}.desktop
%config(noreplace) %{_sysconfdir}/udev/rules.d/026-microchip.rules
%config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms

%changelog
* Fri Sep 29 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.11.3-5
  - Fix typo in pickit2.perms

* Fri Sep 29 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.11.3-4
  - Fix typo for installing pickit2.perms
  - Add Application category in desktop file
  - Fix symlink: english is the only language where common directory is in
  LANG directory while for other, common is in LANG/docs directory

* Fri Sep 29 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.11.3-3
  - Add doc about how to complete full feature installation
  - Fix typo on security pathname
  - Short summary
  - Add BR ncurses-devel for FC6

* Thu Sep 28 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.11.3-2
  - Remove duplicate BR
  - Fix files permissions
  - Improve download URL
  - Don't mis space and tab

* Wed Sep 27 2006  Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.11.3-1
  - Initial Fedora package
  - Fedorize the Mandriva spec file from Nicolas Hadacek


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Sep 2006 16:43:12 -0000	1.1
+++ .cvsignore	29 Sep 2006 16:44:24 -0000	1.2
@@ -0,0 +1 @@
+piklab-0.11.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/piklab/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Sep 2006 16:43:12 -0000	1.1
+++ sources	29 Sep 2006 16:44:24 -0000	1.2
@@ -0,0 +1 @@
+0509671541cfc69a3c8b3ce95a9c3beb  piklab-0.11.3.tar.bz2


