packages: ice/ice.spec - move ImportKey.class earlier, more shebang fixes
glen
glen at pld-linux.org
Mon Apr 5 09:28:58 CEST 2010
Author: glen Date: Mon Apr 5 07:28:58 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- move ImportKey.class earlier, more shebang fixes
---- Files affected:
packages/ice:
ice.spec (1.19 -> 1.20)
---- Diffs:
================================================================
Index: packages/ice/ice.spec
diff -u packages/ice/ice.spec:1.19 packages/ice/ice.spec:1.20
--- packages/ice/ice.spec:1.19 Mon Apr 5 08:16:15 2010
+++ packages/ice/ice.spec Mon Apr 5 09:28:53 2010
@@ -172,6 +172,8 @@
done
cd -
+%{__sed} -i -e '1s,/usr/bin/env python,%{__python},' cpp/src/ca/iceca
+
%if %{with java}
# we nuke it only when we build new class later, as ice build system expects the file being around
rm cpp/src/ca/ImportKey.class
@@ -263,11 +265,12 @@
%{__make} -C cpp install \
prefix=$RPM_BUILD_ROOT
+# Move the ImportKey.class file
+mv $RPM_BUILD_ROOT/lib/ImportKey.class $RPM_BUILD_ROOT%{_datadir}/Ice
+
mv $RPM_BUILD_ROOT/bin/* $RPM_BUILD_ROOT%{_bindir}
mv $RPM_BUILD_ROOT/include/* $RPM_BUILD_ROOT%{_includedir}
mv $RPM_BUILD_ROOT/%{_lib}/* $RPM_BUILD_ROOT%{_libdir}
-# Move the ImportKey.class file
-mv $RPM_BUILD_ROOT/lib/ImportKey.class $RPM_BUILD_ROOT%{_datadir}/Ice
mv $RPM_BUILD_ROOT/config/* $RPM_BUILD_ROOT%{_datadir}/Ice
@@ -626,6 +629,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.20 2010/04/05 07:28:53 glen
+- move ImportKey.class earlier, more shebang fixes
+
Revision 1.19 2010/04/05 06:16:15 glen
- typo
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ice/ice.spec?r1=1.19&r2=1.20&f=u
More information about the pld-cvs-commit
mailing list