Author: qboosh Date: Tue Oct 9 20:44:38 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed build with lib64 - more verbose files
---- Files affected: SPECS: calc.spec (1.54 -> 1.55) ---- Diffs: ================================================================ Index: SPECS/calc.spec diff -u SPECS/calc.spec:1.54 SPECS/calc.spec:1.55 --- SPECS/calc.spec:1.54 Sat Sep 29 00:16:07 2007 +++ SPECS/calc.spec Tue Oct 9 22:44:33 2007 @@ -4,14 +4,14 @@ 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/ -BuildRequires: sed >= 4.0 BuildRequires: readline-devel >= 4.2 +BuildRequires: sed >= 4.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -31,7 +31,7 @@ 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 @@ -59,15 +59,13 @@ %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 \ + LIBDIR=%{_libdir} \ 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 @@ -81,16 +79,18 @@ %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 -%{_desktopdir}/*.desktop -%{_libdir}/lib*.so.*.* -%{_mandir}/man1/*.1* +%{_desktopdir}/calc.desktop +%{_mandir}/man1/calc.1* %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 %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -99,6 +99,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.55 2007/10/09 20:44:33 qboosh +- fixed build with lib64 +- more verbose files + Revision 1.54 2007/09/28 22:16:07 lisu - 2.12.2.1 - switch to shared libs (no static libraries) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/calc.spec?r1=1.54&r2=1.55&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
