rpms/seamonkey/FC-5 mozilla-rebuild-databases.pl.in, 1.1, 1.2 seamonkey.spec, 1.16, 1.17

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Jan 18 13:34:18 UTC 2007 

Author: stransky

Update of /cvs/dist/rpms/seamonkey/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv7310

Modified Files:
	mozilla-rebuild-databases.pl.in seamonkey.spec 
Log Message:
created a link in /usr/bin/seamonkey, added fix for #204139: mozilla-rebuild-databases.pl script


Index: mozilla-rebuild-databases.pl.in
===================================================================
RCS file: /cvs/dist/rpms/seamonkey/FC-5/mozilla-rebuild-databases.pl.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mozilla-rebuild-databases.pl.in	12 May 2006 21:18:25 -0000	1.1
+++ mozilla-rebuild-databases.pl.in	18 Jan 2007 13:34:16 -0000	1.2
@@ -7,27 +7,27 @@
 
 $timeout = 60;
 
-%{ENV}->{"MOZILLA_FIVE_HOME"}="LIBDIR/mozilla-MOZILLA_VERSION";
-%{ENV}->{"LD_LIBRARY_PATH"}="LIBDIR/mozilla-MOZILLA_VERSION";
+%{ENV}->{"MOZILLA_FIVE_HOME"}="LIBDIR/mozilla-seamonkey-MOZILLA_VERSION";
+%{ENV}->{"LD_LIBRARY_PATH"}="LIBDIR/mozilla-seamonkey-MOZILLA_VERSION";
 %{ENV}->{"MOZ_DISABLE_GNOME"}="1";
 
 umask 022;
 
-if ( -f "LIBDIR/mozilla-MOZILLA_VERSION/regxpcom" )
+if ( -f "LIBDIR/mozilla-seamonkey-MOZILLA_VERSION/regxpcom" )
 {
     # remove all of the old files
-    rmtree("LIBDIR/mozilla-MOZILLA_VERSION/chrome/overlayinfo");
-    unlink <LIBDIR/mozilla-MOZILLA_VERSION/chrome/*.rdf>;
-    unlink("LIBDIR/mozilla-MOZILLA_VERSION/component.reg");
-    unlink("LIBDIR/mozilla-MOZILLA_VERSION/components/compreg.dat");
-    unlink("LIBDIR/mozilla-MOZILLA_VERSION/components/xpti.dat");
+    rmtree("LIBDIR/mozilla-seamonkey-MOZILLA_VERSION/chrome/overlayinfo");
+    unlink <LIBDIR/mozilla-seamonkey-MOZILLA_VERSION/chrome/*.rdf>;
+    unlink("LIBDIR/mozilla-seamonkey-MOZILLA_VERSION/component.reg");
+    unlink("LIBDIR/mozilla-seamonkey-MOZILLA_VERSION/components/compreg.dat");
+    unlink("LIBDIR/mozilla-seamonkey-MOZILLA_VERSION/components/xpti.dat");
 
     # create a new clean path
-    mkpath("LIBDIR/mozilla-MOZILLA_VERSION/chrome/overlayinfo");
+    mkpath("LIBDIR/mozilla-seamonkey-MOZILLA_VERSION/chrome/overlayinfo");
 
     # rebuild the installed-chrome.txt file from the installed
     # languages
-    if ( -f "LIBDIR/mozilla-MOZILLA_VERSION/chrome/lang/installed-chrome.txt" ) {
+    if ( -f "LIBDIR/mozilla-seamonkey-MOZILLA_VERSION/chrome/lang/installed-chrome.txt" ) {
 	rebuild_lang_files();
     }
 
@@ -36,7 +36,7 @@
 
     # I am the child.
     if ($pid == 0) {
-	exec("LIBDIR/mozilla-MOZILLA_VERSION/regxpcom > /dev/null 2> /dev/null");
+	exec("LIBDIR/mozilla-seamonkey-MOZILLA_VERSION/regxpcom > /dev/null 2> /dev/null");
     }
     # I am the parent.
     else {
@@ -60,7 +60,7 @@
 
     # I am the child.
     if ($pid == 0) {
-	exec("LIBDIR/mozilla-MOZILLA_VERSION/regchrome > /dev/null 2> /dev/null");
+	exec("LIBDIR/mozilla-seamonkey-MOZILLA_VERSION/regchrome > /dev/null 2> /dev/null");
     }
     # I am the parent.
     else {
@@ -83,18 +83,18 @@
 
 
 sub rebuild_lang_files {
-    unlink("LIBDIR/mozilla-MOZILLA_VERSION/chrome/installed-chrome.txt");
+    unlink("LIBDIR/mozilla-seamonkey-MOZILLA_VERSION/chrome/installed-chrome.txt");
 
-    open (OUTPUT, "+>", "LIBDIR/mozilla-MOZILLA_VERSION/chrome/installed-chrome.txt")||
+    open (OUTPUT, "+>", "LIBDIR/mozilla-seamonkey-MOZILLA_VERSION/chrome/installed-chrome.txt")||
 	die("Failed to open installed-chrome.txt: $!\n");
 
-    copy("LIBDIR/mozilla-MOZILLA_VERSION/chrome/lang/installed-chrome.txt",
+    copy("LIBDIR/mozilla-seamonkey-MOZILLA_VERSION/chrome/lang/installed-chrome.txt",
 	 \*OUTPUT);
 
-    foreach (bsd_glob("LIBDIR/mozilla-MOZILLA_VERSION/chrome/lang/lang-*.txt")) {
+    foreach (bsd_glob("LIBDIR/mozilla-seamonkey-MOZILLA_VERSION/chrome/lang/lang-*.txt")) {
 	copy($_, \*OUTPUT);
     }
 
-    copy("LIBDIR/mozilla-MOZILLA_VERSION/chrome/lang/default.txt",
+    copy("LIBDIR/mozilla-seamonkey-MOZILLA_VERSION/chrome/lang/default.txt",
 	 \*OUTPUT);
 }


Index: seamonkey.spec
===================================================================
RCS file: /cvs/dist/rpms/seamonkey/FC-5/seamonkey.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- seamonkey.spec	4 Jan 2007 10:00:09 -0000	1.16
+++ seamonkey.spec	18 Jan 2007 13:34:16 -0000	1.17
@@ -15,7 +15,7 @@
 Name:        seamonkey
 Summary:     Web browser and mail reader
 Version:     1.0.7
-Release:     0.6%{?dist}
+Release:     0.7%{?dist}
 License:     MPL/NPL/GPL/LGPL
 Source0:     seamonkey-%{version}.source.tar.bz2
 Source1:     mozilla.sh.in
@@ -76,7 +76,7 @@
 %endif
 
 %description
-Mozilla is an open-source web browser, designed for standards
+SeaMonkey (former Mozilla) is an open-source web browser, designed for standards
 compliance, performance and portability.
 
 %package devel
@@ -89,7 +89,7 @@
 Obsoletes: mozilla-devel
 
 %description devel
-Development header files for mozilla.
+Development header files for SeaMonkey (mozilla).
 
 %package mail
 Summary: Mozilla-based mail system
@@ -99,7 +99,7 @@
 Obsoletes: mozilla-mail
 
 %description mail
-Mail/news client based on the Mozilla web browser.  The mail/news
+Mail/news client based on the SeaMonkey (former Mozilla) web browser.  The mail/news
 client supports IMAP, POP, and NNTP and has an easy to use interface.
 
 %package chat
@@ -110,7 +110,7 @@
 Obsoletes: mozilla-chat
 
 %description chat
-IRC client that is integrated with the Mozilla web browser.
+IRC client that is integrated with the SeaMonkey (former Mozilla) web browser.
 
 %package js-debugger
 Summary: JavaScript debugger for use with Mozilla
@@ -120,7 +120,7 @@
 Obsoletes: mozilla-js-debugger
 
 %description js-debugger
-JavaScript debugger for use with Mozilla.
+JavaScript debugger for use with SeaMonkey (former Mozilla).
 
 %package dom-inspector
 Summary: A tool for inspecting the DOM of pages in Mozilla.
@@ -131,7 +131,7 @@
 
 %description dom-inspector
 This is a tool that allows you to inspect the DOM for web pages in
-Mozilla.  This is of great use to people who are doing Mozilla chrome
+SeaMonkey (former Mozilla).  This is of great use to people who are doing seamonkey chrome
 development or web page development.
 
 
@@ -531,6 +531,9 @@
 echo GRE_PATH=%{_libdir}/mozilla-%{seamonkeyver} >> \
   $RPM_BUILD_ROOT/etc/gre.d/%{gre_conf_file}
 
+# create a symlink for seamonkey
+ln -s mozilla $RPM_BUILD_ROOT/%{_bindir}/seamonkey
+
 %clean
 /bin/rm -rf $RPM_BUILD_ROOT
 
@@ -645,6 +648,7 @@
 %files -f mozilla.list
 %defattr(-,root,root)
 %{_prefix}/bin/mozilla
+%{_prefix}/bin/seamonkey
 %{mozdir}/mozilla-bin
 %{mozdir}/mozilla-rebuild-databases.pl
 /etc/gre.d/%{gre_conf_file}
@@ -792,6 +796,11 @@
 %{mozdir}/xpt_link
 
 %changelog
+* Thu Jan 18 2007 Martin Stransky <stransky at redhat.com> 1.0.7-0.7
+- created a link in /usr/bin/seamonkey
+- added fix for #204139: mozilla-rebuild-databases.pl script called 
+  in %post has incorrect path
+
 * Thu Jan 4 2007 Martin Stransky <stransky at redhat.com> 1.0.7-0.6
 - Release bump

More information about the fedora-cvs-commits mailing list