diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-09-08 19:34:19 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-09-08 19:34:19 +0200 |
| commit | f71821dce526a309408845895014b4d311d9a57d (patch) | |
| tree | 4e2c9d5a7577bd88d05e6f81378cd0ab615aca7b /redhat/tdemultimedia | |
| parent | c56eddf6d066544f75355c5a999e1436f4aead78 (diff) | |
| download | tde-packaging-f71821dce526a309408845895014b4d311d9a57d.tar.gz tde-packaging-f71821dce526a309408845895014b4d311d9a57d.zip | |
RPM Packaging: update R14 packages
Diffstat (limited to 'redhat/tdemultimedia')
| -rw-r--r-- | redhat/tdemultimedia/tdemultimedia-14.0.0-ftbfs.patch | 22 | ||||
| -rw-r--r-- | redhat/tdemultimedia/tdemultimedia-14.0.0.spec | 2 |
2 files changed, 0 insertions, 24 deletions
diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0-ftbfs.patch b/redhat/tdemultimedia/tdemultimedia-14.0.0-ftbfs.patch deleted file mode 100644 index 3ca526523..000000000 --- a/redhat/tdemultimedia/tdemultimedia-14.0.0-ftbfs.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- trinity-tdemultimedia-14.0.0~pre177+d730f5a0/arts/modules/common/Makefile.am.ORI 2013-06-30 21:47:10.721105015 +0200 -+++ trinity-tdemultimedia-14.0.0~pre177+d730f5a0/arts/modules/common/Makefile.am 2013-06-30 21:48:05.280864583 +0200 -@@ -25,7 +25,7 @@ - $(top_builddir)/arts/gui/common/libartsgui_idl.la \ - $(top_builddir)/arts/midi/libartsmidi_idl.la \ - $(top_builddir)/arts/modules/synth/libartsmodulessynth.la \ -- -lartsflow -lartsflow_idl -lmcop $(LIB_TDECORE) $(LIB_QT) $(VORBISFILE_LIBS) -lgthread-2.0 -+ -lartsflow -lartsflow_idl -lmcop $(LIB_TDECORE) $(LIB_QT) $(VORBIS_LIBS) $(VORBISFILE_LIBS) -lgthread-2.0 -lmad - - 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 0b86f89ff..d1210121a 100644 --- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec +++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec @@ -41,7 +41,6 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz -Patch0: tdemultimedia-14.0.0-ftbfs.patch Obsoletes: trinity-kdemultimedia < %{version}-%{release} Provides: trinity-kdemultimedia = %{version}-%{release} @@ -1141,7 +1140,6 @@ noatun plugins. %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -%patch0 -p1 -b .ftbfs %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" |