- cleanups, proper optflags, .so perms

Changed files:
    f2c.spec -> 1.2

diff --git a/f2c.spec b/f2c.spec
index f3349dd0ac3f6ea04ebc96bf5915aaf900e3e987..040e78a583a5e094484c334708e032758b25e5c4 100644 (file)
--- a/f2c.spec
+++ b/f2c.spec
@@ -21,17 +21,15 @@ files for calling Fortran routines from C.
 
 %description -l pl
 f2c s³u¿y do t³umaczenia kodu ¼ród³owego w Fortranie 77 na kod
-dj±c w wyniku pliki z kodem ¼ród³owym w C lub C++. Je¶li w wierszu
+daj±c w wyniku pliki z kodem ¼ród³owym w C lub C++. Je¶li w wierszu
 polecenia nie zostan± podane ¿adne pliki, f2c bêdzie oczekiwa³ kodu w
 Fortranie na standardowym wej¶ciu i pisa³ kod w C na standardowe
 wyj¶cie.
 
 f2c mo¿e równie¿ s³u¿yæ (z opcj± -P) do generowania plików
-nag³ówkowych ANSI C w celu wywo³ywania procedur Fortranowskich z C.
+nag³ówkowych ANSI C w celu wywo³ywania procedur fortranowskich z C.
 
 %prep
-rm -rf $RPM_BUILD_ROOT
-
 %setup -q
 %patch0 -p1
 
@@ -40,37 +38,43 @@ rm -rf $RPM_BUILD_ROOT
 MFLAG=-mieee
 %endif
 
-mkdir -p $RPM_BUILD_DIR/f2c-%{version}/libf2c/PIC
+mkdir -p libf2c/PIC
 
 cp -f libf2c/makefile.u libf2c/Makefile
 cp -f src/makefile.u src/Makefile
-make -C src RPM_OPT_FLAGS="$RPM_OPT_FLAGS" MFLAG="$MFLAG" f2c
-make -C libf2c RPM_OPT_FLAGS="$RPM_OPT_FLAGS" MFLAG="$MFLAG" 
+make -C src f2c \
+       RPM_OPT_FLAGS="%{rpmcflags}" \
+       MFLAG="$MFLAG"
+make -C libf2c \
+       RPM_OPT_FLAGS="%{rpmcflags}" \
+       MFLAG="$MFLAG" 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{_bindir} $RPM_BUILD_ROOT/%{_mandir}/man1 $RPM_BUILD_ROOT/%{_libdir} $RPM_BUILD_ROOT/%{_includedir} 
-install libf2c/libf2c.a $RPM_BUILD_ROOT/%{_libdir}
-install f2c.h $RPM_BUILD_ROOT/%{_includedir}
-install src/f2c $RPM_BUILD_ROOT/%{_bindir}
-install fc $RPM_BUILD_ROOT/%{_bindir}
-install src/f2c.1t $RPM_BUILD_ROOT/%{_mandir}/man1/f2c.1
-install libf2c/libf2c.so.0.22 $RPM_BUILD_ROOT/%{_libdir}
-ln -sf %{_libdir}/libf2c.so.0.22 $RPM_BUILD_ROOT/%{_libdir}libf2c.so
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_libdir},%{_includedir}}
+
+install libf2c/libf2c.a $RPM_BUILD_ROOT%{_libdir}
+install f2c.h $RPM_BUILD_ROOT%{_includedir}
+install src/f2c $RPM_BUILD_ROOT%{_bindir}
+install fc $RPM_BUILD_ROOT%{_bindir}
+install src/f2c.1t $RPM_BUILD_ROOT%{_mandir}/man1/f2c.1
+install libf2c/libf2c.so.0.22 $RPM_BUILD_ROOT%{_libdir}
+ln -sf libf2c.so.0.22 $RPM_BUILD_ROOT%{_libdir}/libf2c.so
 
-rm -rf $RPM_BUILD_ROOT/%{_prefix}/liblibf2c.so
+rm -rf $RPM_BUILD_ROOT%{_prefix}/liblibf2c.so
  
-%post  -p /sbin/ldconfig
+%clean
+rm -rf $RPM_BUILD_ROOT
 
+%post  -p /sbin/ldconfig
 %postun        -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
 %doc f2c.ps README permission disclaimer changes src/Notice
-%{_libdir}/*
-%{_includedir}/*
 %attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_libdir}/libf2c.so.*.*
+%attr(755,root,root) %{_libdir}/libf2c.so
+%{_libdir}/libf2c.a
+%{_includedir}/f2c.h
 %{_mandir}/*/*
-
-%clean
-rm -rf $RPM_BUILD_ROOT