rpms/perl-IP-Country/EL-5 perl-IP-Country.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andreas Thienemann
Author: ixs
Update of /cvs/nonfree/rpms/perl-IP-Country/EL-5
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18097
Modified Files:
.cvsignore sources
Added Files:
perl-IP-Country.spec
Log Message:
Initial Import
--- NEW FILE perl-IP-Country.spec ---
Name: perl-IP-Country
Version: 2.26
Release: 2%{?dist}
Summary: Fast lookup of country codes from IP addresses
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/IP-Country/
Source0: http://www.cpan.org/modules/by-module/IP/IP-Country-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: perl(ExtUtils::MakeMaker)
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%description
IP::Country allows fast lookups of IP addresses and their corresponding
countries based on available regional NIC data.
Although the country of assignment will probably be the country associated
with a large ISP rather than the client herself, this is probably good
enough for most log analysis applications, and under test has proved to be as
accurate as reverse-DNS and WHOIS lookup.
%package utils
Summary: Utility to query and rebuild the IP::Country database
Group: Applications/Internet
Requires: %{name} = %{version}-%{release}
%description utils
ip2cc is a frontend to the IP::Country Perl module allowing fast lookups of
IP addresses and their corresponding countries based on available regional
NIC data.
ipcc_loader.pl can be used to rebuild the database with current dumps of
the RIPE/APNIC/ARIN et al data.
%prep
%setup -q -n IP-Country-%{version}
find -name '._*' | xargs rm -f
%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
%{_fixperms} %{buildroot}/*
%check
make test
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc CHANGES README
%{perl_vendorlib}/*
%{_mandir}/man3/*
%files utils
%defattr(-,root,root,-)
%doc dbmScripts INSTALL
%{_bindir}/ip2cc
%{_mandir}/man1/ip2cc.1*
%changelog
* Thu Feb 19 2009 Andreas Thienemann <andreas(a)bawue.net> 2.26-2
- Removed dotfiles, added %%defattr to -utils
* Thu Feb 19 2009 Andreas Thienemann <andreas(a)bawue.net> 2.26-1
- Updated to upstream release 2.26
* Mon Feb 18 2008 Andreas Thienemann <athienem(a)redhat.com> 2.23-1
- Specfile autogenerated by cpanspec 1.74.
- Fixed up for fedora
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/perl-IP-Country/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 6 May 2009 13:45:22 -0000 1.1
+++ .cvsignore 6 May 2009 13:51:09 -0000 1.2
@@ -0,0 +1 @@
+IP-Country-2.26.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/perl-IP-Country/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 6 May 2009 13:45:22 -0000 1.1
+++ sources 6 May 2009 13:51:09 -0000 1.2
@@ -0,0 +1 @@
+1e73ba39325d197627e16de024afae82 IP-Country-2.26.tar.gz
15 years
rpms/perl-IP-Country/F-10 perl-IP-Country.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andreas Thienemann
Author: ixs
Update of /cvs/nonfree/rpms/perl-IP-Country/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17975
Modified Files:
.cvsignore sources
Added Files:
perl-IP-Country.spec
Log Message:
Initial Import
--- NEW FILE perl-IP-Country.spec ---
Name: perl-IP-Country
Version: 2.26
Release: 2%{?dist}
Summary: Fast lookup of country codes from IP addresses
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/IP-Country/
Source0: http://www.cpan.org/modules/by-module/IP/IP-Country-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: perl(ExtUtils::MakeMaker)
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%description
IP::Country allows fast lookups of IP addresses and their corresponding
countries based on available regional NIC data.
Although the country of assignment will probably be the country associated
with a large ISP rather than the client herself, this is probably good
enough for most log analysis applications, and under test has proved to be as
accurate as reverse-DNS and WHOIS lookup.
%package utils
Summary: Utility to query and rebuild the IP::Country database
Group: Applications/Internet
Requires: %{name} = %{version}-%{release}
%description utils
ip2cc is a frontend to the IP::Country Perl module allowing fast lookups of
IP addresses and their corresponding countries based on available regional
NIC data.
ipcc_loader.pl can be used to rebuild the database with current dumps of
the RIPE/APNIC/ARIN et al data.
%prep
%setup -q -n IP-Country-%{version}
find -name '._*' | xargs rm -f
%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
%{_fixperms} %{buildroot}/*
%check
make test
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc CHANGES README
%{perl_vendorlib}/*
%{_mandir}/man3/*
%files utils
%defattr(-,root,root,-)
%doc dbmScripts INSTALL
%{_bindir}/ip2cc
%{_mandir}/man1/ip2cc.1*
%changelog
* Thu Feb 19 2009 Andreas Thienemann <andreas(a)bawue.net> 2.26-2
- Removed dotfiles, added %%defattr to -utils
* Thu Feb 19 2009 Andreas Thienemann <andreas(a)bawue.net> 2.26-1
- Updated to upstream release 2.26
* Mon Feb 18 2008 Andreas Thienemann <athienem(a)redhat.com> 2.23-1
- Specfile autogenerated by cpanspec 1.74.
- Fixed up for fedora
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/perl-IP-Country/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 6 May 2009 13:45:22 -0000 1.1
+++ .cvsignore 6 May 2009 13:50:51 -0000 1.2
@@ -0,0 +1 @@
+IP-Country-2.26.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/perl-IP-Country/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 6 May 2009 13:45:22 -0000 1.1
+++ sources 6 May 2009 13:50:51 -0000 1.2
@@ -0,0 +1 @@
+1e73ba39325d197627e16de024afae82 IP-Country-2.26.tar.gz
15 years
rpms/perl-IP-Country/devel perl-IP-Country.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andreas Thienemann
Author: ixs
Update of /cvs/nonfree/rpms/perl-IP-Country/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17849
Modified Files:
.cvsignore sources
Added Files:
perl-IP-Country.spec
Log Message:
Initial Import
--- NEW FILE perl-IP-Country.spec ---
Name: perl-IP-Country
Version: 2.26
Release: 2%{?dist}
Summary: Fast lookup of country codes from IP addresses
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/IP-Country/
Source0: http://www.cpan.org/modules/by-module/IP/IP-Country-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: perl(ExtUtils::MakeMaker)
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%description
IP::Country allows fast lookups of IP addresses and their corresponding
countries based on available regional NIC data.
Although the country of assignment will probably be the country associated
with a large ISP rather than the client herself, this is probably good
enough for most log analysis applications, and under test has proved to be as
accurate as reverse-DNS and WHOIS lookup.
%package utils
Summary: Utility to query and rebuild the IP::Country database
Group: Applications/Internet
Requires: %{name} = %{version}-%{release}
%description utils
ip2cc is a frontend to the IP::Country Perl module allowing fast lookups of
IP addresses and their corresponding countries based on available regional
NIC data.
ipcc_loader.pl can be used to rebuild the database with current dumps of
the RIPE/APNIC/ARIN et al data.
%prep
%setup -q -n IP-Country-%{version}
find -name '._*' | xargs rm -f
%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
make pure_install PERL_INSTALL_ROOT=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
%{_fixperms} %{buildroot}/*
%check
make test
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc CHANGES README
%{perl_vendorlib}/*
%{_mandir}/man3/*
%files utils
%defattr(-,root,root,-)
%doc dbmScripts INSTALL
%{_bindir}/ip2cc
%{_mandir}/man1/ip2cc.1*
%changelog
* Thu Feb 19 2009 Andreas Thienemann <andreas(a)bawue.net> 2.26-2
- Removed dotfiles, added %%defattr to -utils
* Thu Feb 19 2009 Andreas Thienemann <andreas(a)bawue.net> 2.26-1
- Updated to upstream release 2.26
* Mon Feb 18 2008 Andreas Thienemann <athienem(a)redhat.com> 2.23-1
- Specfile autogenerated by cpanspec 1.74.
- Fixed up for fedora
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/perl-IP-Country/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 6 May 2009 13:45:22 -0000 1.1
+++ .cvsignore 6 May 2009 13:49:43 -0000 1.2
@@ -0,0 +1 @@
+IP-Country-2.26.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/perl-IP-Country/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 6 May 2009 13:45:22 -0000 1.1
+++ sources 6 May 2009 13:49:43 -0000 1.2
@@ -0,0 +1 @@
+1e73ba39325d197627e16de024afae82 IP-Country-2.26.tar.gz
15 years
rpms/perl-IP-Country/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/perl-IP-Country/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/nonfree/owners/tmpcvsZ17255/rpms/perl-IP-Country/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module perl-IP-Country
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: perl-IP-Country
# $Id: Makefile,v 1.1 2009/05/06 13:45:22 thl Exp $
NAME := perl-IP-Country
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
15 years
rpms/perl-IP-Country Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/perl-IP-Country
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/nonfree/owners/tmpcvsZ17255/rpms/perl-IP-Country
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module perl-IP-Country
--- NEW FILE Makefile ---
# Top level Makefile for module perl-IP-Country
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
--- NEW FILE pkg.acl ---
15 years
rpms/perl-IP-Country/devel - New directory
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/perl-IP-Country/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/nonfree/owners/tmpcvsZ17255/rpms/perl-IP-Country/devel
Log Message:
Directory /cvs/nonfree/rpms/perl-IP-Country/devel added to the repository
15 years
rpms/perl-IP-Country - New directory
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/perl-IP-Country
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/nonfree/owners/tmpcvsZ17255/rpms/perl-IP-Country
Log Message:
Directory /cvs/nonfree/rpms/perl-IP-Country added to the repository
15 years
rpms/flvtool2/devel flvtool2.spec,1.3,1.4
by Matthias Saou
Author: thias
Update of /cvs/free/rpms/flvtool2/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv898
Modified Files:
flvtool2.spec
Log Message:
Minor fixes.
Index: flvtool2.spec
===================================================================
RCS file: /cvs/free/rpms/flvtool2/devel/flvtool2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- flvtool2.spec 29 Mar 2009 13:06:47 -0000 1.3
+++ flvtool2.spec 6 May 2009 08:56:29 -0000 1.4
@@ -1,13 +1,15 @@
+%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
+
Summary: Manipulation tool for Macromedia Flash Video (FLV) files
Name: flvtool2
Version: 1.0.6
-Release: 3%{?dist}
+Release: 4%{?dist}
License: BSD
Group: Applications/Multimedia
URL: http://www.inlet-media.de/flvtool2
Source: http://rubyforge.org/frs/download.php/17497/flvtool2-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: ruby
+Requires: ruby(abi) = 1.8
BuildRequires: ruby
BuildArch: noarch
@@ -20,7 +22,7 @@
%prep
-%setup
+%setup -q
%build
@@ -38,18 +40,23 @@
%files
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
%doc CHANGELOG LICENSE README examples/
%{_bindir}/flvtool2
-%{_prefix}/lib/ruby/site_ruby/*/flv.rb
-%{_prefix}/lib/ruby/site_ruby/*/flvtool2.rb
-%{_prefix}/lib/ruby/site_ruby/*/mixml.rb
-%{_prefix}/lib/ruby/site_ruby/*/miyaml.rb
-%{_prefix}/lib/ruby/site_ruby/*/flv/
-%{_prefix}/lib/ruby/site_ruby/*/flvtool2/
+%{ruby_sitelib}/flv.rb
+%{ruby_sitelib}/flvtool2.rb
+%{ruby_sitelib}/mixml.rb
+%{ruby_sitelib}/miyaml.rb
+%{ruby_sitelib}/flv/
+%{ruby_sitelib}/flvtool2/
%changelog
+* Wed May 6 2009 Matthias Saou <http://freshrpms.net/> 1.0.6-4
+- Add the mandatory "Requires: ruby(abi) = 1.8" line.
+- Use the ruby_sitelib macro.
+- Quiet setup.
+
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.0.6-3
- rebuild for new F11 features
15 years
rpms/snes9x/devel snes9x-1.51-src-fixes.patch, NONE, 1.1 snes9x.spec, 1.3, 1.4
by Matthias Saou
Author: thias
Update of /cvs/nonfree/rpms/snes9x/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv537
Modified Files:
snes9x.spec
Added Files:
snes9x-1.51-src-fixes.patch
Log Message:
Include patch to fix the current compilation errors.
snes9x-1.51-src-fixes.patch:
--- NEW FILE snes9x-1.51-src-fixes.patch ---
diff -Naupr snes9x-1.51-src.orig/unix/unix.cpp snes9x-1.51-src/unix/unix.cpp
--- snes9x-1.51-src.orig/unix/unix.cpp 2007-04-29 02:51:08.000000000 +0200
+++ snes9x-1.51-src/unix/unix.cpp 2009-05-06 10:42:48.493984726 +0200
@@ -1162,8 +1162,8 @@ void _splitpath(const char *path, char *
{
*drive = 0;
- char *slash = strrchr(path, SLASH_CHAR);
- char *dot = strrchr(path, '.');
+ const char *slash = strrchr(path, SLASH_CHAR);
+ const char *dot = strrchr(path, '.');
if (dot && slash && dot < slash)
{
Index: snes9x.spec
===================================================================
RCS file: /cvs/nonfree/rpms/snes9x/devel/snes9x.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- snes9x.spec 29 Mar 2009 15:18:59 -0000 1.3
+++ snes9x.spec 6 May 2009 08:54:12 -0000 1.4
@@ -4,12 +4,13 @@
Summary: Portable, freeware Super Nintendo Entertainment System (TM) emulator
Name: snes9x
Version: 1.51
-Release: 3%{?dist}
+Release: 4%{?dist}
License: Other
Group: Applications/Emulators
URL: http://www.snes9x.com/
Source: http://files.ipherswipsite.com/snes9x/snes9x-%{real_version}%{?prever}-sr...
Patch0: snes9x-1.43-wmclass.patch
+Patch1: snes9x-1.51-src-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: gcc-c++, zlib-devel, libpng-devel
BuildRequires: libGL-devel, libGLU-devel
@@ -23,8 +24,9 @@
%prep
-%setup -n %{name}-%{real_version}%{?prever:-dev}-src
+%setup -q -n %{name}-%{real_version}%{?prever:-dev}-src
%patch0 -p2 -b .wmclass
+%patch1 -p1 -b .fixes
%build
@@ -61,6 +63,10 @@
%changelog
+* Wed May 6 2009 Matthias Saou <http://freshrpms.net/> 1.51-4
+- Include patch to fix the current compilation errors.
+- Quiet setup.
+
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.51-3
- rebuild for new F11 features
15 years
rpms/vagalume/F-9 vagalume-0.7.1-border_width.patch, NONE, 1.1 vagalume.spec, 1.4, 1.5
by Michel Alexandre Salim
Author: salimma
Update of /cvs/free/rpms/vagalume/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5390/F-9
Modified Files:
vagalume.spec
Added Files:
vagalume-0.7.1-border_width.patch
Log Message:
* Tue May 5 2009 Michel Salim <salimma(a)fedoraproject.org> - 0.7.1-2
- Fix border width (upstream bug #4041)
vagalume-0.7.1-border_width.patch:
--- NEW FILE vagalume-0.7.1-border_width.patch ---
--- trunk/src/vgl-main-window.c 2009/04/29 22:47:55 527
+++ trunk/src/vgl-main-window.c 2009/05/01 12:44:11 528
@@ -1036,12 +1036,13 @@
priv->progressbar_text = g_string_sized_new(30);
g_string_assign(priv->progressbar_text, " ");
/* Window */
-#ifndef USE_HILDON_WINDOW
+#ifdef USE_HILDON_WINDOW
+ gtk_container_set_border_width(GTK_CONTAINER(win), 2);
+#else
gtk_window_set_default_size(win, 500, -1);
#endif
gtk_window_add_accel_group(win, accel);
gtk_window_set_icon_from_file(win, APP_ICON, NULL);
- gtk_container_set_border_width(GTK_CONTAINER(win), 2);
/* Boxes */
vbox = GTK_BOX(gtk_vbox_new(FALSE, 5));
centralbox = GTK_BOX(gtk_hbox_new(FALSE, 5));
Index: vagalume.spec
===================================================================
RCS file: /cvs/free/rpms/vagalume/F-9/vagalume.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vagalume.spec 26 Mar 2009 21:56:56 -0000 1.4
+++ vagalume.spec 6 May 2009 00:08:03 -0000 1.5
@@ -1,12 +1,13 @@
Name: vagalume
Version: 0.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Last.fm client for GNOME and Maemo
Group: Applications/Multimedia
License: GPLv3
URL: http://vagalume.igalia.com/
Source0: http://vagalume.igalia.com/files/source/vagalume_%{version}.orig.tar.gz
+Patch0: %{name}-0.7.1-border_width.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gstreamer-devel gtk2-devel libxml2-devel
@@ -45,6 +46,7 @@
%prep
%setup -q -n %{name}-%{version}.orig
+%patch0 -p1 -b .border_width
%build
@@ -91,6 +93,9 @@
%changelog
+* Tue May 5 2009 Michel Salim <salimma(a)fedoraproject.org> - 0.7.1-2
+- Fix border width (upstream bug #4041)
+
* Tue Mar 24 2009 Michel Salim <salimma(a)fedoraproject.org> - 0.7.1-1
- Update to 0.7.1
15 years