Author: glen Date: Tue Mar 23 23:02:24 2010 GMT Module: packages Tag: HEAD ---- Log message: - fix milestone, again; hopefully back where it was in 1.9.1
---- Files affected: packages/xulrunner: xulrunner.spec (1.142 -> 1.143) ---- Diffs: ================================================================ Index: packages/xulrunner/xulrunner.spec diff -u packages/xulrunner/xulrunner.spec:1.142 packages/xulrunner/xulrunner.spec:1.143 --- packages/xulrunner/xulrunner.spec:1.142 Tue Mar 23 18:47:36 2010 +++ packages/xulrunner/xulrunner.spec Wed Mar 24 00:02:15 2010 @@ -19,7 +19,7 @@ # convert firefox release number to platform version: 3.6 -> 1.9.2, 3.6.x -> 1.9.2.x %define xulrunner_main 1.9.2 -%define firefox_ver 3.6.2 +%define firefox_ver 3.6.2 %define xulrunner_ver %(v=%{firefox_ver}; echo %{xulrunner_main}${v#3.6}) # The actual sqlite version (see RHBZ#480989): @@ -194,7 +194,7 @@ %build -if [ "$(grep -E '^[0-9]\.' mozilla/config/milestone.txt)" != "%{xulrunner_ver}" ]; then +if [ "$(grep -E '^[0-9]\.' mozilla/config/milestone.txt)" != "%{version}" ]; then echo >&2 echo "Version %{version} does not match mozilla/config/milestone.txt!" >&2 echo >&2 @@ -333,7 +333,7 @@ DESTDIR=$RPM_BUILD_ROOT # act like xulrunner --register-global was run -mv $RPM_BUILD_ROOT/etc/gre.d/%{xulrunner_main}{.system,}.conf +mv $RPM_BUILD_ROOT/etc/gre.d/%{version}{.system,}.conf %browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins @@ -363,7 +363,7 @@ %attr(755,root,root) %{_libdir}/%{name}/xulrunner-bin %dir %{_sysconfdir}/gre.d -%{_sysconfdir}/gre.d/%{xulrunner_main}.conf +%{_sysconfdir}/gre.d/%{version}.conf # symlinks %{_libdir}/%{name}/chrome @@ -564,11 +564,14 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.143 2010/03/23 23:02:15 glen +- fix milestone, again; hopefully back where it was in 1.9.1 + Revision 1.142 2010/03/23 17:47:36 hawk - updated to 1.9.2.2 Revision 1.141 2010/02/16 08:37:48 arekm -Epoch2/rel4 +- Epoch2/rel4 Revision 1.140 2010/02/13 18:44:08 arekm - no endif ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner.spec?r1=1.142&r2=1.143&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit