rpms/seamonkey/FC-5 seamonkey-config.patch, NONE, 1.1 mozilla-redhat-default-prefs.js, 1.2, 1.3 seamonkey.spec, 1.19, 1.20

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Feb 13 10:46:32 UTC 2007 

Author: stransky

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

Modified Files:
	mozilla-redhat-default-prefs.js seamonkey.spec 
Added Files:
	seamonkey-config.patch 
Log Message:
fixed mozilla-rebuild-databases.pl script, fixed mozilla-config script, added a configuration from former extras seamonkey (#223848)

seamonkey-config.patch:
 build/unix/Makefile.in |   14 +++++++++++---
 config/autoconf.mk.in  |    6 +++---
 2 files changed, 14 insertions(+), 6 deletions(-)

--- NEW FILE seamonkey-config.patch ---
--- mozilla/config/autoconf.mk.in.old	2007-02-12 12:37:06.000000000 +0100
+++ mozilla/config/autoconf.mk.in	2007-02-12 12:37:06.000000000 +0100
@@ -56,13 +56,13 @@
 prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 bindir		= @bindir@
-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+includedir	= @includedir@/$(MOZ_PREFIX)$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 libdir		= @libdir@
 datadir		= @datadir@
 mandir		= @mandir@
-idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+idldir		= @datadir@/idl/$(MOZ_PREFIX)$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 
-mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+mozappdir	= $(libdir)/$(MOZ_PREFIX)$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
 mrelibdir	= $(mredir)/lib
 
--- mozilla/build/unix/Makefile.in.old	2005-07-07 20:24:39.000000000 +0200
+++ mozilla/build/unix/Makefile.in	2007-02-12 12:48:39.000000000 +0100
@@ -40,6 +40,9 @@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
+MOZ_PREFIX_APP  = "mozilla"
+MOZ_PREFIX	= "$(MOZ_PREFIX_APP)-"
+MOZ_DEV_VERSION = `../../config/milestone.pl --topsrcdir='../..'`
 
 include $(DEPTH)/config/autoconf.mk
 
@@ -69,7 +72,9 @@
 
 pkg_config_files=$(MOZ_APP_NAME)-nspr.pc $(MOZ_APP_NAME)-xpcom.pc \
 	$(MOZ_APP_NAME)-js.pc $(MOZ_APP_NAME)-gtkmozembed.pc \
-	$(MOZ_APP_NAME)-nss.pc $(MOZ_APP_NAME)-plugin.pc
+	$(MOZ_APP_NAME)-nss.pc $(MOZ_APP_NAME)-plugin.pc \
+	$(MOZ_PREFIX_APP)-nspr.pc $(MOZ_PREFIX_APP)-xpcom.pc $(MOZ_PREFIX_APP)-js.pc \
+	$(MOZ_PREFIX_APP)-gtkmozembed.pc $(MOZ_PREFIX_APP)-nss.pc $(MOZ_PREFIX_APP)-plugin.pc
 
 GARBAGE	= $(pkg_config_files) mozilla-config
 
@@ -80,7 +85,7 @@
 	-e "s|%includedir%|$(includedir)|" \
 	-e "s|%libdir%|$(mozappdir)|" \
 	-e "s|%idldir%|$(idldir)|" \
-	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
+	-e "s|%MOZILLA_VERSION%|$(MOZ_DEV_VERSION)|" \
 	-e "s|%DEFS%|$(_DEFS)|" \
 	-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
 	-e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" > $@
@@ -93,7 +98,7 @@
 	-e "s|%libdir%|$(mozappdir)|" \
 	-e "s|%idldir%|$(idldir)|" \
 	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
-	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
+	-e "s|%MOZILLA_VERSION%|$(MOZ_DEV_VERSION)|" \
 	-e "s|%SUPERWIN_LIBS%|$(SUPERWIN_LIBS)|" \
 	-e "s|%DEFS%|$(_DEFS)|" \
 	-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
@@ -101,6 +106,9 @@
 	-e "s|%NSPR_NAME%|$(NSPR_NAME)|" \
 	-e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" > $@
 
+$(MOZ_PREFIX_APP)-%.pc : $(MOZ_APP_NAME)-%.pc
+	cp $< $@
+
 libs:: $(MOZ_APP_NAME)-config
 	chmod 755 $<
 	$(INSTALL) -m 755 $< $(DIST)/bin


Index: mozilla-redhat-default-prefs.js
===================================================================
RCS file: /cvs/dist/rpms/seamonkey/FC-5/mozilla-redhat-default-prefs.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mozilla-redhat-default-prefs.js	3 Aug 2006 19:45:07 -0000	1.2
+++ mozilla-redhat-default-prefs.js	13 Feb 2007 10:46:30 -0000	1.3
@@ -1,4 +1,7 @@
 pref("app.update.enabled", false);
 pref("app.update.autoInstallEnabled", false);
-pref("general.useragent.vendor", "Red Hat");
+pref("update_notifications.enabled", false);
+pref("browser.display.use_system_colors",   true);
+pref("general.smoothScroll",                true);
+pref("general.useragent.vendor", "Fedora");
 pref("general.useragent.vendorSub", "MOZILLA_RPM_VR");


Index: seamonkey.spec
===================================================================
RCS file: /cvs/dist/rpms/seamonkey/FC-5/seamonkey.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- seamonkey.spec	7 Feb 2007 14:32:15 -0000	1.19
+++ seamonkey.spec	13 Feb 2007 10:46:30 -0000	1.20
@@ -35,6 +35,7 @@
 Patch3:         firefox-1.1-nss-system-nspr.patch
 Patch4:         firefox-1.5-with-system-nss.patch
 Patch5:      	seamonkey-disable-visibility.patch
+Patch6:     	seamonkey-config.patch
 
 Patch10000:     mozilla-seamonkey-app-name.patch
 Patch10007:     mozilla-redhat-home-page.patch
@@ -142,6 +143,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %patch10000 -p0
 
@@ -226,6 +228,8 @@
 	make install
 
 # Move stuff over
+%{__mv} ${RPM_BUILD_ROOT}%{mozdir}/run-mozilla.sh ${RPM_BUILD_ROOT}%{_libdir}/%{seamonkeyver}
+/bin/rm -rf ${RPM_BUILD_ROOT}%{mozdir}
 %{__mv} ${RPM_BUILD_ROOT}%{_libdir}/%{seamonkeyver} ${RPM_BUILD_ROOT}%{mozdir}
 %{__mv} ${RPM_BUILD_ROOT}%{mozdir}/seamonkey-bin ${RPM_BUILD_ROOT}%{mozdir}/mozilla-bin
 %{__mv} ${RPM_BUILD_ROOT}%{_includedir}/%{seamonkeyver} \
@@ -235,18 +239,8 @@
 %{__mv} ${RPM_BUILD_ROOT}%{_bindir}/seamonkey-config ${RPM_BUILD_ROOT}%{_bindir}/mozilla-config
 %{__mv} ${RPM_BUILD_ROOT}%{_datadir}/idl/%{seamonkeyver} \
         ${RPM_BUILD_ROOT}%{_datadir}/idl/mozilla-%{seamonkeyver}
-cd ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig
-  for i in *.pc; do
-    sed -i -e 's|%{_libdir}/seamonkey|%{_libdir}/mozilla-seamonkey|' \
-           -e 's|%{_includedir}/seamonkey|%{_includedir}/mozilla-seamonkey|' "${i}"
-    newfile="$(echo ${i} | sed s/^seamonkey-/mozilla-/)"
-    cp "${i}" "$newfile"
-    sed -i -e 's|Version: %{version}|Version: 1.8|' "$newfile"
-  done
-cd -
 
-# fix mozilla-config
-sed -i -e 's|/seamonkey|/mozilla-seamonkey|' ${RPM_BUILD_ROOT}%{_bindir}/mozilla-config
+
 
 # create a list of all of the different package and the files that
 # will hold them
@@ -801,9 +795,10 @@
 %changelog
 * Thu Jan 18 2007 Martin Stransky <stransky at redhat.com> 1.0.7-0.6.0.1
 - created a link in /usr/bin/seamonkey
-- added fix for #204139: mozilla-rebuild-databases.pl script called 
-  in %post has incorrect path
-- added fix for #204589: mozilla-config points to the wrong places
+- fixed mozilla-rebuild-databases.pl script, was called in %post 
+  with an incorrect path
+- fixed mozilla-config script
+- added a configuration from former extras seamonkey (#223848)
 
 * 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