Author: qboosh Date: Sat Mar 5 18:54:14 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed libdir in .pc - -devel R: OpenThreads-devel, X-devel
---- Files affected: SPECS: Producer.spec (1.12 -> 1.13) ---- Diffs: ================================================================ Index: SPECS/Producer.spec diff -u SPECS/Producer.spec:1.12 SPECS/Producer.spec:1.13 --- SPECS/Producer.spec:1.12 Fri Mar 4 22:03:48 2005 +++ SPECS/Producer.spec Sat Mar 5 19:54:09 2005 @@ -14,6 +14,7 @@ URL: http://www.andesengineering.com/Producer/index.html BuildRequires: OpenGL-devel BuildRequires: OpenThreads-devel +BuildRequires: XFree86-devel BuildRequires: libstdc++-devel Provides: OpenProducer = %{version} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -57,6 +58,8 @@ Summary(pl): Pliki programistyczne biblioteki Producer Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: OpenThreads-devel +Requires: XFree86-devel Requires: libstdc++-devel %description devel @@ -79,13 +82,13 @@ rm -rf $RPM_BUILD_ROOT %{__make} install \ - INST_LOCATION=$RPM_BUILD_ROOT%{_prefix} -if [ "%{_libdir}" == "%{_prefix}/lib64" ]; then - mv $RPM_BUILD_ROOT{%{_prefix}/lib,%{_libdir}} -fi + INST_LOCATION=$RPM_BUILD_ROOT%{_prefix} \ + INST_LIBS=$RPM_BUILD_ROOT%{_libdir} + ln -sf `basename $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so.*` $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so + install -d $RPM_BUILD_ROOT%{_pkgconfigdir} -install %{SOURCE1} $RPM_BUILD_ROOT%{_pkgconfigdir}/producer.pc +sed -e 's,^libdir=.*,libdir=%{_libdir},' %{SOURCE1} >$RPM_BUILD_ROOT%{_pkgconfigdir}/producer.pc %clean rm -rf $RPM_BUILD_ROOT @@ -95,7 +98,7 @@ %files %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/lib*.so.* +%attr(755,root,root) %{_libdir}/lib*.so.*.* %files devel %defattr(644,root,root,755) @@ -110,6 +113,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.13 2005/03/05 18:54:09 qboosh +- fixed libdir in .pc +- -devel R: OpenThreads-devel, X-devel + Revision 1.12 2005/03/04 21:03:48 sparky - added pkgconfig file ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/Producer.spec?r1=1.12&r2=1.13&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit