Use %license and other small cleanups

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-08-27 17:34:05 -04:00
parent cf4f82ae37
commit 842456ff9d

View File

@ -88,7 +88,7 @@ Contains documentations, examples and man-pages for mpich
# so uncomment and undefine to NOT use # so uncomment and undefine to NOT use
%{!?opt_cc_cflags: %global opt_cc_cflags %{optflags}} %{!?opt_cc_cflags: %global opt_cc_cflags %{optflags}}
%{!?opt_fc_fflags: %global opt_fc_fflags %{optflags}} %{!?opt_fc_fflags: %global opt_fc_fflags %{optflags}}
#%{!?opt_fc_fflags: %global opt_fc_fflags %{optflags} -I%{_fmoddir}} #%%{!?opt_fc_fflags: %%global opt_fc_fflags %%{optflags} -I%%{_fmoddir}}
%{!?opt_f77_fflags: %global opt_f77_fflags %{optflags}} %{!?opt_f77_fflags: %global opt_f77_fflags %{optflags}}
%ifarch s390 %ifarch s390
@ -112,14 +112,13 @@ Contains documentations, examples and man-pages for mpich
%endif %endif
%prep %prep
%setup -q %autosetup -p0
%patch0 -p0 -b .modu
%build %build
%configure \ %configure \
--enable-sharedlibs=gcc \ --enable-sharedlibs=gcc \
--enable-shared \ --enable-shared \
--enable-static=no \ --enable-static=no \
--enable-lib-depend \ --enable-lib-depend \
--disable-rpath \ --disable-rpath \
--disable-silent-rules \ --disable-silent-rules \
@ -167,9 +166,13 @@ make DESTDIR=%{buildroot} install
# Install the module file # Install the module file
mkdir -p %{buildroot}%{_sysconfdir}/modulefiles/mpi mkdir -p %{buildroot}%{_sysconfdir}/modulefiles/mpi
mkdir -p %{buildroot}%{python_sitearch}/%{name} sed 's#%{_bindir}#%{_libdir}/%{name}/bin#;
cp -pr src/packaging/envmods/mpich.module %{buildroot}%{_sysconfdir}/modulefiles/mpi/%{name}-%{_arch} s#@LIBDIR@#%{_libdir}/%{name}#;
sed -i 's#'%{_bindir}'#'%{_libdir}/%{name}/bin'#;s#@LIBDIR@#'%{_libdir}/%{name}'#;s#@MPINAME@#%{name}#;s#@pysitearch@#'%{python_sitearch}'#;s#@ARCH@#'%{_arch}'#' %{buildroot}%{_sysconfdir}/modulefiles/mpi/%{name}-%{_arch} s#@MPINAME@#%{name}#;
s#@pysitearch@#%{python_sitearch}#;
s#@ARCH@#%{_arch}#' \
<src/packaging/envmods/mpich.module \
>%{buildroot}%{_sysconfdir}/modulefiles/mpi/%{name}-%{_arch}
mkdir -p %{buildroot}%{_sysconfdir}/profile.d mkdir -p %{buildroot}%{_sysconfdir}/profile.d
cat << EOF > %{buildroot}%{_sysconfdir}/profile.d/mpich-%{_arch}.sh cat << EOF > %{buildroot}%{_sysconfdir}/profile.d/mpich-%{_arch}.sh
@ -179,10 +182,11 @@ EOF
cp -p %{buildroot}%{_sysconfdir}/profile.d/mpich-%{_arch}.{sh,csh} cp -p %{buildroot}%{_sysconfdir}/profile.d/mpich-%{_arch}.{sh,csh}
# Install the RPM macros # Install the RPM macros
mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d install -pDm0644 %{SOURCE1} %{buildroot}%{_rpmconfigdir}/macros.d/macros.%{name}
cp -p %{SOURCE1} %{buildroot}%{_rpmconfigdir}/macros.d/macros.%{name}
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' mkdir -p %{buildroot}%{python_sitearch}/%{name}
find %{buildroot} -type f -name "*.la" -delete
%check %check
make check VERBOSE=1 make check VERBOSE=1
@ -192,7 +196,8 @@ make check VERBOSE=1
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%files %files
%doc CHANGES COPYRIGHT README README.envvar RELEASE_NOTES %license COPYRIGHT
%doc CHANGES README README.envvar RELEASE_NOTES
%dir %{_libdir}/%{name} %dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/lib %dir %{_libdir}/%{name}/lib
%dir %{_libdir}/%{name}/bin %dir %{_libdir}/%{name}/bin
@ -209,7 +214,7 @@ make check VERBOSE=1
%files devel %files devel
%{_includedir}/%{name}-%{_arch}/ %{_includedir}/%{name}-%{_arch}/
%{_libdir}/%{name}/lib/pkgconfig/ %{_libdir}/%{name}/lib/pkgconfig/
##%{_fmoddir}/%{name}/ ##%%{_fmoddir}/%%{name}/
%{_libdir}/%{name}/lib/*.so %{_libdir}/%{name}/lib/*.so
%{_rpmconfigdir}/macros.d/macros.%{name} %{_rpmconfigdir}/macros.d/macros.%{name}
@ -219,6 +224,9 @@ make check VERBOSE=1
%{_mandir}/%{name}/man3/ %{_mandir}/%{name}/man3/
%changelog %changelog
* Thu Aug 27 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.1.4-6
- Cleanups to the spec file
* Sun Jul 26 2015 Sandro Mani <manisandro@gmail.com> - 3.1.4-5 * Sun Jul 26 2015 Sandro Mani <manisandro@gmail.com> - 3.1.4-5
- Require, BuildRequire: rpm-mpi-hooks - Require, BuildRequire: rpm-mpi-hooks