rpms/emelfm2/devel emelfm2.spec,1.33,1.34
Christoph Wickert
cwickert at fedoraproject.org
Sun Mar 1 20:20:36 UTC 2009
Author: cwickert
Update of /cvs/pkgs/rpms/emelfm2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11703
Modified Files:
emelfm2.spec
Log Message:
fix x86_64 build error
Index: emelfm2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emelfm2/devel/emelfm2.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- emelfm2.spec 1 Mar 2009 17:53:53 -0000 1.33
+++ emelfm2.spec 1 Mar 2009 20:20:05 -0000 1.34
@@ -34,9 +34,6 @@
%setup -q
%patch0 -p0 -b .docdir
-# fix for x86_64 libs
-sed -i 's!$(PREFIX)/lib/$(TARGET)/$(LIBS)!$(PREFIX)/%{_lib}/$(TARGET)/$(LIBS)!' Makefile
-
# fix broken icon in emelfm2.desktop
sed -i 's!Icon=emelfm2!Icon=%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop
@@ -46,6 +43,7 @@
OPTIMIZE="${RPM_OPT_FLAGS}" \
CFLAGS="${RPM_OPT_FLAGS}" \
PREFIX="%{_prefix}" \
+ PLUGINS_DIR="%{_libdir}/%{name}/plugins"
DOCS_VERSION=1 \
WITH_TRANSPARENCY=1 \
WITH_KERNELFAM=1 \
@@ -59,8 +57,10 @@
%install
rm -rf $RPM_BUILD_ROOT
-make install DOCS_VERSION=1 PREFIX=$RPM_BUILD_ROOT%{_prefix}
-make install_i18n DOCS_VERSION=1 PREFIX=$RPM_BUILD_ROOT%{_prefix}
+make install install_i18n \
+ DOCS_VERSION=1 \
+ PREFIX=$RPM_BUILD_ROOT%{_prefix} \
+ PLUGINS_DIR="$RPM_BUILD_ROOT%{_libdir}/%{name}/plugins"
%find_lang %{name}
More information about the fedora-extras-commits
mailing list