[rxvt-unicode] fix xsubpp path leading to FTBFS (#993374)

Paul Howarth pghmcfc at fedoraproject.org
Sun Aug 18 18:37:00 UTC 2013


commit d7a32b4e9398288f767d824c9aa8c4ce73edbd75
Author: Paul Howarth <paul at city-fan.org>
Date:   Sun Aug 18 19:30:41 2013 +0100

    fix xsubpp path leading to FTBFS (#993374)

 rxvt-unicode-xsubpp.patch |   11 +++++++++++
 rxvt-unicode.spec         |    9 +++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/rxvt-unicode-xsubpp.patch b/rxvt-unicode-xsubpp.patch
new file mode 100644
index 0000000..4e54278
--- /dev/null
+++ b/rxvt-unicode-xsubpp.patch
@@ -0,0 +1,11 @@
+--- rxvt-unicode-9.18/src/Makefile.in
++++ rxvt-unicode-9.18/src/Makefile.in
+@@ -136,7 +136,7 @@ perlxsi.c: Makefile
+ 	$(PERL) -MExtUtils::Embed -e xsinit -- -std urxvt
+ 
+ rxvtperl.C: rxvtperl.xs iom_perl.h iom_perl.xs typemap typemap.iom
+-	PERL="$(PERL)" $(PERL) @PERLPRIVLIBEXP@/ExtUtils/xsubpp -C++ -typemap @PERLPRIVLIBEXP@/ExtUtils/typemap -typemap typemap.iom -typemap typemap -prototypes $(srcdir)/rxvtperl.xs >$@
++	PERL="$(PERL)" $(PERL) /usr/bin/xsubpp -C++ -typemap @PERLPRIVLIBEXP@/ExtUtils/typemap -typemap typemap.iom -typemap typemap -prototypes $(srcdir)/rxvtperl.xs >$@
+ 
+ rxvtperl.o: rxvtperl.C perlxsi.c
+ 	$(COMPILE) $(PERLFLAGS) -DLIBDIR="\"$(libdir)/urxvt\"" -c $<
diff --git a/rxvt-unicode.spec b/rxvt-unicode.spec
index 03c85ff..fc7cb72 100644
--- a/rxvt-unicode.spec
+++ b/rxvt-unicode.spec
@@ -1,6 +1,6 @@
 Name:           rxvt-unicode
 Version:        9.18
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Unicode version of rxvt
 
 Group:          User Interface/X
@@ -13,6 +13,7 @@ Source3:        rxvt-unicode-256color.desktop
 Source4:        rxvt-unicode-256color-ml.desktop
 Patch0:         rxvt-unicode-scroll-modupdown.patch
 Patch1:         rxvt-unicode-tabbed-newterm.patch
+Patch2:         rxvt-unicode-xsubpp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  fontconfig-devel
@@ -70,6 +71,7 @@ Version of rxvt-unicode with 256color and enhanced multi-language support.
 pushd %{name}-%{version}
 %patch0 -p1 -b .scroll-modupdown
 %patch1 -p1 -b .tabbed-newterm
+%patch2 -p1 -b .xsubpp
 popd
 
 cp -r %{name}-%{version} %{name}-%{version}-ml
@@ -444,13 +446,16 @@ rm -rf %{buildroot}
 %{_datadir}/applications/*rxvt-unicode-256color-ml.desktop
 
 %changelog
+* Sun Aug 18 2013 Paul Howarth <paul at city-fan.org> - 9.18-4
+- fix xsubpp path leading to FTBFS (#993374)
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.18-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
 * Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 9.18-2
 - Perl 5.18 rebuild
 
-* Mon Mar 26 2013 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+* Tue Mar 26 2013 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 9.18-1
 - version upgrade
 


More information about the scm-commits mailing list