packages: dahdi-tools/dahdi-tools.spec - fix perl part

hawk hawk at pld-linux.org
Fri Sep 25 12:20:20 CEST 2009


Author: hawk                         Date: Fri Sep 25 10:20:20 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix perl part

---- Files affected:
packages/dahdi-tools:
   dahdi-tools.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/dahdi-tools/dahdi-tools.spec
diff -u packages/dahdi-tools/dahdi-tools.spec:1.4 packages/dahdi-tools/dahdi-tools.spec:1.5
--- packages/dahdi-tools/dahdi-tools.spec:1.4	Tue Jul 14 23:50:17 2009
+++ packages/dahdi-tools/dahdi-tools.spec	Fri Sep 25 12:20:15 2009
@@ -4,26 +4,6 @@
 # warning: Installed (but unpackaged) file(s) found:
 #    /etc/hotplug/usb/xpp_fxloader
 #    /etc/hotplug/usb/xpp_fxloader.usermap
-#    /usr/local/share/perl5/Dahdi.pm
-#    /usr/local/share/perl5/Dahdi/Chans.pm
-#    /usr/local/share/perl5/Dahdi/Config/Gen.pm
-#    /usr/local/share/perl5/Dahdi/Config/Gen/Chandahdi.pm
-#    /usr/local/share/perl5/Dahdi/Config/Gen/Modules.pm
-#    /usr/local/share/perl5/Dahdi/Config/Gen/System.pm
-#    /usr/local/share/perl5/Dahdi/Config/Gen/Unicall.pm
-#    /usr/local/share/perl5/Dahdi/Config/Gen/Users.pm
-#    /usr/local/share/perl5/Dahdi/Config/Gen/Xpporder.pm
-#    /usr/local/share/perl5/Dahdi/Config/Params.pm
-#    /usr/local/share/perl5/Dahdi/Hardware.pm
-#    /usr/local/share/perl5/Dahdi/Hardware/PCI.pm
-#    /usr/local/share/perl5/Dahdi/Hardware/USB.pm
-#    /usr/local/share/perl5/Dahdi/Span.pm
-#    /usr/local/share/perl5/Dahdi/Utils.pm
-#    /usr/local/share/perl5/Dahdi/Xpp.pm
-#    /usr/local/share/perl5/Dahdi/Xpp/Line.pm
-#    /usr/local/share/perl5/Dahdi/Xpp/Mpp.pm
-#    /usr/local/share/perl5/Dahdi/Xpp/Xbus.pm
-#    /usr/local/share/perl5/Dahdi/Xpp/Xpd.pm
 #
 # Conditional build:
 %bcond_with	oslec		# with Open Source Line Echo Canceller
@@ -31,6 +11,8 @@
 %bcond_without	xpp		# without Astribank
 %bcond_with	verbose
 
+%include	/usr/lib/rpm/macros.perl
+
 %ifarch sparc
 %undefine	with_smp
 %endif
@@ -51,6 +33,7 @@
 Source1:	dahdi.init
 Source2:	dahdi.sysconfig
 Patch0:		%{name}-as-needed.patch
+Patch1:		%{name}-perl-path.patch
 URL:		http://www.asterisk.org/
 Obsoletes:	zaptel
 BuildRequires:	dahdi-linux-devel
@@ -58,6 +41,7 @@
 BuildRequires:	perl-base
 BuildRequires:	perl-tools-pod
 BuildRequires:	rpmbuild(macros) >= 1.379
+BuildRequires:	rpm-perlprov >= 4.1-13
 %{?with_bristuff:Provides:	dahdi(bristuff)}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -142,6 +126,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %if %{with kernel}
 mkdir firmware
@@ -169,7 +154,7 @@
 
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
 
-%{__make} install \
+%{__make} -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/dahdi
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/dahdi
@@ -222,8 +207,8 @@
 
 %files -n perl-Dahdi
 %defattr(644,root,root,755)
-#%{perl_vendorlib}/Dahdi
-#%{perl_vendorlib}/Dahdi.pm
+%{perl_vendorlib}/Dahdi
+%{perl_vendorlib}/Dahdi.pm
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -232,6 +217,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2009/09/25 10:20:15  hawk
+- fix perl part
+
 Revision 1.4  2009/07/14 21:50:17  hawk
 - updated TODO
 
================================================================

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



More information about the pld-cvs-commit mailing list