Attachment 910517 Details for Bug 1108395 – EPEL6 fix

[patch] EPEL6 fix

netgen-epel.diff (text/plain), 6.21 KB, created by Dave Love on 2014-06-19 20:14:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Love

Created: 2014-06-19 20:14:00 UTC

Size: 6.21 KB

patch

obsolete

>Thu Jun 19 21:01:11 BST 2014  Dave Love <d.love@liverpool.ac.uk>
>  * EPEL6 port
>diff -rN -u old-rpmbuild/SOURCES/netgen-5.1_build.patch new-rpmbuild/SOURCES/netgen-5.1_build.patch
>--- old-rpmbuild/SOURCES/netgen-5.1_build.patch	2014-06-19 21:02:29.532121280 +0100
>+++ new-rpmbuild/SOURCES/netgen-5.1_build.patch	2014-06-19 21:02:29.541121210 +0100
>@@ -1,7 +1,7 @@
> diff -rupN netgen-5.1/configure.ac netgen-5.1-new/configure.ac
> --- netgen-5.1/configure.ac	2013-06-25 13:28:59.000000000 +0200
> +++ netgen-5.1-new/configure.ac	2014-06-13 17:43:14.000000000 +0200
>-@@ -1,11 +1,11 @@
>+@@ -1,10 +1,10 @@
>  AC_INIT([netgen],[5.1],[],[])
> -AM_INIT_AUTOMAKE([-Wall -Werror foreign])
> +AM_INIT_AUTOMAKE([-Wall foreign])
>@@ -10,8 +10,6 @@
>  
>  AC_PREFIX_DEFAULT(["/opt/netgen"])
>  
>--
>-+AM_PROG_AR
>  
>  
>  
>diff -rN -u old-rpmbuild/SPECS/netgen-mesher.spec new-rpmbuild/SPECS/netgen-mesher.spec
>--- old-rpmbuild/SPECS/netgen-mesher.spec	2014-06-19 21:02:29.531121288 +0100
>+++ new-rpmbuild/SPECS/netgen-mesher.spec	2014-06-19 21:02:29.573120960 +0100
>@@ -1,8 +1,15 @@
> %{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)}
> %{!?tcl_sitearch: %global tcl_sitearch %{_libdir}/tcl%{tcl_version}}
> 
>-# Define a macro for calling ../configure instead of ./configure
>-%global dconfigure %(printf %%s '%configure' | sed 's!\./configure!../configure!g')
>+%if 0%{?el6}
>+%global mpich mpich2
>+%global mpich_load %_mpich2_load
>+%global mpich_unload %_mpich2_unload
>+%else
>+%global mpich mpich
>+%global mpich_load %_mpich_load
>+%global mpich_unload %_mpich_unload
>+%endif
> 
> Name:           netgen-mesher
> Version:        5.1
>@@ -113,44 +120,51 @@
> 
> ###############################################################################
> 
>-%package        mpich
>-Summary:        Netgen compiled against mpich
>-BuildRequires:  mpich2-devel
>+%package        %{mpich}
>+Summary:        Netgen compiled against %{mpich}
>+BuildRequires:  %{mpich}-devel
> # Require explicitly for dir ownership and to guarantee the pickup of the right runtime
>-Requires:       mpich
>+Requires:       %{mpich}
> Requires:       %{name}-common = %{version}-%{release}
>-Requires:       %{name}-mpich-libs%{?_isa} = %{version}-%{release}
>+Requires:       %{name}-%{mpich}-libs%{?_isa} = %{version}-%{release}
> 
>-%description    mpich
>-Netgen compiled against mpich.
>+%description    %{mpich}
>+Netgen compiled against %{mpich}.
> 
>-%package        mpich-libs
>-Summary:        Netgen libraries compiled against mpich
>+%package        %{mpich}-libs
>+Summary:        Netgen libraries compiled against %{mpich}
> 
>-%description    mpich-libs
>-Netgen libraries compiled against mpich.
>+%description    %{mpich}-libs
>+Netgen libraries compiled against %{mpich}.
> 
>-%package        mpich-devel
>-Summary:        Development files for Netgen compiled against mpich
>+%package        %{mpich}-devel
>+Summary:        Development files for Netgen compiled against %{mpich}
> # Require explicitly for dir ownership
>-Requires:       mpich-devel
>-Requires:       %{name}-mpich%{?_isa} = %{version}-%{release}
>+Requires:       %{mpich}-devel
>+Requires:       %{name}-%{mpich}%{?_isa} = %{version}-%{release}
> 
>-%description    mpich-devel
>-Development files for Netgen compiled against mpich.
>+%description    %{mpich}-devel
>+Development files for Netgen compiled against %{mpich}.
> 
> ###############################################################################
> 
> %prep
>-%autosetup -p1 -n netgen-%{version}
>+%setup -q -n netgen-%{version}
>+%patch0  -p1
>+%patch1  -p1
>+%patch2  -p1
>+%patch3  -p1
>+%patch4  -p1
>+%patch5  -p1
> 
> 
> %build
> autoreconf -ifv
>+%global _configure ../configure
> ### serial version ###
> mkdir serial
> (cd serial
>-%dconfigure --enable-occ --with-togl=%{tcl_sitearch}/Togl1.7 --enable-jpeglib \
>+%configure --enable-occ --with-togl=%{tcl_sitearch}/Togl1.7 --enable-jpeglib \
>            --includedir=%{_includedir}/%{name} --datadir=%{_datadir}/%{name}
> #          --enable-ffmpeg
> # Fix unused-direct-shlib-dependency
>@@ -163,7 +177,7 @@
> export CXX=mpicxx
> mkdir openmpi
> (cd openmpi
>-%dconfigure --enable-occ --with-togl=%{tcl_sitearch}/Togl1.7 --enable-jpeglib --enable-parallel \
>+%configure --enable-occ --with-togl=%{tcl_sitearch}/Togl1.7 --enable-jpeglib --enable-parallel \
>            --bindir=$MPI_BIN --libdir=$MPI_LIB --includedir=$MPI_INCLUDE/%{name} --datadir=%{_datadir}/%{name}
> #          --enable-ffmpeg
> # Fix unused-direct-shlib-dependency
>@@ -173,18 +187,18 @@
> %{_openmpi_unload}
> 
> ### mpich version ###
>-%{_mpich_load}
>+%{mpich_load}
> export CXX=mpicxx
>-mkdir mpich
>-(cd mpich
>-%dconfigure --enable-occ --with-togl=%{tcl_sitearch}/Togl1.7 --enable-jpeglib --enable-parallel \
>+mkdir %{mpich}
>+(cd %{mpich}
>+%configure --enable-occ --with-togl=%{tcl_sitearch}/Togl1.7 --enable-jpeglib --enable-parallel \
>            --bindir=$MPI_BIN --libdir=$MPI_LIB --includedir=$MPI_INCLUDE/%{name} --datadir=%{_datadir}/%{name}
> #          --enable-ffmpeg
> # Fix unused-direct-shlib-dependency
> sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
> make %{?_smp_mflags}
> )
>-%{_mpich_unload}
>+%{mpich_unload}
> 
> 
> %install
>@@ -215,13 +229,13 @@
> %{_openmpi_unload}
> 
> ### mpich version ###
>-%{_mpich_load}
>-%make_install -C mpich
>+%{mpich_load}
>+%make_install -C %{mpich}
> %writepkgconfig
> # Avoid conflicts with netgen, remove data files (are correctly installed below)
> mv %{buildroot}/$MPI_BIN/netgen %{buildroot}/$MPI_BIN/%{name}
> rm -f %{buildroot}/$MPI_BIN/*.tcl rm -f %{buildroot}/$MPI_BIN/*.ocf
>-%{_mpich_unload}
>+%{mpich_unload}
> 
> ### serial version ###
> %make_install -C serial
>@@ -274,9 +288,9 @@
> %postun openmpi-libs -p /sbin/ldconfig
> 
> 
>-%post mpich-libs -p /sbin/ldconfig
>+%post %{mpich}-libs -p /sbin/ldconfig
> 
>-%postun mpich-libs -p /sbin/ldconfig
>+%postun %{mpich}-libs -p /sbin/ldconfig
> 
> 
> %files common
>@@ -311,16 +325,16 @@
> %{_libdir}/openmpi/lib/*.so
> %{_libdir}/openmpi/lib/pkgconfig/%{name}.pc
> 
>-%files mpich
>-%{_libdir}/mpich/bin/*
>+%files %{mpich}
>+%{_libdir}/%{mpich}/bin/*
> 
>-%files mpich-libs
>-%{_libdir}/mpich/lib/*.so.*
>+%files %{mpich}-libs
>+%{_libdir}/%{mpich}/lib/*.so.*
> 
>-%files mpich-devel
>-%{_includedir}/mpich*/%{name}
>-%{_libdir}/mpich/lib/*.so
>-%{_libdir}/mpich/lib/pkgconfig/%{name}.pc
>+%files %{mpich}-devel
>+%{_includedir}/%{mpich}*/%{name}
>+%{_libdir}/%{mpich}/lib/*.so
>+%{_libdir}/%{mpich}/lib/pkgconfig/%{name}.pc
> 
> 
> %changelog

Actions: View | Diff

Attachments on bug 1108395: 910517 | 915922 | 915923