commit 2604144158c6fc8e76d3b0327d3b676734906b1a
Author: Jan Rękorajski <[email protected]>
Date: Mon Jul 17 23:16:05 2017 +0900
- fix obsolete syntax that's became fatal with perl 5.26
- rel 8
perl-5.26.patch | 20 ++++++++++++++++++++
vfmg.spec | 4 +++-
2 files changed, 23 insertions(+), 1 deletion(-)
---
diff --git a/vfmg.spec b/vfmg.spec
index 6fbd0a5..089ed39 100644
--- a/vfmg.spec
+++ b/vfmg.spec
@@ -3,7 +3,7 @@ Summary: VFolders Menu Generator
Summary(pl.UTF-8): Generator Menu opartego na VFolders
Name: vfmg
Version: 0.9.95
-Release: 7
+Release: 8
License: GPL
Group: X11/Window Managers/Tools
Vendor: GoTaR <[email protected]>
@@ -12,6 +12,7 @@ Source0: %{name}-%{version}.tar.bz2
Patch0: %{name}-ignore-OnlyUnallocated.patch
Patch1: %{name}-XDG_MENU_PREFIX.patch
Patch2: no-xfce4.patch
+Patch3: perl-5.26.patch
URL: http://vfmg.sourceforge.net/
BuildRequires: rpm-perlprov
Requires(post,preun): /sbin/chkconfig
@@ -57,6 +58,7 @@ generowanie menu dla zarządców okien o określonych godzinach.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%install
rm -rf $RPM_BUILD_ROOT
diff --git a/perl-5.26.patch b/perl-5.26.patch
new file mode 100644
index 0000000..16b53a9
--- /dev/null
+++ b/perl-5.26.patch
@@ -0,0 +1,20 @@
+--- vfmg-0.9.95/vfmg~ 2017-07-17 23:12:13.000000000 +0900
++++ vfmg-0.9.95/vfmg 2017-07-17 23:13:49.701818825 +0900
+@@ -206,7 +206,7 @@
+ $opt{$opt} = $rcopt{$opt} unless defined $opt{$opt};
+ $opt{$opt} = $defopt{$opt} unless defined $opt{$opt};
+ next unless defined $opt{$opt};
+- $opt{$opt} =~ s/\${HOME}/$ENV{'HOME'}/go;
++ $opt{$opt} =~ s/\$\{HOME\}/$ENV{'HOME'}/go;
+ }
+
+ # check dependencies
+@@ -892,7 +892,7 @@
+ my $cnext = $cnum + 1;
+ my @apps;
+ my @tmp = ();
+- @tmp = %{$menu[$no]} if defined %{$menu[$no]};
++ @tmp = %{$menu[$no]} if %{$menu[$no]};
+ my $all = ($#tmp + 1) / 2;
+ my $num = 0;
+ foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vfmg.git/commitdiff/2604144158c6fc8e76d3b0327d3b676734906b1a
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
