diff --git a/.gitignore b/.gitignore index 0b5b0c1..0a85780 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/gap4r7p4_2014_02_20-01_21.tar.bz2 +/gap4r7p5_2014_05_24-20_02.tar.bz2 diff --git a/gap-paths.patch b/gap-paths.patch index f082a42..9f40152 100644 --- a/gap-paths.patch +++ b/gap-paths.patch @@ -1,5 +1,5 @@ ---- ./cnf/gac.in.orig 2013-12-01 03:17:13.000000000 -0700 -+++ ./cnf/gac.in 2014-01-13 22:00:00.000000000 -0700 +--- ./cnf/gac.in.orig 2014-05-24 14:02:53.000000000 -0600 ++++ ./cnf/gac.in 2014-06-19 12:00:00.000000000 -0600 @@ -55,16 +55,16 @@ ## option is appended at the end of the link command after the .o ## files to link. @@ -21,7 +21,7 @@ fi gap_options="" gap_include="${gap_dir}/src" -@@ -171,9 +171,9 @@ gap_compile () { +@@ -172,9 +172,9 @@ gap_compile () { ## c_compile () { echo ${c_compiler} $3 -o $1 -I${gap_dir} \ @@ -33,7 +33,7 @@ } -@@ -439,17 +439,17 @@ make_compstat () { +@@ -440,17 +440,17 @@ make_compstat () { objects="${gactmp}/$$compstat.o ${objects}" } @@ -60,8 +60,8 @@ ############################################################################# ## ---- ./configure.orig 2013-12-01 03:17:13.000000000 -0700 -+++ ./configure 2014-01-13 22:00:00.000000000 -0700 +--- ./configure.orig 2014-05-24 14:02:53.000000000 -0600 ++++ ./configure 2014-06-19 12:00:00.000000000 -0600 @@ -4094,7 +4094,7 @@ $as_echo "no" >&6; } fi diff --git a/gap.spec b/gap.spec index 936fdc2..5fccfed 100644 --- a/gap.spec +++ b/gap.spec @@ -1,12 +1,12 @@ -%global upstreamver 4r7p4 -%global pkgdate 2014_02_20-01_21 -%global gapdirname gap%(cut -dp -f1 <<<%upstreamver) +%global upstreamver 4r7p5 +%global pkgdate 2014_05_24-20_02 +%global gapdirname gap%(cut -dp -f1 <<< %upstreamver) %global gapdir %{_prefix}/lib/gap %global icondir %{_datadir}/icons/hicolor Name: gap -Version: %(sed -r "s/r|p/./g" <<<%upstreamver) -Release: 2%{?dist} +Version: %(sed -r "s/r|p/./g" <<< %upstreamver) +Release: 1%{?dist} Summary: Computational discrete algebra Group: Applications/Engineering @@ -39,6 +39,7 @@ Patch3: %{name}-stat.patch BuildRequires: desktop-file-utils BuildRequires: gmp-devel +BuildRequires: m4 BuildRequires: netpbm-progs BuildRequires: readline-devel @@ -143,6 +144,10 @@ cp -p %{SOURCE1} README.fedora # Fix a missing executable bit chmod a+x makepkgs +# The makepkgs script is unable to find 2 packages due to version numbers +ln -s io-4.3.1 pkg/io +ln -s orb-4.7.1 pkg/orb + %build %configure --with-gmp=system \ CPPFLAGS='-D_FILE_OFFSET_BITS=64 -DSYS_DEFAULT_PATHS=\"%{gapdir}\"' @@ -304,7 +309,7 @@ make testinstall %{_datadir}/mime/packages/gap.xml %{icondir}/32x32/gap.png %dir %{_localstatedir}/lib/%{name}/ -%verify(user group mode) %{_localstatedir}/lib/%{name}/workspace +%verify(user group mode) %{_localstatedir}/lib/%{name}/workspace.gz %files online-help %{gapdir}/doc/ @@ -324,6 +329,10 @@ make testinstall %{_datadir}/vim/vimfiles/syntax/gap.vim %changelog +* Thu Jun 19 2014 Jerry James - 4.7.5-1 +- New upstream release +- Fix ownership of workspace.gz + * Sat Jun 07 2014 Fedora Release Engineering - 4.7.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild @@ -378,7 +387,7 @@ make testinstall - Provide symbolic links to gac and gap from the bin directory, as required by some packages -* Sat Oct 20 2012 Peter Robinson 4.5.6-2 +* Sat Oct 20 2012 Peter Robinson - 4.5.6-2 - -m32/-m64 should come from RPM_OPT_FLAGS. Fix build issues on non x86 arches * Mon Sep 24 2012 Jerry James - 4.5.6-1 diff --git a/sources b/sources index ea45306..ab42140 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7fd7507031339d9b2893339aa06983b7 gap4r7p4_2014_02_20-01_21.tar.bz2 +e3cfd08c8ed09cc28314a7e6c40d06ab gap4r7p5_2014_05_24-20_02.tar.bz2