rpms/hal-info/devel hal-info.spec, 1.45, 1.46 30-keymap-olpc.fdi, 1.1, NONE

[Richard Hughes]

Author: rhughes

Update of /cvs/pkgs/rpms/hal-info/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1666

Modified Files:
	hal-info.spec 
Removed Files:
	30-keymap-olpc.fdi 
Log Message:
* Thu Jul 30 2009 Richard Hughes <rhughes at redhat.com> - 20090716-3
- Remove 30-keymap-olpc.fdi as it's now shipped in olpc-utils
- Fixes #514081



Index: hal-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal-info/devel/hal-info.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- hal-info.spec	25 Jul 2009 01:59:49 -0000	1.45
+++ hal-info.spec	30 Jul 2009 11:52:08 -0000	1.46
@@ -1,15 +1,12 @@
 Summary: Device information files for HAL
 Name: hal-info
 Version: 20090716
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: AFL or GPLv2
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
 
-# OLPC specific, not upstream yet, although on HAL mailing list
-Source1: 30-keymap-olpc.fdi
-
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 Requires: hal >= 0.5.10
@@ -29,9 +26,6 @@ known as .fdi files) for the hal package
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# OLPC keys FDI file
-install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop/30-keymap-olpc.fdi
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -42,6 +36,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hal/fdi/preprobe/10osvendor/*.fdi
 
 %changelog
+* Thu Jul 30 2009 Richard Hughes <rhughes at redhat.com> - 20090716-3
+- Remove 30-keymap-olpc.fdi as it's now shipped in olpc-utils
+- Fixes #514081
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20090716-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- 30-keymap-olpc.fdi DELETED ---