rpms/firefox/devel firefox-mozconfig, 1.10, 1.11 firefox.spec, 1.216, 1.217

[Martin Stransky (stransky)]

Author: stransky

Update of /cvs/pkgs/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19289

Modified Files:
	firefox-mozconfig firefox.spec 
Log Message:
spec polishing


Index: firefox-mozconfig
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox-mozconfig,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- firefox-mozconfig	18 Dec 2007 14:33:32 -0000	1.10
+++ firefox-mozconfig	19 Dec 2007 11:50:34 -0000	1.11
@@ -10,8 +10,10 @@
 ac_add_options --with-pthreads
 ac_add_options --disable-tests
 ac_add_options --disable-debug
-ac_add_options --disable-installer
 ac_add_options --enable-optimize="$RPM_OPT_FLAGS"
+#ac_add_options --enable-debug
+#ac_add_options --disable-optimize
+ac_add_options --disable-installer
 ac_add_options --enable-xinerama
 ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --disable-xprint


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- firefox.spec	19 Dec 2007 11:13:08 -0000	1.216
+++ firefox.spec	19 Dec 2007 11:50:34 -0000	1.217
@@ -2,8 +2,8 @@
 %define default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
 %define desktop_file_utils_version 0.9
 
-%define internal_version	3.0b3pre
-%define mozappdir 		%{_libdir}/%{name}-%{internal_version}
+%define version_internal	3.0b3pre
+%define mozappdir 		%{_libdir}/%{name}-%{version_internal}
 
 %define official_branding 	0
 
@@ -129,7 +129,7 @@
 %define moz_make_flags %{?_smp_mflags}
 %endif
 
-INTERNAL_GECKO=%{internal_version}
+INTERNAL_GECKO=%{version_internal}
 MOZ_APP_DIR=%{_libdir}/%{name}-${INTERNAL_GECKO}
 
 export LDFLAGS="-Wl,-rpath,$MOZ_APP_DIR"
@@ -155,12 +155,12 @@
 
 # set up the firefox start script
 %{__rm} -rf $RPM_BUILD_ROOT%{_bindir}/firefox
-%{__cat} %{SOURCE21} | %{__sed} -e 's,FIREFOX_VERSION,%{internal_version},g' > \
+%{__cat} %{SOURCE21} | %{__sed} -e 's,FIREFOX_VERSION,%{version_internal},g' > \
   $RPM_BUILD_ROOT%{_bindir}/firefox
 %{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/firefox
 
 # set up our default preferences
-%{__cat} %{SOURCE12} | %{__sed} -e 's,FIREFOX_RPM_VR,%{internal_version}-%{release},g' > rh-default-prefs
+%{__cat} %{SOURCE12} | %{__sed} -e 's,FIREFOX_RPM_VR,%{version_internal}-%{release},g' > rh-default-prefs
 
 # set up our default homepage
 %{__cat} >> rh-default-prefs << EOF