Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

2 files changed, 39 insertions, 9 deletions

diff --git a/opensuse/arts/arts.changes b/opensuse/arts/arts.changes
index 66986d432..690c5f92d 100644
--- a/opensuse/arts/arts.changes
+++ b/opensuse/arts/arts.changes
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Sun Aug 21 02:15:14 UTC 2011 - rxu@lincomlinux.org
+
+- introduce devel-static subpackage
+  - libgsl.a is built as a static library
+  - there is no way to turn it off in build configuration
+  - it has not been tested whether removing it will trigger bad stuff
+
+-------------------------------------------------------------------
 Fri Aug 12 00:02:16 UTC 2011 - rxu@lincomlinux.org
 
 - replace provides tde-kdelibs in favor of tdelibs
diff --git a/opensuse/arts/arts.spec b/opensuse/arts/arts.spec
index 1e0bf03b4..b7fd43e5f 100644
--- a/opensuse/arts/arts.spec
+++ b/opensuse/arts/arts.spec
@@ -67,6 +67,22 @@ the GUI and synthesis.
 Authors:
 --------
     Stefan Westerfeld <stefan@space.twc.de>
+    
+%package devel-static
+License:        GPLv2+
+Summary:        Include Files and Libraries mandatory for Development.
+Group:          Development/Libraries/Other
+
+%description devel-static
+A modular software synthesizer that generates realtime audio streams,
+supports MIDI, is easily extendable, and uses CORBA for separation of
+the GUI and synthesis.
+
+
+
+Authors:
+--------
+    Stefan Westerfeld <stefan@space.twc.de>
 
 %package gmcop
 License:        GPLv2+
@@ -112,12 +128,15 @@ CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -DNDEBUG" CFLAGS="$CXXFLAGS" %cmake_tde -d bu
 %install
 %makeinstall_tde -d build
 %ifarch x86_64
-mkdir -p $RPM_BUILD_ROOT/%{_tde_libdir}
-ln -sf ../lib64/mcop $RPM_BUILD_ROOT/%{_tde_libdir}/mcop
+mkdir -p $RPM_BUILD_ROOT/%{_tde_prefix}/lib
+ln -sf ../lib64/mcop $RPM_BUILD_ROOT/%{_tde_prefix}/lib/mcop
 %endif
 mkdir -p -m 755 $RPM_BUILD_ROOT/%_mandir/man7
 cp %SOURCE1 $RPM_BUILD_ROOT/%_mandir/man7/
 
+# unneeded
+rm -rf %{buildroot}/%{_tde_libdir}/*.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -151,25 +170,28 @@ rm -rf $RPM_BUILD_ROOT
 %{_tde_libdir}/libmcop_mt.so.*
 %{_tde_libdir}/libqtmcop.so.*
 %{_tde_libdir}/libsoundserver_idl.so.*
-%{_tde_libdir}/libx11globalcomm.so.*
 # these need to be in the base package for lt_dlopen()
 %{_tde_libdir}/*.so
 %{_tde_libdir}/mcop
 %ifarch x86_64
-/opt/tde/lib
+%{_tde_prefix}/lib
 %endif
 %{_mandir}/man7/artswrapper.7.gz
 
-%files gmcop
-%defattr(-,root,root)
-%{_tde_libdir}/libgmcop.so.*
-
 %files devel
 %defattr(-,root,root)
 %{_tde_bindir}/artsc-config
 %{_tde_bindir}/mcopidl
 %dir %{_tde_includedir}
 %{_tde_includedir}/*
-%{_tde_libdir}/*.la
+%{_libdir}/pkgconfig/arts.pc
+
+%files devel-static
+%defattr(-,root,root)
+%{_tde_libdir}/libgsl.a
+
+%files gmcop
+%defattr(-,root,root)
+%{_tde_libdir}/libgmcop.so.*
 
 %changelog