packages: perl-Tk/perl-Tk.spec - fixed build with current Xlib (aka libX11)...

qboosh qboosh at pld-linux.org
Mon Mar 7 21:26:48 CET 2011


Author: qboosh                       Date: Mon Mar  7 20:26:48 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed build with current Xlib (aka libX11)
- rm cleanup

---- Files affected:
packages/perl-Tk:
   perl-Tk.spec (1.84 -> 1.85) 

---- Diffs:

================================================================
Index: packages/perl-Tk/perl-Tk.spec
diff -u packages/perl-Tk/perl-Tk.spec:1.84 packages/perl-Tk/perl-Tk.spec:1.85
--- packages/perl-Tk/perl-Tk.spec:1.84	Sat Nov 13 00:38:00 2010
+++ packages/perl-Tk/perl-Tk.spec	Mon Mar  7 21:26:43 2011
@@ -14,7 +14,7 @@
 # same as perl (except pTk dir - BSD-like)
 License:	GPL v1+ or Artistic, parts BSD-like
 Group:		Development/Languages/Perl
-Source0:	http://search.cpan.org/CPAN/authors/id/S/SR/SREZIC/%{pnam}-%{version}.tar.gz
+Source0:	http://www.cpan.org/modules/by-authors/id/S/SR/SREZIC/%{pnam}-%{version}.tar.gz
 # Source0-md5:	f4aebe6fcdb309a8480514f2ccf8117c
 Patch0:		%{name}-misc.patch
 Patch1:		%{name}-man_section.patch
@@ -61,6 +61,9 @@
 %patch1 -p1
 
 %build
+# sync with current Xlib
+ln -sf /usr/include/X11/Xlib.h pTk/Xlib.h
+
 %{__perl} Makefile.PL \
 	XFT=1 \
 	INSTALLDIRS=vendor \
@@ -83,15 +86,13 @@
 mv $RPM_BUILD_ROOT{%{perl_vendorarch}/Tk/demos,%{_examplesdir}/%{name}-%{version}}
 
 # perl-Tie-Watch packaged in system
-rm -f $RPM_BUILD_ROOT{%{_mandir}/man3/Tie::Watch.3pm,%{perl_vendorarch}/Tie/Watch.pm}
-
-# other arch
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/fix_4_os2.pl
+%{__rm} $RPM_BUILD_ROOT{%{_mandir}/man3/Tie::Watch.3pm,%{perl_vendorarch}/Tie/Watch.pm}
 
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/{{auto/Tk/.packlist,Tk/reindex.pl},Tk{,/*}.pod}
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Tk{,/*}.pod
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Tk/.packlist
 
 # in %doc
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/Tk/{Credits,README.*,license.terms}
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Tk/{Credits,README.*,license.terms}
 
 find $RPM_BUILD_ROOT -type f | xargs sed -i -e "s|/usr/local/bin/perl|%{_bindir}/perl|g"
 
@@ -167,6 +168,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.85  2011/03/07 20:26:43  qboosh
+- fixed build with current Xlib (aka libX11)
+- rm cleanup
+
 Revision 1.84  2010/11/12 23:38:00  pawelz
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl-Tk/perl-Tk.spec?r1=1.84&r2=1.85&f=u



More information about the pld-cvs-commit mailing list