rpms/avidemux/devel avidemux.spec,1.23,1.24

[Stewart Adam]

Author: firewing

Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23936/devel

Modified Files:
	avidemux.spec 
Log Message:
* Sat Oct 10 2009 Stewart Adam <s.adam at diffingo.com> - 2.5.1-3.20091010svn
- Fix AVIDEMUX_INSTALL_PREFIX define so plugins can link correctly



Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- avidemux.spec	10 Oct 2009 06:52:13 -0000	1.23
+++ avidemux.spec	11 Oct 2009 05:20:00 -0000	1.24
@@ -2,7 +2,7 @@
 
 Name:           avidemux
 Version:        2.5.1
-Release:        2.20091010svn%{?dist}
+Release:        3.20091010svn%{?dist}
 Summary:        Graphical video editing and transcoding tool
 
 Group:          Applications/Multimedia
@@ -33,6 +33,7 @@
 Patch3:         avidemux-2.5-i18n.patch
 Patch4:         avidemux-2.5-libmpeg2enc-altivec.patch
 Patch5:         avidemux-2.5-checkfunction-includes.patch
+Patch6:         avidemux-2.5.1-tmplinktarget.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -170,6 +171,7 @@
 %patch3 -p1 -b .i18n
 %patch4 -p1 -b .altivec
 %patch5 -p1 -b .cfincludes
+%patch6 -p0 -b .tmplinktarget
 
 %build
 # Out of source build
@@ -179,8 +181,12 @@
        -DAVIDEMUX_CORECONFIG_DIR="%{_builddir}/avidemux-%{version}-20091010svn-r5371/build/config" \
        ..
 make %{?_smp_mflags}
+# Create the temp link directory manuall since otherwise it happens too early
+find %{_builddir}/avidemux-%{version}-20091010svn-r5371/build/avidemux -name '*.so*' | \
+     xargs ln -sft %{_builddir}/avidemux-%{version}-20091010svn-r5371/build/%{_lib}
+
 mkdir ../build_plugins && cd ../build_plugins
-%cmake -DAVIDEMUX_INSTALL_PREFIX=%{_prefix} \
+%cmake -DAVIDEMUX_INSTALL_PREFIX="%{_builddir}/avidemux-%{version}-20091010svn-r5371/build/" \
        -DAVIDEMUX_SOURCE_DIR="%{_builddir}/avidemux-%{version}-20091010svn-r5371" \
        -DAVIDEMUX_CORECONFIG_DIR="%{_builddir}/avidemux-%{version}-20091010svn-r5371/build/config" \
        ../plugins
@@ -247,6 +253,9 @@
 %{_includedir}/ADM_coreConfig.h
 
 %changelog
+* Sat Oct 10 2009 Stewart Adam <s.adam at diffingo.com> - 2.5.1-3.20091010svn
+- Fix AVIDEMUX_INSTALL_PREFIX define so plugins can link correctly
+
 * Sat Oct 10 2009 Stewart Adam <s.adam at diffingo.com> - 2.5.1-2.20091010svn
 - Update to 2.5.1 subversion r5371