[rxvt-unicode] Remove Fedora patches that break expected behavior

[Jamie Nguyen]

commit 848abd4d7a5ebc879ffcd7bf535311417be4380e
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Tue May 13 19:28:18 2014 +0100

    Remove Fedora patches that break expected behavior
    
    There is no need for the patches below, as they change the behavior of our
    package and break the principle of least astonishment:
    
     * Remove Fedora-specific patch to scroll up/down one line. Any users
       wanting this behavior can create their own key bindings.
     * Remove Fedora-specific patch to open new tabs with Control-t. Any users
       wanting this behavior can create their own key bindings.
    
    The popular 'tabbed' extension can now work properly (#1096791).

 ...-9.20-Fix-hard-coded-wrong-path-to-xsubpp.patch |   25 ++++++++++++++++++++
 rxvt-unicode-scroll-modupdown.patch                |   14 -----------
 rxvt-unicode-tabbed-newterm.patch                  |   14 -----------
 rxvt-unicode-xsubpp.patch                          |   11 --------
 rxvt-unicode.spec                                  |   22 +++++++++--------
 5 files changed, 37 insertions(+), 49 deletions(-)
---
diff --git a/rxvt-unicode-9.20-Fix-hard-coded-wrong-path-to-xsubpp.patch b/rxvt-unicode-9.20-Fix-hard-coded-wrong-path-to-xsubpp.patch
new file mode 100644
index 0000000..6278ad6
--- /dev/null
+++ b/rxvt-unicode-9.20-Fix-hard-coded-wrong-path-to-xsubpp.patch
@@ -0,0 +1,25 @@
+From 88fa291d18a6fc689fc98f57909b887ba5c6d0e0 Mon Sep 17 00:00:00 2001
+From: Paul Howarth <paul at city-fan.org>
+Date: Tue, 13 May 2014 19:03:34 +0100
+Subject: [PATCH] Fix hard-coded wrong path to xsubpp (#993374)
+
+---
+ src/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index c51d3f7..eacec03 100644
+--- a/src/Makefile.in
++++ b/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 $<
+-- 
+1.9.0
+
diff --git a/rxvt-unicode.spec b/rxvt-unicode.spec
index 3a4d914..af53409 100644
--- a/rxvt-unicode.spec
+++ b/rxvt-unicode.spec
@@ -1,6 +1,6 @@
 Name:           rxvt-unicode
 Version:        9.20
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Unicode version of rxvt
 
 Group:          User Interface/X
@@ -11,9 +11,7 @@ Source1:        rxvt-unicode.desktop
 Source2:        rxvt-unicode-ml.desktop
 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
+Patch0:         rxvt-unicode-9.20-Fix-hard-coded-wrong-path-to-xsubpp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  fontconfig-devel
@@ -69,11 +67,7 @@ Version of rxvt-unicode with 256color and enhanced multi-language support.
 %prep
 %setup -q -c %{name}-%{version}
 pushd %{name}-%{version}
-
-%patch0 -p1 -b .scroll-modupdown
-%patch1 -p1
-%patch2 -p1 -b .xsubpp
-rm src/perl/tabbed.orig
+%patch0 -p1
 popd
 
 cp -r %{name}-%{version} %{name}-%{version}-ml
@@ -409,7 +403,6 @@ rm -rf %{buildroot}
 %{_mandir}/man7/urxvt256c.7*
 %{_datadir}/applications/*rxvt-unicode-256color.desktop
 
-
 %files 256color-ml
 %defattr(-,root,root,-)
 %{_bindir}/urxvt256c-ml
@@ -448,6 +441,15 @@ rm -rf %{buildroot}
 %{_datadir}/applications/*rxvt-unicode-256color-ml.desktop
 
 %changelog
+* Tue May 13 2014 Jamie Nguyen <jamielinux at fedoraproject.org> - 9.20-2
+- There is no need for the patches below, as they change the behavior of our
+  package and break the principle of least astonishment.
+- Remove Fedora-specific patch to scroll up/down one line. Any users wanting
+  this behavior can create their own key bindings.
+- Remove Fedora-specific patch to open new tabs with Control-t. Any users
+  wanting this behavior can create their own key bindings.
+- The popular 'tabbed' extension can now work properly (#1096791).
+
 * Thu May 01 2014 Jamie Nguyen <jamielinux at fedoraproject.org> - 9.20-1
 - update to upstream release 9.20, which includes a fix for security bug
   CVE-2014-3121 (#1093287, #1093288, #1093289)