diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-08-06 22:56:45 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-08-06 22:56:45 +0200 |
| commit | 37a9aae98c5921e7c046912b04c9f5b576d3f4d0 (patch) | |
| tree | 6ed26f2d61c4d6f5e8e9eed40abe2b2fdd871d82 /redhat/tdemultimedia | |
| parent | 472a95e30a3c05be3faa1d42877bc2fb3a50d86b (diff) | |
| download | tde-packaging-37a9aae98c5921e7c046912b04c9f5b576d3f4d0.tar.gz tde-packaging-37a9aae98c5921e7c046912b04c9f5b576d3f4d0.zip | |
RPM Packaging: update lots of main packages
Diffstat (limited to 'redhat/tdemultimedia')
| -rw-r--r-- | redhat/tdemultimedia/tdemultimedia-14.0.0-ftbfs.patch | 11 | ||||
| -rw-r--r-- | redhat/tdemultimedia/tdemultimedia-14.0.0.spec | 6 |
2 files changed, 14 insertions, 3 deletions
diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0-ftbfs.patch b/redhat/tdemultimedia/tdemultimedia-14.0.0-ftbfs.patch index f7f1a21f4..3ca526523 100644 --- a/redhat/tdemultimedia/tdemultimedia-14.0.0-ftbfs.patch +++ b/redhat/tdemultimedia/tdemultimedia-14.0.0-ftbfs.patch @@ -9,3 +9,14 @@ libartsmodulescommon_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined +--- trinity-tdemultimedia-14.0.0~pre178+601a5c5f/arts/modules/synth/Makefile.am.ORI 2013-08-04 19:15:24.030530158 +0200 ++++ trinity-tdemultimedia-14.0.0~pre178+601a5c5f/arts/modules/synth/Makefile.am 2013-08-04 19:15:32.878625492 +0200 +@@ -31,7 +31,7 @@ + libartsmodulessynth_la_LIBADD = \ + $(top_builddir)/arts/runtime/libartsbuilder.la \ + $(top_builddir)/arts/midi/libartsmidi_idl.la \ +- -lartsflow -lartsgsl -lartsflow_idl -lmcop -lglib-2.0 ++ -lartsflow -lartsgsl -lartsflow_idl -lmcop -lglib-2.0 $(VORBIS_LIBS) $(VORBISFILE_LIBS) -lmad + + #libartsmodulessynth_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui_idl.la $(top_builddir)/arts/midi/libartsmidi_idl.la -lartsflow -lartsflow_idl -lmcop $(LIBDL) $(LIB_TDEUI) $(LIB_TDECORE) + libartsmodulessynth_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -lartsflow -lartsgsl -no-undefined diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec index 8a95f9f8a..a4a159e65 100644 --- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec +++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec @@ -56,7 +56,7 @@ Provides: trinity-kdemultimedia-extras-libs = %{version}-%{release} BuildRequires: autoconf automake libtool m4 BuildRequires: trinity-tqt3-devel >= 3.5.0 BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} %if "%{?_with_akode}" != "" @@ -1070,7 +1070,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : Summary: Development files for %{name}, aRts and noatun plugins Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: trinity-tdelibs-devel >= 3.5.13 +Requires: trinity-tdelibs-devel >= %{tde_version} Obsoletes: trinity-kdemultimedia-devel < %{version}-%{release} Provides: trinity-kdemultimedia-devel = %{version}-%{release} @@ -1173,7 +1173,7 @@ fi --enable-new-ldflags \ --enable-final \ --enable-closure \ - --disable-rpath \ + --enable-rpath \ --disable-gcc-hidden-visibility \ \ --with-extra-includes="%{_includedir}/cdda:%{_includedir}/cddb:%{tde_tdeincludedir}/arts:%{tde_includedir}/artsc" \ |