diff --git a/.cvsignore b/.cvsignore index bb9a3cf..ff4a452 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -boo-0.9.1.3287-src.zip +boo-0.9.2.3383-src.zip diff --git a/boo-0.9.1.3287-src-libdir.patch b/boo-0.9.1.3287-src-libdir.patch deleted file mode 100644 index f7ab9ff..0000000 --- a/boo-0.9.1.3287-src-libdir.patch +++ /dev/null @@ -1,70 +0,0 @@ -# SourceFucker.pl: Fix hardcoded references to libdir -diff -uraN boo-0.9.1.3287-src.orig/bin/Makefile.am boo-0.9.1.3287-src/bin/Makefile.am ---- boo-0.9.1.3287-src.orig/bin/Makefile.am 2009-03-16 10:04:26.000000000 +0100 -+++ boo-0.9.1.3287-src/bin/Makefile.am 2009-08-02 16:22:47.496535586 +0200 -@@ -1,4 +1,4 @@ --boodir = $(prefix)/lib/boo -+boodir = $(libdir)/boo - boo_DATA = booc.exe booi.exe booish.exe booc.rsp booc.exe.config booi.exe.config booish.exe.config - - BOO_GAC_DLLS = Boo.Lang.dll \ -diff -uraN boo-0.9.1.3287-src.orig/configure.in.in boo-0.9.1.3287-src/configure.in.in ---- boo-0.9.1.3287-src.orig/configure.in.in 2008-04-21 14:59:38.000000000 +0200 -+++ boo-0.9.1.3287-src/configure.in.in 2009-08-02 16:22:40.161535208 +0200 -@@ -14,7 +14,7 @@ - - AC_PATH_PROG(GACUTIL, gacutil, no) - --GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(DESTDIR)/$(prefix)/lib' -+GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(DESTDIR)/$(libdir)' - AC_SUBST(GACUTIL_FLAGS) - - AC_OUTPUT([ -diff -uraN boo-0.9.1.3287-src.orig/extras/booc.in boo-0.9.1.3287-src/extras/booc.in ---- boo-0.9.1.3287-src.orig/extras/booc.in 2008-06-02 14:50:54.000000000 +0200 -+++ boo-0.9.1.3287-src/extras/booc.in 2009-08-02 16:22:40.550535135 +0200 -@@ -1,7 +1,7 @@ - #!/bin/sh - if [ -x @prefix@/bin/cli ]; then -- env @prefix@/bin/cli $MONO_OPTIONS @prefix@/lib/boo/booc.exe $BOOC_OPTIONS "$@" -+ env @prefix@/bin/cli $MONO_OPTIONS @libdir@/boo/booc.exe $BOOC_OPTIONS "$@" - else -- env @RUNTIME@ $MONO_OPTIONS @prefix@/lib/boo/booc.exe $BOOC_OPTIONS "$@" -+ env @RUNTIME@ $MONO_OPTIONS @libdir@/boo/booc.exe $BOOC_OPTIONS "$@" - fi - -diff -uraN boo-0.9.1.3287-src.orig/extras/booi.in boo-0.9.1.3287-src/extras/booi.in ---- boo-0.9.1.3287-src.orig/extras/booi.in 2008-06-02 14:50:54.000000000 +0200 -+++ boo-0.9.1.3287-src/extras/booi.in 2009-08-02 16:22:40.296535427 +0200 -@@ -1,7 +1,7 @@ - #!/bin/sh - if [ -x @prefix@/bin/cli ]; then -- env @prefix@/bin/cli $MONO_OPTIONS @prefix@/lib/boo/booi.exe $BOOI_OPTIONS "$@" -+ env @prefix@/bin/cli $MONO_OPTIONS @libdir@/boo/booi.exe $BOOI_OPTIONS "$@" - else -- env @RUNTIME@ $MONO_OPTIONS @prefix@/lib/boo/booi.exe $BOOI_OPTIONS "$@" -+ env @RUNTIME@ $MONO_OPTIONS @libdir@/boo/booi.exe $BOOI_OPTIONS "$@" - fi - -diff -uraN boo-0.9.1.3287-src.orig/extras/booish.in boo-0.9.1.3287-src/extras/booish.in ---- boo-0.9.1.3287-src.orig/extras/booish.in 2008-06-02 14:50:54.000000000 +0200 -+++ boo-0.9.1.3287-src/extras/booish.in 2009-08-02 16:22:40.285535245 +0200 -@@ -1,7 +1,7 @@ - #!/bin/sh - if [ -x @prefix@/bin/cli ]; then -- env @prefix@/bin/cli $MONO_OPTIONS @prefix@/lib/boo/booish.exe $BOOISH_OPTIONS "$@" -+ env @prefix@/bin/cli $MONO_OPTIONS @libdir@/boo/booish.exe $BOOISH_OPTIONS "$@" - else -- env @RUNTIME@ $MONO_OPTIONS @prefix@/lib/boo/booish.exe $BOOISH_OPTIONS "$@" -+ env @RUNTIME@ $MONO_OPTIONS @libdir@/boo/booish.exe $BOOISH_OPTIONS "$@" - fi - -diff -uraN boo-0.9.1.3287-src.orig/extras/Makefile.am boo-0.9.1.3287-src/extras/Makefile.am ---- boo-0.9.1.3287-src.orig/extras/Makefile.am 2008-04-21 14:59:18.000000000 +0200 -+++ boo-0.9.1.3287-src/extras/Makefile.am 2009-08-02 16:22:40.714535421 +0200 -@@ -1,4 +1,4 @@ --pkgconfigdir = $(prefix)/lib/pkgconfig -+pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = boo.pc - - gtksourceviewdir = $(GTKSOURCEVIEW_PREFIX)/share/gtksourceview-1.0/language-specs/ diff --git a/boo.spec b/boo.spec index 343a9c4..2929bbe 100644 --- a/boo.spec +++ b/boo.spec @@ -3,17 +3,15 @@ Summary: An OO statically typed language for CLI Name: boo -Version: 0.9.1.3287 -Release: 3%{?dist} +Version: 0.9.2.3383 +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.zip -# accepted in upstream -Patch0: boo-0.9.1.3287-src-libdir.patch -Patch1: boo-targets.patch -Patch2: boo-pkgconfig_path_fix.patch +Patch0: boo-targets.patch +Patch1: boo-pkgconfig_path_fix.patch BuildRequires: mono-devel, gtksourceview-devel, shared-mime-info, pkgconfig, nant ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha @@ -33,15 +31,15 @@ Development files for boo %prep %setup -q -c -%patch0 -p1 -b .libdir-original -%patch1 -p1 -b .targets-original -%patch2 -p1 -b .pc-original -#fix paths for executables +%patch0 -p1 -b .targets-original +%patch1 -p1 -b .pc-original 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 + # Fix libdir in boo.pc sed -i -e "s|\${prefix}/lib|%{_libdir}|" extras/boo.pc.in + # Get rid of prebuilt dll files rm -rf bin/*.dll bin/pt/*.dll @@ -78,11 +76,15 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{monodir}/pkgconfig/boo.pc %changelog +* Wed Sep 16 2009 Paul Lange - 0.9.2.3383-1 +- Update to boo 0.9.2 +- remove libdir patch + * Fri Aug 28 2009 Paul Lange - 0.9.1.3287-3 - Fix executable paths * Thu Aug 27 2009 Michel Salim - 0.9.1.3287-2 -- Fix libdir in boo.pc to use %%{_libdir} +- Fix libdir in boo.pc to use %{_libdir} - Summary no longer repeats package name * Sun Aug 02 2009 Paul Lange - 0.9.1.3287-1 diff --git a/sources b/sources index 6398f58..e45f475 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7fed4903a6015777fa4a589f0d0ea397 boo-0.9.1.3287-src.zip +0ba8853303f678795f7b51d00d98ac18 boo-0.9.2.3383-src.zip