rpms/fvwm/F-12 fvwm-2.5.30-mimeopen.patch, NONE, 1.1 fvwm-2.5.30-xdg-open.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 fvwm.spec, 1.14, 1.15 sources, 1.5, 1.6 fvwm-2.5.21-mimeopen.patch, 1.1, NONE fvwm-2.5.21-xdg-open.patch, 1.1, NONE

[Adam Goode]

Author: agoode

Update of /cvs/pkgs/rpms/fvwm/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17551

Modified Files:
	.cvsignore fvwm.spec sources 
Added Files:
	fvwm-2.5.30-mimeopen.patch fvwm-2.5.30-xdg-open.patch 
Removed Files:
	fvwm-2.5.21-mimeopen.patch fvwm-2.5.21-xdg-open.patch 
Log Message:
* Sun Jul 11 2010 Adam Goode <adam at spicenitz.org> - 2.5.30-1
- New upstream release, many changes, see http://www.fvwm.org/news/


fvwm-2.5.30-mimeopen.patch:
 fvwm-menu-directory.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fvwm-2.5.30-mimeopen.patch ---
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;

fvwm-2.5.30-xdg-open.patch:
 fvwm-menu-headlines.in  |    2 +-
 fvwm-menu-headlines.in~ |only
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fvwm-2.5.30-xdg-open.patch ---
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~


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fvwm/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	15 Jun 2008 21:11:13 -0000	1.5
+++ .cvsignore	11 Jul 2010 20:45:51 -0000	1.6
@@ -1 +1 @@
-fvwm-2.5.26.tar.bz2
+fvwm-2.5.30.tar.bz2


Index: fvwm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fvwm/F-12/fvwm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- fvwm.spec	24 Jul 2009 23:21:50 -0000	1.14
+++ fvwm.spec	11 Jul 2010 20:45:52 -0000	1.15
@@ -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
 
@@ -55,7 +53,7 @@ cat << \EOF > %{name}-prov
   sed -e '/perl(FVWM::.*)\|perl(FvwmCommand)\|perl(General::FileSystem)\|perl(General::Parse)/d'
 EOF
 
-%define __perl_provides %{_builddir}/%{name}-%{version}/%{name}-prov
+%global __perl_provides %{_builddir}/%{name}-%{version}/%{name}-prov
 chmod +x %{__perl_provides}
 
 
@@ -66,7 +64,7 @@ cat << \EOF > %{name}-req
   sed -e '/perl(Gtk)\|perl(FVWM::Module::Gtk)\|perl(FVWM::.*)\|perl(FvwmCommand)\|perl(General::FileSystem)\|perl(General::Parse)/d'
 EOF
 
-%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
+%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
 chmod +x %{__perl_requires}
 
 
@@ -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
@@ -111,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jul 11 2010 Adam Goode <adam at spicenitz.org> - 2.5.30-1
+- New upstream release, many changes, see http://www.fvwm.org/news/
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.26-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fvwm/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	15 Jun 2008 21:11:13 -0000	1.5
+++ sources	11 Jul 2010 20:45:52 -0000	1.6
@@ -1 +1 @@
-a1c225fe6497bf86a59cac561abd9064  fvwm-2.5.26.tar.bz2
+9d1f787e5ad5a8f886a8e711ec2e5690  fvwm-2.5.30.tar.bz2


--- fvwm-2.5.21-mimeopen.patch DELETED ---


--- fvwm-2.5.21-xdg-open.patch DELETED ---