rpms/fvwm/FC-6 fvwm-2.5.21-xdg-open.patch, NONE, 1.1 fvwm.spec, 1.3, 1.4 sources, 1.2, 1.3 fvwm-2.5.21-htmlview.patch, 1.1, NONE

[Adam Goode (agoode) <fedora-extras-commits redhat com>]

Author: agoode

Update of /cvs/extras/rpms/fvwm/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25782

Modified Files:
	fvwm.spec sources 
Added Files:
	fvwm-2.5.21-xdg-open.patch 
Removed Files:
	fvwm-2.5.21-htmlview.patch 
Log Message:
* Sun Dec  2 2007 Adam Goode <adam spicenitz org> - 2.5.24-1
- New upstream release
- Fixes segfault (#382321)


fvwm-2.5.21-xdg-open.patch:

--- NEW FILE fvwm-2.5.21-xdg-open.patch ---
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 = '';


Index: fvwm.spec
===================================================================
RCS file: /cvs/extras/rpms/fvwm/FC-6/fvwm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fvwm.spec	5 Aug 2007 14:57:12 -0000	1.3
+++ fvwm.spec	2 Dec 2007 19:13:32 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		fvwm
-Version:	2.5.21
-Release:	5%{?dist}
+Version:	2.5.24
+Release:	1%{?dist}
 Summary:	Highly configurable multiple virtual desktop window manager
 
 Group:		User Interface/X
@@ -11,7 +11,7 @@
 Source2:	http://www.cl.cam.ac.uk/~pz215/fvwm-scripts/scripts/fvwm-xdg-menu.py
 
 
-Patch0:		fvwm-2.5.21-htmlview.patch
+Patch0:		fvwm-2.5.21-xdg-open.patch
 Patch1:		fvwm-2.5.21-mimeopen.patch
 Patch2:		fvwm-2.5.21-menu-generate.patch
 
@@ -20,13 +20,14 @@
 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
+BuildRequires:	librsvg2-devel
 Requires:	xterm %{_bindir}/mimeopen
 
 # for fvwm-bug
 Requires:	%{_sbindir}/sendmail
 
 # for fvwm-menu-headlines
-Requires:	htmlview
+Requires:	xdg-utils
 
 # for fvwm-menu-xlock
 Requires:	xlockmore
@@ -69,12 +70,6 @@
 chmod +x %{__perl_requires}
 
 
-# Work around FVWM bug #4208
-find . -name '*.in' -type f -print0 \
- | xargs -0 sed -i -e 's:@datarootdir@:@datadir@:'
-
-
-
 %build
 %configure
 make %{?_smp_mflags}
@@ -116,6 +111,23 @@
 
 
 %changelog
+* Sun Dec  2 2007 Adam Goode <adam spicenitz org> - 2.5.24-1
+- New upstream release
+- Fixes segfault (#382321)
+
+* Tue Oct  2 2007 Adam Goode <adam spicenitz org> - 2.5.23-3
+- Change htmlview to xdg-open (thanks, Ville Skyttä !)
+
+* Mon Sep 10 2007 Adam Goode <adam spicenitz org> - 2.5.23-2
+- Don't add gnome-libs-devel to BR (not on ppc64?)
+
+* Mon Sep 10 2007 Adam Goode <adam spicenitz org> - 2.5.23-1
+- New upstream release
+
+* Tue Aug 21 2007 Adam Goode <adam spicenitz org> - 2.5.21-5
+- Update license tag
+- Rebuild for buildid
+
 * Thu Mar 15 2007 Adam Goode <adam spicenitz org> - 2.5.21-4
 - Don't patch configure, just patch a few files
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fvwm/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Mar 2007 03:16:14 -0000	1.2
+++ sources	2 Dec 2007 19:13:32 -0000	1.3
@@ -1 +1 @@
-c11efef91420e686d54f772e7162e879  fvwm-2.5.21.tar.bz2
+791f3594c20199ef27a1de9089799821  fvwm-2.5.24.tar.bz2


--- fvwm-2.5.21-htmlview.patch DELETED ---