[piklab] - New upstream version - Fix gcc47 failure - Add PolicyKit support
Alain Portal
dionysos at fedoraproject.org
Thu Mar 15 16:00:17 UTC 2012
commit 8410cb83a94175ea4c39ea94c6e9816694390696
Author: Alain Portal <alain at super-phoenix.(none)>
Date: Thu Mar 15 17:00:13 2012 +0100
- New upstream version
- Fix gcc47 failure
- Add PolicyKit support
.gitignore | 1 +
piklab-0.15.10-gcc46.patch | 12 -
piklab-0.15.10-gcc47.patch | 36 --
piklab-0.15.10-sdcc-3.0.0.patch | 16 -
piklab-0.15.12-cmake-readline.patch | 11 +
piklab-0.15.12-gcc47.patch | 10 +
piklab-0.15.12-sdcc-3.0.0.patch | 10 +
piklab-0.15.12-use-fedora-docdir.patch | 8 +
piklab-0.15.3.fr.po.patch | 206 -------
piklab-0.15.7.gpsim-version.patch | 15 -
piklab-0.15.8.DSO-linking.patch | 11 -
piklab-0.15.8.new-pic.patch | 859 -----------------------------
piklab-0.15.8.rename-likeback-icons.patch | 85 ---
piklab-0.15.8.use-fedora-docdir.patch | 9 -
piklab-10-microchip.fdi | 21 +
piklab-pickit2.patch | 11 -
piklab.spec | 25 +-
sources | 2 +-
18 files changed, 79 insertions(+), 1269 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1c1f07a..2982c91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
piklab-0.15.8.tar.bz2
/piklab-0.15.10.tar.bz2
+/piklab-0.15.12.tar.bz2
diff --git a/piklab-0.15.12-cmake-readline.patch b/piklab-0.15.12-cmake-readline.patch
new file mode 100644
index 0000000..4f3474b
--- /dev/null
+++ b/piklab-0.15.12-cmake-readline.patch
@@ -0,0 +1,11 @@
+--- cmake/FindReadline.cmake.orig 2012-03-11 03:46:58.000000000 +0100
++++ cmake/FindReadline.cmake 2012-03-13 19:02:12.000000000 +0100
+@@ -2,6 +2,8 @@
+
+ # Try to find readline header
+ CHECK_INCLUDE_FILES ("readline/readline.h" HAVE_READLINE)
++# Check fails under CEntOS 6, so force.
++set(HAVE_READLINE 1)
+
+ if (NOT HAVE_READLINE)
+ message(FATAL_ERROR "Could not find readline header")
diff --git a/piklab-0.15.12-gcc47.patch b/piklab-0.15.12-gcc47.patch
new file mode 100644
index 0000000..4fb2aac
--- /dev/null
+++ b/piklab-0.15.12-gcc47.patch
@@ -0,0 +1,10 @@
+--- src/common/port/hid_port.cpp~ 2012-03-15 10:09:11.077173286 +0100
++++ src/common/port/hid_port.cpp 2012-03-15 10:09:11.100175969 +0100
+@@ -16,6 +16,7 @@
+ # include <fcntl.h>
+ # include <linux/hiddev.h>
+ # include <errno.h>
++# include <unistd.h>
+ #endif
+
+ #include "common/common/number.h"
diff --git a/piklab-0.15.12-sdcc-3.0.0.patch b/piklab-0.15.12-sdcc-3.0.0.patch
new file mode 100644
index 0000000..a454af5
--- /dev/null
+++ b/piklab-0.15.12-sdcc-3.0.0.patch
@@ -0,0 +1,10 @@
+--- src/tools/sdcc/sdcc_compile.cpp~ 2012-03-15 15:21:44.012199503 +0100
++++ src/tools/sdcc/sdcc_compile.cpp 2012-03-15 15:21:44.033206306 +0100
+@@ -32,6 +32,7 @@
+ args += "-%DEVICE";
+ args += "-V"; // verbose
+ args += "--debug";
++ args += "--use-non-free";
+ return args;
+ }
+
diff --git a/piklab-0.15.12-use-fedora-docdir.patch b/piklab-0.15.12-use-fedora-docdir.patch
new file mode 100644
index 0000000..0b67001
--- /dev/null
+++ b/piklab-0.15.12-use-fedora-docdir.patch
@@ -0,0 +1,8 @@
+--- CMakeLists.txt~ 2012-03-13 09:10:10.854286716 +0100
++++ CMakeLists.txt 2012-03-13 09:10:10.869175120 +0100
+@@ -30,5 +30,4 @@
+ if(NOT WIN32)
+ add_subdirectory(po)
+ add_subdirectory(man)
+- install(FILES README Changelog COPYING DESTINATION share/doc/piklab)
+ endif(NOT WIN32)
diff --git a/piklab-10-microchip.fdi b/piklab-10-microchip.fdi
new file mode 100644
index 0000000..fbbe823
--- /dev/null
+++ b/piklab-10-microchip.fdi
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deviceinfo version="0.2">
+ <device>
+ <!-- Microchip USB device -->
+ <match key="info.subsystem" contains="usb_device">
+ <match key="usb_device.vendor_id" int="0x04d8">
+ <append key="info.capabilities" type="strlist">microchipusb</append>
+ <append key="access_control.grant_group" type="strlist">microchip</append>
+ </match>
+ </match>
+
+ <!-- Set ACLs -->
+ <match key="info.capabilities" contains="microchipusb">
+ <append key="info.capabilities" type="strlist">access_control</append>
+ <merge key="access_control.file" type="copy_property">linux.device_file</merge>
+ <merge key="access_control.type" type="string">microchipusb</merge>
+ </match>
+ </device>
+</deviceinfo>
+
diff --git a/piklab.spec b/piklab.spec
index 883ee15..bc61193 100644
--- a/piklab.spec
+++ b/piklab.spec
@@ -1,8 +1,8 @@
%define unstable 1
Name: piklab
-Version: 0.15.10
-Release: 8%{?dist}
+Version: 0.15.12
+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,13 +17,14 @@ Source3: %{name}-pickit1.perms
Source4: %{name}-pickit2.perms
Source5: %{name}-README.Fedora
Source6: %{name}-LISEZMOI.Fedora
+Source7: %{name}-10-microchip.fdi
Patch0: %{name}-0.15.3.desktop-fr.patch
Patch1: %{name}-0.12.1.x-desktop-fr.patch
-Patch2: %{name}-0.15.8.use-fedora-docdir.patch
-Patch3: %{name}-0.15.10-gcc46.patch
-Patch4: %{name}-0.15.10-gcc47.patch
-Patch5: %{name}-0.15.10-sdcc-3.0.0.patch
+Patch2: %{name}-%{version}-use-fedora-docdir.patch
+Patch3: %{name}-%{version}-cmake-readline.patch
+Patch4: %{name}-%{version}-gcc47.patch
+Patch5: %{name}-%{version}-sdcc-3.0.0.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,8 +60,8 @@ comment finir l'installation.
%patch0 -p0 -b .desktop-fr
%patch1 -p0 -b .x-desktop-fr
%patch2 -p0 -b .use-fedora-docdir
-%patch3 -p1 -b .gcc46
-%patch4 -p1 -b .gcc47
+%patch3 -p0 -b .readline
+%patch4 -p0 -b .gcc47
%patch5 -p0 -b .sdcc-switch
%{__install} -pm 644 %{SOURCE5} README.Fedora
@@ -86,10 +87,12 @@ desktop-file-install --vendor=fedora \
%{__install} -d %{buildroot}%{_sysconfdir}/udev/rules.d/
%{__install} -d %{buildroot}%{_sysconfdir}/security/console.perms.d/
+%{__install} -d %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/
%{__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
+%{__install} -pm 644 %{SOURCE7} %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/10-microchip.fdi
# Fix absolute symlink
@@ -137,10 +140,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/icons/hicolor/*/*/*.png
%{_mandir}/man1/*
%{_datadir}/mimelnk/application/x-%{name}.desktop
+%{_datadir}/hal/fdi/policy/10osvendor/10-microchip.fdi
%config(noreplace) %{_sysconfdir}/udev/rules.d/026-microchip.rules
%config(noreplace) %{_sysconfdir}/security/console.perms.d/*.perms
%changelog
+* Thu Mar 15 2012 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 0.15.12-1
+- New upstream version
+- Fix gcc47 failure
+- Add PolicyKit support
+
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15.10-8
- Rebuilt for c++ ABI breakage
diff --git a/sources b/sources
index d18ecae..8a57aae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-21afd675a35a991f4b33562965504e0f piklab-0.15.10.tar.bz2
+7fa372b967e8a38108073bdaa80f1798 piklab-0.15.12.tar.bz2
More information about the scm-commits
mailing list