diff --git a/.cvsignore b/.cvsignore index ca68167..07e26fb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -boo-0.7.6.2237-src.tar.bz2 +boo-0.8.0.2730-src.zip diff --git a/boo-def.patch b/boo-def.patch new file mode 100644 index 0000000..9222922 --- /dev/null +++ b/boo-def.patch @@ -0,0 +1,11 @@ +--- boo-0.8.0.2730/default.build 2007-11-12 13:32:12.000000000 +0000 ++++ boo-0.8.0.2730/default.build-new 2007-11-12 13:33:00.000000000 +0000 +@@ -51,7 +51,7 @@ + + + +- ++ + + + diff --git a/boo-extras.patch b/boo-extras.patch new file mode 100644 index 0000000..e81171b --- /dev/null +++ b/boo-extras.patch @@ -0,0 +1,33 @@ +--- boo-0.8.0.2730/extras/booi.in 2007-11-12 12:42:37.000000000 +0000 ++++ boo-0.8.0.2730/extras/booi.in.new 2007-11-12 12:46:35.000000000 +0000 +@@ -1,6 +1,6 @@ + #!/bin/sh + if [ -x @prefix@/bin/cli ]; then +- env @prefix@/bin/cli $MONO_OPTIONS @prefix@/lib/boo/booi.exe "$@" ++ env @prefix@/bin/cli $MONO_OPTIONS ${libdir}/boo/booi.exe "$@" + else +- env @RUNTIME@ $MONO_OPTIONS @prefix@/lib/boo/booi.exe "$@" ++ env @RUNTIME@ $MONO_OPTIONS ${libdir}/boo/booi.exe "$@" + fi +--- boo-0.8.0.2730/extras/booc.in 2007-11-12 12:42:37.000000000 +0000 ++++ boo-0.8.0.2730/extras/booc.in.new 2007-11-12 12:45:40.000000000 +0000 +@@ -1,6 +1,6 @@ + #!/bin/sh + if [ -x @prefix@/bin/cli ]; then +- env @prefix@/bin/cli $MONO_OPTIONS @prefix@/lib/boo/booc.exe "$@" ++ env @prefix@/bin/cli $MONO_OPTIONS ${libdir}/boo/booc.exe "$@" + else +- env @RUNTIME@ $MONO_OPTIONS @prefix@/lib/boo/booc.exe "$@" ++ env @RUNTIME@ $MONO_OPTIONS ${libdir}/boo/booc.exe "$@" + fi +--- boo-0.8.0.2730/extras/booish.in 2007-11-12 12:42:37.000000000 +0000 ++++ boo-0.8.0.2730/extras/booish.in.new 2007-11-12 12:47:10.000000000 +0000 +@@ -1,6 +1,6 @@ + #!/bin/sh + if [ -x @prefix@/bin/cli ]; then +- env @prefix@/bin/cli $MONO_OPTIONS @prefix@/lib/boo/booish.exe "$@" ++ env @prefix@/bin/cli $MONO_OPTIONS ${libdir}/boo/booish.exe "$@" + else +- env @RUNTIME@ $MONO_OPTIONS @prefix@/lib/boo/booish.exe "$@" ++ env @RUNTIME@ $MONO_OPTIONS ${libdir}/boo/booish.exe "$@" + fi diff --git a/boo-libdir.patch b/boo-libdir.patch index 440a04c..70f493a 100644 --- a/boo-libdir.patch +++ b/boo-libdir.patch @@ -35,24 +35,6 @@ pkgconfig_DATA = boo.pc gtksourceviewdir = $(GTKSOURCEVIEW_PREFIX)/share/gtksourceview-1.0/language-specs/ ---- boo-0.7.6.2237/extras/booish.in 2005-08-12 18:43:45.000000000 +0100 -+++ boo-0.7.6.2237/extras/booish-new.in 2006-09-06 22:19:57.000000000 +0100 -@@ -1,2 +1,2 @@ - #!/bin/sh --env @RUNTIME@ @prefix@/lib/boo/booish.exe "$@" -+env @RUNTIME@ ${libdir}/boo/booish.exe "$@" ---- boo-0.7.6.2237/extras/booc.in 2005-08-12 18:43:45.000000000 +0100 -+++ boo-0.7.6.2237/extras/booc-new.in 2006-09-06 22:20:45.000000000 +0100 -@@ -1,2 +1,2 @@ - #!/bin/sh --env @RUNTIME@ @prefix@/lib/boo/booc.exe "$@" -+env @RUNTIME@ ${libdir}/boo/booc.exe "$@" ---- boo-0.7.6.2237/extras/booi.in 2005-08-12 18:43:45.000000000 +0100 -+++ boo-0.7.6.2237/extras/booi-new.in 2006-09-06 22:21:16.000000000 +0100 -@@ -1,2 +1,2 @@ - #!/bin/sh --env @RUNTIME@ @prefix@/lib/boo/booi.exe "$@" -+env @RUNTIME@ ${libdir}/boo/booi.exe "$@" --- boo-0.7.6.2237/default.build.libdir 2007-02-11 10:40:57.000000000 +0100 +++ boo-0.7.6.2237/default.build 2007-02-11 10:43:46.000000000 +0100 @@ -108,7 +108,7 @@ @@ -81,5 +63,6 @@ + - + + diff --git a/boo.spec b/boo.spec index ef1118c..f471877 100644 --- a/boo.spec +++ b/boo.spec @@ -1,19 +1,17 @@ -%if "%{?fedora}" == "5" -%define monodir %{_prefix}/lib -%else %define monodir %{_libdir} -%endif Summary: Boo is an OO statically typed language for CLI Name: boo -Version: 0.7.6.2237 -Release: 13%{?dist} +Version: 0.8.0.2730 +Release: 1%{?dist} License: MIT Group: Development/Languages BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://boo.codehaus.org -Source0: http://dist.codehaus.org/boo/distributions/%{name}-%{version}-src.tar.bz2 +Source0: http://dist.codehaus.org/boo/distributions/%{name}-%{version}-src.zip Patch0: boo-libdir.patch +Patch1: boo-extras.patch +Patch2: boo-def.patch BuildRequires: mono-devel, gtksourceview-devel, shared-mime-info, pkgconfig, nant %description @@ -30,13 +28,13 @@ Requires: %{name} = %{version}-%{release} Development files for boo %prep -%setup -q -%if "%{?fedora}" > "5" +%setup -q -c %patch0 -p1 -b .original +%patch1 -p1 -b .orig +%patch2 -p1 -b .orig sed -i -e 's!${libdir}!%{monodir}!' extras/booc.in sed -i -e 's!${libdir}!%{monodir}!' extras/booi.in sed -i -e 's!${libdir}!%{monodir}!' extras/booish.in -%endif %build nant -D:install.prefix=%{_prefix} -D:install.libdir=%{monodir} @@ -61,11 +59,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{monodir}/mono/boo/*.dll %{monodir}/mono/gac/Boo*/* %{_bindir}/boo* -%if "%{?fedora}" == "5" - %{_datadir}/gtksourceview-1.0/language-specs/boo.lang -%else - %exclude %{_datadir}/gtksourceview-1.0/language-specs/boo.lang -%endif +%exclude %{_datadir}/gtksourceview-1.0/language-specs/boo.lang %{_datadir}/mime/packages/boo* %{_datadir}/mime-info/boo* @@ -74,6 +68,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{monodir}/pkgconfig/boo.pc %changelog +* Sun Nov 11 2007 Paul F. Johnson 0.8.0-2730-1 +- large bump +- removed fc5 and fc6 bits + * Sun Feb 18 2007 Paul F. Johnson 0.7.6-2237-13 - fix for correct libdir in bin scripts diff --git a/sources b/sources index b21ee19..7f52cb3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9096b739651d7e9855ae088fd63a819c boo-0.7.6.2237-src.tar.bz2 +de53eea5ffab5f9c1209c1f7588ad5eb boo-0.8.0.2730-src.zip