rpms/enlightenment/devel enlightenment.spec,1.9,1.10

[thomasj]

Author: thomasj

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

Modified Files:
	enlightenment.spec 
Log Message:
Some fixes to build proper on x86_64



Index: enlightenment.spec
===================================================================
RCS file: /cvs/pkgs/rpms/enlightenment/devel/enlightenment.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- enlightenment.spec	16 Feb 2010 11:20:13 -0000	1.9
+++ enlightenment.spec	18 Feb 2010 19:24:13 -0000	1.10
@@ -37,7 +37,10 @@ developing applications that use %{name}
 %setup -q
 # backport enlightenment.pc.in fix from trunk
 sed -i -e 's|Libs:\ .*$|Libs: -L${libdir}|' enlightenment.pc.in
-
+# Avoid lib64 rpaths
+%if "%{_libdir}" != "/usr/lib"
+sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
+%endif
 
 %build
 %configure --disable-static
@@ -57,10 +60,9 @@ rm -rf %{buildroot}%{_datadir}/%{name}/C
 # remove enlightenment_sys which is broken anyway
 rm -rf %{buildroot}%{_bindir}/%{name}_sys
 rm -rf %{buildroot}%{_sysconfdir}/%{name}/sysactions.conf
+# remove unused enlightenment_remote
+rm -rf %{buildroot}%{_bindir}/enlightenmen_remote
 %find_lang %{name}
-# It ignores --disable-rpath
-chrpath --delete %{buildroot}%{_bindir}/%{name}*
-chrpath --delete %{buildroot}%{_libdir}/%{name}/*/*/*
 
 %clean
 rm -rf %{buildroot}
@@ -80,9 +82,8 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 # originally improperly placed docs
 %doc doc/*.txt doc/*.html doc/*.png
-%{_bindir}/%{name}-config
 %{_includedir}/%{name}
-%{_libdir}/pkgconfig/%{name}.pc
+%{_libdir}/pkgconfig/*.pc
 
 
 %changelog