- fixed build with lib64

- more verbose files

Changed files:
    calc.spec -> 1.55

diff --git a/calc.spec b/calc.spec
index 48fa108fdc4edb0705163947a9943d63884a4cda..dccb26f06301d95e15aab387868af357516d2bc1 100644 (file)
--- a/calc.spec
+++ b/calc.spec
@@ -3,14 +3,14 @@ Summary(pl.UTF-8):    Kalkulator operujący na liczbach z dowolną dokładnością
 Name:          calc
 Version:       2.12.2.1
 Release:       1
 Name:          calc
 Version:       2.12.2.1
 Release:       1

-License:       LGPL
+License:       LGPL v2.1

 Group:         Applications/Math
 Source0:       http://www.isthe.com/chongo/src/calc/%{name}-%{version}.tar.gz
 # Source0-md5: c399c7b7d71d756c5eaef77e414a732b
 Source1:       %{name}.desktop
 URL:           http://www.isthe.com/chongo/tech/comp/calc/
 Group:         Applications/Math
 Source0:       http://www.isthe.com/chongo/src/calc/%{name}-%{version}.tar.gz
 # Source0-md5: c399c7b7d71d756c5eaef77e414a732b
 Source1:       %{name}.desktop
 URL:           http://www.isthe.com/chongo/tech/comp/calc/

-BuildRequires: sed >= 4.0

 BuildRequires: readline-devel >= 4.2
 BuildRequires: readline-devel >= 4.2

+BuildRequires: sed >= 4.0

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description


@@ -30,7 +30,7 @@ matematycznych, programistycznych i funkcji wejścia/wyjścia
 Summary:       Calc header files and static libraries
 Summary(pl.UTF-8):     Pliki nagłówkowe i biblioteki statyczne Calca
 Group:         Development/Libraries
 Summary:       Calc header files and static libraries
 Summary(pl.UTF-8):     Pliki nagłówkowe i biblioteki statyczne Calca
 Group:         Development/Libraries

-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}

 Obsoletes:     calc-static
 
 %description devel
 Obsoletes:     calc-static
 
 %description devel


@@ -58,15 +58,13 @@ programach.
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT

-install -d $RPM_BUILD_ROOT%{_datadir}/calc/{cscript,custom,help} \
-       $RPM_BUILD_ROOT{%{_includedir},%{_mandir}/man1,%{_libdir}} \
-       $RPM_BUILD_ROOT{%{_bindir},%{_desktopdir}}

 
 %{__make} install \
 
 %{__make} install \

+       LIBDIR=%{_libdir} \

        T=$RPM_BUILD_ROOT \
        SCRIPTDIR=%{_datadir}/calc/cscript
 
        T=$RPM_BUILD_ROOT \
        SCRIPTDIR=%{_datadir}/calc/cscript
 

-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
+install -D %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop

 
 rm -f $RPM_BUILD_ROOT%{_datadir}/calc/README
 
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/calc/README
 


@@ -80,14 +78,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 # COPYING is not just LGPL text, only some explanations
 %doc BUGS CHANGES COPYING README
 %defattr(644,root,root,755)
 # COPYING is not just LGPL text, only some explanations
 %doc BUGS CHANGES COPYING README

-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/calc
+%attr(755,root,root) %{_libdir}/libcalc.so.*.*.*.*
+%attr(755,root,root) %{_libdir}/libcustcalc.so.*.*.*.*

 %{_datadir}/calc
 %{_datadir}/calc

-%{_desktopdir}/*.desktop
-%{_libdir}/lib*.so.*.*
-%{_mandir}/man1/*.1*
+%{_desktopdir}/calc.desktop
+%{_mandir}/man1/calc.1*

 
 %files devel
 %defattr(644,root,root,755)
 %doc LIBRARY
 
 %files devel
 %defattr(644,root,root,755)
 %doc LIBRARY

-%{_libdir}/lib*.so
+%attr(755,root,root) %{_libdir}/libcalc.so
+%attr(755,root,root) %{_libdir}/libcustcalc.so

 %{_includedir}/calc
 %{_includedir}/calc