*** empty log message ***

diff --git a/Changes b/Changes
index fc322b80322d395b89544f6c24166b33e7afc46f..9fe0208a5df743f8ba56ec7eab3c634852d18cb8 100644 (file)
--- a/Changes
+++ b/Changes
@@ -155,6 +155,8 @@ TODO: kuake
         - added the OSC sequence 702 to detect the urxvt version number.
         - small configure updates.
         - further RTT optimisations.
+        - updated doc/rxvt-unicode.spec file. It's still not maintained here,
+          but much newer than the old one.
 
 7.4  Sat Jan 28 15:26:27 CET 2006
        - screen background wasn't always erased properly when scrolling,

diff --git a/doc/rxvt-unicode.spec b/doc/rxvt-unicode.spec
index 5aef0c4fb90af265827cca7765c7df7d11830c00..82e51a216c4c931908cfc6fc6a9ea8242c83ccdd 100644 (file)
--- a/doc/rxvt-unicode.spec
+++ b/doc/rxvt-unicode.spec
@@ -1,16 +1,26 @@
-Name: rxvt-unicode
-Version: 4.2
-Release: 1
-Summary: rxvt-unicode is an unicode version of rxvt
-License: GPL
-Group: Terminals
-Url: http://software.schmorp.de/
-Buildroot: /var/tmp/%{name}-root
+Name:           rxvt-unicode
+Version:        7.7
+Release:        1%{?dist}
+Summary:        Rxvt-unicode is an unicode version of rxvt
 
-Source: http://dist.schmorp.de/%name/%name-%version.tar.bz2
+Group:          User Interface/X
+License:        GPL
+URL:            http://software.schmorp.de/
+Source0:        http://dist.schmorp.de/%name/%name-%version.tar.bz2
+Source1:        rxvt-unicode.desktop
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Automatically added by buildreq on Mon Oct 11 2004
-BuildRequires: fontconfig-devel freetype2-devel gcc-c++ glib2 groff-base hostinfo libstdc++-devel pkgconfig xorg-x11-devel xorg-x11-libs xorg-x11-locales termutils-devel
+BuildRequires:  fontconfig-devel
+BuildRequires:  freetype-devel
+BuildRequires:  glib2-devel
+BuildRequires:  /usr/bin/tic
+BuildRequires:  desktop-file-utils
+BuildRequires:  libX11-devel
+BuildRequires:  libXft-devel
+BuildRequires:  libXpm-devel
+BuildRequires:  libXrender-devel
+BuildRequires:  libXt-devel
+BuildRequires:  xorg-x11-proto-devel
 
 %description
 rxvt-unicode is a clone of the well known terminal emulator rxvt, modified to
@@ -18,28 +28,142 @@ store text in Unicode (either UCS-2 or UCS-4) and to use locale-correct input
 and output. It also supports mixing multiple fonts at the same time, including
 Xft fonts.
 
+
 %prep
 %setup -q
 
+
 %build
-%configure
-make
+%configure --enable-xft --enable-font-styles --enable-utmp --enable-wtmp \
+  --enable-lastlog --enable-transparency --enable-tinting --enable-fading \
+  --enable-menubar --enable-rxvt-scroll --enable-xterm-scroll \
+  --enable-plain-scroll --enable-half-shadow --enable-xgetdefault \
+  --enable-24bit --enable-keepscrolling --enable-selectionscrolling \
+  --enable-mousewheel --enable-slipwheeling --enable-smart-resize \
+  --enable-pointer-blank --enable-xpm-background --enable-next-scroll \
+  --enable-xim --enable-linespace --with-save-lines=2000 --enable-resources \
+  --with-codesets=all --enable-combining --enable-iso14755 --enable-frills \
+  --with-xpm-includes=%{_includedir}/X11 \
+  --with-xpm-library=%{_libdir}
+
+make CFLAGS="${RPM_OPT_FLAGS}" %{?_smp_mflags}
 
 %install
+rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-tic -o $RPM_BUILD_ROOT/%_datadir/terminfo doc/etc/rxvt-unicode.terminfo 
+
+tic -o $RPM_BUILD_ROOT/%_datadir/terminfo doc/etc/rxvt-unicode.terminfo
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE1}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %files
-%doc README.FAQ INSTALL doc/README.menu doc/README.xvt doc/etc doc/menu
+%defattr(-,root,root,-)
+%doc README.FAQ INSTALL doc/README.xvt doc/etc doc/changes.txt COPYING
 %{_bindir}/*
-%{_mandir}/man1/*
-%{_mandir}/man7/*
 %{_datadir}/terminfo/r/*
-
+%{_mandir}/man*/*
+%{_datadir}/applications/*
+%{_libdir}/urxvt
 
 %changelog
-* Mon Dec 01 2004 vherva@babbage 4.2-1
-- 4.2
+* Tue Feb 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.7-1
+- version upgrade
+
+* Thu Feb 16 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.6-2
+- Rebuild for Fedora Extras 5
+
+* Fri Feb 10 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.6-1
+- version upgrade
+
+* Tue Jan 31 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.5-1
+- version upgrade
+
+* Sat Jan 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.4-1
+- version upgrade
+
+* Fri Jan 27 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.3a-1
+- version upgrade
+
+* Mon Jan 23 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.2-1
+- version upgrade (should resolve #178561)
+
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.1-1
+- version upgrade
+
+* Sat Jan 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.0-1
+- version upgrade
+
+* Thu Jan 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+6.3-1
+- version upgrade
+
+* Tue Jan 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+6.2-1 
+- version upgrade
+
+* Wed Dec 28 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+6.1-1
+- version upgrade
+
+* Sun Dec 25 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+6.0-1
+- version upgrade
+
+* Sun Dec 18 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+5.9-1
+- version upgrade
+
+* Fri Nov 25 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+5.8-2
+- modular xorg integration
+
+* Tue Oct 25 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+5.8-1
+- version upgrade
+
+* Sun Oct 16 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+5.7-3
+- enable frills (#170965)
+
+* Sat Sep 17 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+5.7-2
+- enable iso14755 (#168548)
+
+* Tue Aug 23 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+5.7-1
+- version upgrade
+
+* Sun Jun 05 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+5.5-3
+- add dist
+
+* Thu Jun 02 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+5.5-2
+- minor cleanups
+
+* Thu May 12 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+5.5-1
+- Version upgrade (5.5)
+
+* Mon Mar 28 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0:5.3-1
+- Version upgrade (5.3)
 
-* Mon Nov 27 2004 vherva@babbage 4.1-1
-- 4.1
+* Wed Feb 09 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- Initial RPM release.

diff --git a/src/perl/mark-urls b/src/perl/mark-urls
index a8921aed6565f0557a29c43388917462d0ccc06a..a5f6fd470ed0ec6d53aea05e9c70a08918972554 100644 (file)
--- a/src/perl/mark-urls
+++ b/src/perl/mark-urls
@@ -3,7 +3,7 @@
 # same url as used in "selection"
 my $url =
    qr{(
-      (?:https?://|ftp://|news://|mailto:|file://)[ab-zA-Z0-9\-\@;\/?:&=%\$_.+!*\x27(),~]+
+      (?:https?://|ftp://|news://|mailto:|file://)[ab-zA-Z0-9\-\@;\/?:&=%\$_.+!*\x27(),~#]+
       [ab-zA-Z0-9\-\@;\/?:&=%\$_+!*\x27()~]   # exclude some trailing characters (heuristic)
    )}x;
 

diff --git a/src/perl/selection b/src/perl/selection
index d93fd6fa32b5c4794776d829873ffe3f183c3990..3c5ea547cd38dfb2aae1f5688582aec2f8f086fb 100644 (file)
--- a/src/perl/selection
+++ b/src/perl/selection
@@ -46,7 +46,7 @@ my @mark_patterns = (
 
    # urls, just a heuristic
    qr{(
-      (?:https?://|ftp://|news://|mailto:|file://)[ab-zA-Z0-9\-\@;\/?:&=%\$_.+!*\x27(),~]+
+      (?:https?://|ftp://|news://|mailto:|file://)[ab-zA-Z0-9\-\@;\/?:&=%\$_.+!*\x27(),~#]+
       [ab-zA-Z0-9\-\@;\/?:&=%\$_+!*\x27()~]   # exclude some trailing characters (heuristic)
    )}x,