Hey Neale, These look fine, please commit.
On Mon, Sep 29, 2014 at 5:14 PM, Neale Ferguson <nealefergu...@verizon.net> wrote: > A couple of changes needed in order to enable building on RHEL and CentOS > 6/7 - > > libgdiplus0: > > --- a/libgdiplus0.spec.in > +++ b/libgdiplus0.spec.in > @@ -16,14 +16,19 @@ Provides: libgdiplus > > BuildRequires: cairo-devel >= 1.6.4 > BuildRequires: fontconfig-devel > -BuildRequires: freetype2-devel > BuildRequires: giflib-devel > BuildRequires: glib2-devel > BuildRequires: libexif-devel > BuildRequires: libjpeg-devel > BuildRequires: libpng-devel > BuildRequires: libtiff-devel > +%if 0%{?suse_version} > BuildRequires: xorg-x11-libXrender-devel > +BuildRequires: freetype2-devel > +%else > +BuildRequires: libXrender-devel > +BuildRequires: freetype-devel > +%endif > > %description > This is part of the Mono project. It is required when using > > mono: > > --- a/mono-core.spec.in > +++ b/mono-core.spec.in > @@ -4,6 +4,9 @@ > > %ifnarch %ix86 x86_64 > %define llvm no > +%endif > + > +%ifnarch %ix86 x86_64 s390x > %define sgen no > %endif > > @@ -16,10 +19,14 @@ Version: @VERSION@ > Release: 0 > Source0: mono-%{version}.tar.bz2 > BuildRequires: bison > +%if 0%{?suse_version} > BuildRequires: fdupes > +BuildRequires: xorg-x11-libX11-devel > +%else > +BuildRequires: libX11-devel > +%endif > BuildRequires: gcc-c++ > BuildRequires: pkgconfig > -BuildRequires: xorg-x11-libX11-devel > BuildRequires: zlib-devel > %ifnarch ia64 > BuildRequires: valgrind-devel > @@ -48,7 +55,9 @@ Conflicts: banshee < 1.0 > Conflicts: f-spot < 0.4 > Conflicts: helix-banshee < 1.0 > Conflicts: mono-addins < 0.3.1 > +%if 0%{?suse_version} > Recommends: libgdiplus0 >= 2.6 > +%endif > %if %llvm == yes > Recommends: libmono-llvm0 = %{version}-%{release} > > +%endif > %if %llvm == yes > Recommends: libmono-llvm0 = %{version}-%{release} > %endif > @@ -92,6 +101,7 @@ export CFLAGS=" $RPM_OPT_FLAGS -fno-strict-aliasing" > export PATH=/opt/novell/llvm-mono/bin:$PATH > %endif > %configure \ > + --target=%{_host} \ > --with-sgen=%{sgen} \ > %if %llvm == yes > --enable-loadedllvm \ > @@ -104,6 +114,7 @@ export PATH=/opt/novell/llvm-mono/bin:$PATH > --with-moonlight=no > #make # We are not -jN safe! %{?jobs:-j%jobs} > # We are now ! > +make get-monolite-latest > make %{?_smp_mflags} > > %install > @@ -130,7 +141,9 @@ rm -f %buildroot%_prefix/lib/mono/2.0/cilc.exe* > ln -s . %buildroot%_prefix%_prefix > RPM_BUILD_ROOT=%buildroot%_prefix /usr/lib/rpm/brp-compress > rm %buildroot%_prefix%_prefix > +%if 0%{?suse_version} > %fdupes %buildroot%_prefix > +%endif > %find_lang mcs > > %clean > > > > _______________________________________________ > Mono-devel-list mailing list > Mono-devel-list@lists.ximian.com > http://lists.ximian.com/mailman/listinfo/mono-devel-list >
_______________________________________________ Mono-devel-list mailing list Mono-devel-list@lists.ximian.com http://lists.ximian.com/mailman/listinfo/mono-devel-list