packages: perl-Device-USB/perl-Device-USB.spec - change internal function p...

sparky sparky at pld-linux.org
Tue Dec 22 14:18:15 CET 2009


Author: sparky                       Date: Tue Dec 22 13:18:15 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- change internal function prefix from libusb to DeviceUSB because they
  conflict with libusb-1.0

---- Files affected:
packages/perl-Device-USB:
   perl-Device-USB.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/perl-Device-USB/perl-Device-USB.spec
diff -u packages/perl-Device-USB/perl-Device-USB.spec:1.4 packages/perl-Device-USB/perl-Device-USB.spec:1.5
--- packages/perl-Device-USB/perl-Device-USB.spec:1.4	Tue Dec 22 01:25:58 2009
+++ packages/perl-Device-USB/perl-Device-USB.spec	Tue Dec 22 14:18:09 2009
@@ -22,6 +22,7 @@
 BuildRequires:	perl-Parse-RecDescent
 BuildRequires:	perl-devel >= 1:5.8.0
 BuildRequires:	rpm-perlprov >= 4.1-13
+BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -34,6 +35,11 @@
 %prep
 %setup -q -n %{pdir}-%{pnam}-%{version}
 
+# function names conflict with libusb-1.0
+sed -e 's/libusb_/DeviceUSB_/g' -i lib/Device/USB.pm lib/Device/USB/Device.pm
+rm USB.pm
+ln -s lib/Device/USB.pm .
+
 %build
 export LIBUSB_LIBDIR="%{_libdir}"
 %{__perl} Makefile.PL \
@@ -68,6 +74,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2009/12/22 13:18:09  sparky
+- change internal function prefix from libusb to DeviceUSB because they
+  conflict with libusb-1.0
+
 Revision 1.4  2009/12/22 00:25:58  sparky
 - updated to 0.3
 - BR: libusb-compat-devel instead of libusb-devel
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl-Device-USB/perl-Device-USB.spec?r1=1.4&r2=1.5&f=u



More information about the pld-cvs-commit mailing list