From 3d79172193968dc2b378932471998759dd8ddb64 Mon Sep 17 00:00:00 2001 From: Adam Goode Date: Jul 11 2010 20:38:52 +0000 Subject: - New upstream release, many changes, see http://www.fvwm.org/news/ --- diff --git a/.cvsignore b/.cvsignore index 746edd2..e0d75ae 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -fvwm-2.5.26.tar.bz2 +fvwm-2.5.30.tar.bz2 diff --git a/fvwm-2.5.21-mimeopen.patch b/fvwm-2.5.21-mimeopen.patch deleted file mode 100644 index 9532687..0000000 --- a/fvwm-2.5.21-mimeopen.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur fvwm-2.5.21~/bin/fvwm-menu-directory.in fvwm-2.5.21/bin/fvwm-menu-directory.in ---- fvwm-2.5.21~/bin/fvwm-menu-directory.in 2006-11-21 03:10:33.000000000 -0500 -+++ fvwm-2.5.21/bin/fvwm-menu-directory.in 2007-02-28 21:22:40.000000000 -0500 -@@ -24,7 +24,7 @@ - my $dir = $home; - my $xterm = "xterm -e"; # the X terminal program to invoke - my $execT = $ENV{'SHELL'} || '/bin/sh'; --my $execF = $ENV{'EDITOR'} || "vi"; # the command to execute on plain files -+my $execF = "mimeopen -n"; # the command to execute on plain files - my $execA = undef; - my $commT = undef; - my $commF = undef; diff --git a/fvwm-2.5.21-xdg-open.patch b/fvwm-2.5.21-xdg-open.patch deleted file mode 100644 index f161d81..0000000 --- a/fvwm-2.5.21-xdg-open.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur fvwm-2.5.21~/bin/fvwm-menu-headlines.in fvwm-2.5.21/bin/fvwm-menu-headlines.in ---- fvwm-2.5.21~/bin/fvwm-menu-headlines.in 2006-03-25 11:15:39.000000000 -0500 -+++ fvwm-2.5.21/bin/fvwm-menu-headlines.in 2007-02-28 21:16:54.000000000 -0500 -@@ -192,7 +192,7 @@ - my $name = undef; - my $title = undef; - my $itemF = '%h\t%[(%Y-%m-%d %H:%M)]'; --my $execF = q(netscape -remote 'openURL(%u, new-window)' || netscape '%u'); -+my $execF = q(xdg-open '%u'); - my $commF = undef; - my $iconT = ''; - my $iconI = ''; diff --git a/fvwm-2.5.30-mimeopen.patch b/fvwm-2.5.30-mimeopen.patch new file mode 100644 index 0000000..0b46587 --- /dev/null +++ b/fvwm-2.5.30-mimeopen.patch @@ -0,0 +1,12 @@ +diff -ur fvwm-2.5.30~/bin/fvwm-menu-directory.in fvwm-2.5.30/bin/fvwm-menu-directory.in +--- fvwm-2.5.30~/bin/fvwm-menu-directory.in 2009-03-17 19:38:12.000000000 -0400 ++++ fvwm-2.5.30/bin/fvwm-menu-directory.in 2010-07-11 13:09:10.875353785 -0400 +@@ -40,7 +40,7 @@ + my $dir = $home; + my $xterm = "xterm -e"; # the X terminal program to invoke + my $exect = $ENV{'SHELL'} || '/bin/sh'; +-my $execf = $ENV{'EDITOR'} || "vi"; # the command to execute on plain files ++my $execf = "mimeopen -n"; # the command to execute on plain files + my $execa = undef; + my $commt = undef; + my $commf = undef; diff --git a/fvwm-2.5.30-xdg-open.patch b/fvwm-2.5.30-xdg-open.patch new file mode 100644 index 0000000..02681e5 --- /dev/null +++ b/fvwm-2.5.30-xdg-open.patch @@ -0,0 +1,13 @@ +diff -ur fvwm-2.5.30~/bin/fvwm-menu-headlines.in fvwm-2.5.30/bin/fvwm-menu-headlines.in +--- fvwm-2.5.30~/bin/fvwm-menu-headlines.in 2009-03-17 19:38:12.000000000 -0400 ++++ fvwm-2.5.30/bin/fvwm-menu-headlines.in 2010-07-11 13:06:04.145477629 -0400 +@@ -208,7 +208,7 @@ + my $name = undef; + my $title = undef; + my $itemf = '%h\t%[(%Y-%m-%d %H:%M)]'; +-my $execf = q(firefox '%u'); ++my $execf = q(xdg-open '%u'); + my $commf = undef; + my $icont = ''; + my $iconi = ''; +Only in fvwm-2.5.30/bin: fvwm-menu-headlines.in~ diff --git a/fvwm.spec b/fvwm.spec index 76efc3b..7abb140 100644 --- a/fvwm.spec +++ b/fvwm.spec @@ -1,6 +1,6 @@ Name: fvwm -Version: 2.5.26 -Release: 4%{?dist} +Version: 2.5.30 +Release: 1%{?dist} Summary: Highly configurable multiple virtual desktop window manager Group: User Interface/X @@ -11,12 +11,10 @@ Source1: %{name}.desktop Source2: http://www.cl.cam.ac.uk/~pz215/fvwm-scripts/scripts/fvwm-xdg-menu.py -Patch0: fvwm-2.5.21-xdg-open.patch -Patch1: fvwm-2.5.21-mimeopen.patch +Patch0: fvwm-2.5.30-xdg-open.patch +Patch1: fvwm-2.5.30-mimeopen.patch Patch2: fvwm-2.5.21-menu-generate.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildRequires: gettext libX11-devel libXt-devel libXext-devel libXinerama-devel libXpm-devel BuildRequires: libXft-devel libXrender-devel BuildRequires: libstroke-devel readline-devel libpng-devel fribidi-devel @@ -44,7 +42,7 @@ and implement a virtual desktop. %prep %setup -q -%patch0 -p1 -b .htmlview +%patch0 -p1 -b .xdg-open %patch1 -p1 -b .mimeopen %patch2 -p1 -b .menu-generate @@ -76,7 +74,6 @@ make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} %find_lang FvwmScript @@ -96,10 +93,6 @@ install -D -m0755 -p %{SOURCE2} \ $RPM_BUILD_ROOT%{_bindir}/fvwm-xdg-menu -%clean -rm -rf $RPM_BUILD_ROOT - - %files -f %{name}.lang %defattr(-,root,root,-) %doc README AUTHORS NEWS ChangeLog COPYING @@ -111,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jul 11 2010 Adam Goode - 2.5.30-1 +- New upstream release, many changes, see http://www.fvwm.org/news/ + * Fri Jul 24 2009 Fedora Release Engineering - 2.5.26-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 53f0262..fc4e505 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a1c225fe6497bf86a59cac561abd9064 fvwm-2.5.26.tar.bz2 +9d1f787e5ad5a8f886a8e711ec2e5690 fvwm-2.5.30.tar.bz2