RPM Packaging: update R14 packages

pull/3/head
François Andriot 11 years ago
parent c56eddf6d0
commit f71821dce5

@ -110,7 +110,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--enable-rpath \
--enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
%__make %{?_smp_mflags} || %__make
%install

@ -55,6 +55,8 @@ checknew() {
done
}
alias rr='rpm -qa --qf "%{name} %{buildhost}\n" | grep "\.vtf" | awk "{print \$1}"'
# Update main repository
alias tdu='(export GIT_ASKPASS=/bin/true; cd ~/tde/tde_r14; ./scripts/switch_all_submodules_to_head_and_clean)'

@ -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

@ -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"

Loading…
Cancel
Save