SPECS (AC-branch): arts.spec - ahh, merge library_loader from HEAD
glen
glen at pld-linux.org
Thu Feb 14 10:56:03 CET 2008
Author: glen Date: Thu Feb 14 09:56:03 2008 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- ahh, merge library_loader from HEAD
---- Files affected:
SPECS:
arts.spec (1.129.2.13 -> 1.129.2.14)
---- Diffs:
================================================================
Index: SPECS/arts.spec
diff -u SPECS/arts.spec:1.129.2.13 SPECS/arts.spec:1.129.2.14
--- SPECS/arts.spec:1.129.2.13 Thu Feb 14 09:25:55 2008
+++ SPECS/arts.spec Thu Feb 14 10:55:58 2008
@@ -23,11 +23,14 @@
#Patch100: %{name}-branch.diff
Patch0: %{name}-libs.patch
Patch1: kde-ac260-lt.patch
+Patch2: %{name}-extension_loader.patch
URL: http://www.arts-project.org/
%{?with_alsa:BuildRequires: alsa-lib-devel}
BuildRequires: audiofile-devel
BuildRequires: autoconf
BuildRequires: automake
+BuildRequires: boost-filesystem-devel
+BuildRequires: boost-regex-devel
BuildRequires: docbook-dtd41-sgml
BuildRequires: docbook-utils >= 0.6.14
%{?with_esd:BuildRequires: esound-devel}
@@ -164,10 +167,15 @@
#%patch100 -p1
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+
+find . -type f -name '*.mcopclass' | xargs %{__sed} -i -e 's:\.la::'
%build
cp -f /usr/share/automake/config.sub admin
+
%{__make} -f admin/Makefile.common cvs
+
%configure \
%{!?with_nas:ac_cv_header_audio_audiolib_h=no} \
%if "%{_lib}" == "lib64"
@@ -190,8 +198,8 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-# it seems to be only (lt_)dlopened, nothing links with it - so not needed
-rm -f $RPM_BUILD_ROOT%{_libdir}/libx11globalcomm.so
+# remove unwanted boost deps from .la
+sed -i 's:-lboost_filesystem -lboost_regex::' $RPM_BUILD_ROOT%{_libdir}/*.la
%clean
rm -rf $RPM_BUILD_ROOT
@@ -216,39 +224,19 @@
%attr(755,root,root) %{_bindir}/artswrapper
# shared libraries
%attr(755,root,root) %{_libdir}/libartsc.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libartsc.so.0
%attr(755,root,root) %{_libdir}/libartsflow.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libartsflow.so.1
%attr(755,root,root) %{_libdir}/libartsflow_idl.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libartsflow_idl.so.1
%attr(755,root,root) %{_libdir}/libgmcop.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgmcop.so.1
%attr(755,root,root) %{_libdir}/libkmedia2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkmedia2.so.1
%attr(755,root,root) %{_libdir}/libkmedia2_idl.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkmedia2_idl.so.1
%attr(755,root,root) %{_libdir}/libmcop.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmcop.so.1
%attr(755,root,root) %{_libdir}/libmcop_mt.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmcop_mt.so.1
%attr(755,root,root) %{_libdir}/libsoundserver_idl.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsoundserver_idl.so.1
-# lt_dlopened modules (*.la needed)
%attr(755,root,root) %{_libdir}/libartscbackend.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libartscbackend.so.0
-%{_libdir}/libartscbackend.la
%attr(755,root,root) %{_libdir}/libartsdsp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libartsdsp.so.0
-%{_libdir}/libartsdsp.la
%attr(755,root,root) %{_libdir}/libartsdsp_st.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libartsdsp_st.so.0
-%{_libdir}/libartsdsp_st.la
%attr(755,root,root) %{_libdir}/libartsgslplayobject.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libartsgslplayobject.so.0
-%{_libdir}/libartsgslplayobject.la
%attr(755,root,root) %{_libdir}/libartswavplayobject.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libartswavplayobject.so.0
-%{_libdir}/libartswavplayobject.la
#
%{_libdir}/mcop
#%{_mandir}/man1/artscat.1*
@@ -262,59 +250,58 @@
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/mcopidl
+%{_includedir}/arts
+%exclude %{_includedir}/arts/qiomanager.h
+%{_libdir}/libartsflow.la
%attr(755,root,root) %{_libdir}/libartsflow.so
+%{_libdir}/libartsflow_idl.la
%attr(755,root,root) %{_libdir}/libartsflow_idl.so
+%{_libdir}/libartsgslplayobject.la
%attr(755,root,root) %{_libdir}/libartsgslplayobject.so
+%{_libdir}/libartswavplayobject.la
%attr(755,root,root) %{_libdir}/libartswavplayobject.so
-%attr(755,root,root) %{_libdir}/libgmcop.so
-%attr(755,root,root) %{_libdir}/libkmedia2.so
-%attr(755,root,root) %{_libdir}/libkmedia2_idl.so
-%attr(755,root,root) %{_libdir}/libmcop.so
-%attr(755,root,root) %{_libdir}/libmcop_mt.so
-%attr(755,root,root) %{_libdir}/libsoundserver_idl.so
-# shared libraries
-%{_libdir}/libartsflow.la
-%{_libdir}/libartsflow_idl.la
%{_libdir}/libgmcop.la
+%attr(755,root,root) %{_libdir}/libgmcop.so
%{_libdir}/libkmedia2.la
+%attr(755,root,root) %{_libdir}/libkmedia2.so
%{_libdir}/libkmedia2_idl.la
+%attr(755,root,root) %{_libdir}/libkmedia2_idl.so
%{_libdir}/libmcop.la
+%attr(755,root,root) %{_libdir}/libmcop.so
%{_libdir}/libmcop_mt.la
+%attr(755,root,root) %{_libdir}/libmcop_mt.so
%{_libdir}/libsoundserver_idl.la
-#
-%{_includedir}/arts
-%exclude %{_includedir}/arts/qiomanager.h
+%attr(755,root,root) %{_libdir}/libsoundserver_idl.so
#%{_mandir}/man1/mcopidl.1*
%files -n artsc-devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/artsc-config
+%{_includedir}/artsc
+%{_libdir}/libartsc.la
%attr(755,root,root) %{_libdir}/libartsc.so
+%{_libdir}/libartscbackend.la
%attr(755,root,root) %{_libdir}/libartscbackend.so
+%{_libdir}/libartsdsp.la
%attr(755,root,root) %{_libdir}/libartsdsp.so
+%{_libdir}/libartsdsp_st.la
%attr(755,root,root) %{_libdir}/libartsdsp_st.so
-%{_libdir}/libartsc.la
-%{_includedir}/artsc
#%{_mandir}/man1/artsc-config.1*
%files X11
%defattr(644,root,root,755)
-# lt_dlopened module (.la needed)
%attr(755,root,root) %{_libdir}/libx11globalcomm.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libx11globalcomm.so.1
-%{_libdir}/libx11globalcomm.la
%files qt
%defattr(644,root,root,755)
# shared library
%attr(755,root,root) %{_libdir}/libqtmcop.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libqtmcop.so.1
%files qt-devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libqtmcop.so
-%{_libdir}/libqtmcop.la
%{_includedir}/arts/qiomanager.h
+%{_libdir}/libqtmcop.la
+%attr(755,root,root) %{_libdir}/libqtmcop.so
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -322,6 +309,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.129.2.14 2008-02-14 09:55:58 glen
+- ahh, merge library_loader from HEAD
+
Revision 1.129.2.13 2008-02-14 08:25:55 glen
- update to 1.5.9, package ghost symlinks
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/arts.spec?r1=1.129.2.13&r2=1.129.2.14&f=u
More information about the pld-cvs-commit
mailing list