rpms/k3d/devel k3d.spec,1.31,1.32

Denis Leroy denis at fedoraproject.org
Mon Mar 23 11:23:18 UTC 2009


Author: denis

Update of /cvs/pkgs/rpms/k3d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3490

Modified Files:
	k3d.spec 
Log Message:
A couple of build fixes


Index: k3d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3d/devel/k3d.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- k3d.spec	23 Mar 2009 07:29:14 -0000	1.31
+++ k3d.spec	23 Mar 2009 11:22:48 -0000	1.32
@@ -89,7 +89,7 @@
 # Since our cmake macro disables rpath, we need to set some temp
 # library paths as the build invokes some built binaries to generate
 # proxy files.
-export LD_LIBRARY_PATH=%{_builddir}/k3d-source-%{version}/b/lib:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=%{_builddir}/k3d-source-%{version}/b/lib:%{_builddir}/k3d-source-%{version}/b/lib64:$LD_LIBRARY_PATH
 echo LD_LIBRARY_PATH is $LD_LIBRARY_PATH
 make VERBOSE=1 %{?_smp_mflags}
 
@@ -101,8 +101,7 @@
 cd b
 make install DESTDIR=$RPM_BUILD_ROOT
 # Workaround for install bug
-cp lib/libk3dsdk-python-primitives.so $RPM_BUILD_ROOT%{_libdir}
-rm -fr $RPM_BUILD_ROOT%{_datadir}/k3d/locale/chef/LC_MESSAGES/k3d.mo
+rm -f $RPM_BUILD_ROOT%{_datadir}/k3d/locale/chef/LC_MESSAGES/k3d.mo
 # Remove fonts, we use Fedora-shipped fonts instead
 rm -fr $RPM_BUILD_ROOT${_datadir}/k3d/fonts
 




More information about the scm-commits mailing list