Author: glen Date: Sun Apr 4 18:23:49 2010 GMT Module: packages Tag: HEAD ---- Log message: - fix files move order, all seems bueno from here
---- Files affected: packages/ice: ice.spec (1.13 -> 1.14) ---- Diffs: ================================================================ Index: packages/ice/ice.spec diff -u packages/ice/ice.spec:1.13 packages/ice/ice.spec:1.14 --- packages/ice/ice.spec:1.13 Sun Apr 4 19:49:42 2010 +++ packages/ice/ice.spec Sun Apr 4 20:23:43 2010 @@ -17,7 +17,7 @@ Summary: The Ice base runtime and services Name: ice Version: 3.4.0 -Release: 0.5 +Release: 0.6 License: GPL v2 with exceptions (see ICE_LICENSE) Group: Applications URL: http://www.zeroc.com/ @@ -251,21 +251,11 @@ 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 -# There are a couple of files that end up installed in /lib, not %{_libdir}, -# so we try this move too. -mv $RPM_BUILD_ROOT/%{_lib}/* $RPM_BUILD_ROOT%{_libdir} -mv $RPM_BUILD_ROOT/lib/* $RPM_BUILD_ROOT%{_libdir} || : mv $RPM_BUILD_ROOT/config/* $RPM_BUILD_ROOT%{_datadir}/Ice -mv $RPM_BUILD_ROOT/slice $RPM_BUILD_ROOT%{_datadir}/Ice - -# Move the license files into the documentation directory -mv $RPM_BUILD_ROOT/ICE_LICENSE $RPM_BUILD_ROOT%{_docdir}/Ice-%{version}/ICE_LICENSE -mv $RPM_BUILD_ROOT/LICENSE $RPM_BUILD_ROOT%{_docdir}/Ice-%{version}/LICENSE -# Copy in the other files too -cp CHANGES RELEASE_NOTES $RPM_BUILD_ROOT%{_docdir}/Ice-%{version} # Copy the man pages into the correct directory install -d $RPM_BUILD_ROOT%{_mandir}/man1 @@ -346,6 +336,15 @@ mv $RPM_BUILD_ROOT/php/* $RPM_BUILD_ROOT%{php_data_dir} %endif +# move as last, bindings reinstall these if missing +mv $RPM_BUILD_ROOT/slice $RPM_BUILD_ROOT%{_datadir}/Ice + +# Move the license files into the documentation directory +mv $RPM_BUILD_ROOT/ICE_LICENSE $RPM_BUILD_ROOT%{_docdir}/Ice-%{version}/ICE_LICENSE +mv $RPM_BUILD_ROOT/LICENSE $RPM_BUILD_ROOT%{_docdir}/Ice-%{version}/LICENSE +# Copy in the other files too +cp CHANGES RELEASE_NOTES $RPM_BUILD_ROOT%{_docdir}/Ice-%{version} + # Install the servers install -d $RPM_BUILD_ROOT%{_sysconfdir} cp -a Ice-rpmbuild-%{version}/*.conf $RPM_BUILD_ROOT%{_sysconfdir} @@ -606,6 +605,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.14 2010/04/04 18:23:43 glen +- fix files move order, all seems bueno from here + Revision 1.13 2010/04/04 17:49:42 glen - fix without gui build ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ice/ice.spec?r1=1.13&r2=1.14&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
