Author: qboosh Date: Thu Feb 2 15:09:21 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- install updates
---- Files affected:
SPECS:
seamonkey.spec (1.7 -> 1.8)
---- Diffs:
================================================================
Index: SPECS/seamonkey.spec
diff -u SPECS/seamonkey.spec:1.7 SPECS/seamonkey.spec:1.8
--- SPECS/seamonkey.spec:1.7 Wed Feb 1 21:15:01 2006
+++ SPECS/seamonkey.spec Thu Feb 2 16:09:15 2006
@@ -283,8 +283,6 @@
rm -fr
dist/bin/chrome/{US,chatzilla,classic,comm,content-packs,cview,embed,embed-sample,en-US,en-mac,en-unix,en-win,help,inspector,messenger,modern,pipnss,pippki,toolkit,venkman,xmlterm}
# non-unix
rm -f dist/bin/chrome/en-{mac,win}.jar
-echo "skin,install,select,classic/1.0" >> dist/bin/chrome/installed-chrome.txt
-echo "locale,install,select,en-US" >> dist/bin/chrome/installed-chrome.txt
# creating and installing register
LD_LIBRARY_PATH="dist/bin" MOZILLA_FIVE_HOME="dist/bin" dist/bin/regxpcom
@@ -314,55 +312,50 @@
ln -s %{_libdir}/libnssckbi.so $RPM_BUILD_ROOT%{_libdir}/%{name}/libnssckbi.so
for f in build/unix/*.pc ; do
- sed -e 's/mozilla-%{version}/mozilla/' $f \
+ sed -e 's/seamonkey-%{version}/seamonkey/' $f \
> $RPM_BUILD_ROOT%{_pkgconfigdir}/$(basename $f)
done
-sed -e 's,lib/mozilla-%{version},lib,g;s/mozilla-%{version}/mozilla/g'
build/unix/mozilla-gtkmozembed.pc \
- > $RPM_BUILD_ROOT%{_pkgconfigdir}/mozilla-gtkmozembed.pc
-
-sed -i -e 's#mozilla-nspr =.*#mozilla-nspr#g' -e 's#mozilla-nss
=.*#mozilla-nss#g' $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc
+sed -e 's,lib/seamonkey-%{version},lib,g;s/seamonkey-%{version}/seamonkey/g'
build/unix/seamonkey-gtkmozembed.pc \
+ > $RPM_BUILD_ROOT%{_pkgconfigdir}/seamonkey-gtkmozembed.pc
# add includir/dom to Cflags, for openvrml.spec, perhaps others
-sed -i -e '/Cflags:/{/{includedir}\/dom/!s,$, -I${includedir}/dom,}'
$RPM_BUILD_ROOT%{_pkgconfigdir}/mozilla-plugin.pc
+sed -i -e '/Cflags:/{/{includedir}\/dom/!s,$, -I${includedir}/dom,}'
$RPM_BUILD_ROOT%{_pkgconfigdir}/seamonkey-plugin.pc
-rm -f $RPM_BUILD_ROOT%{_pkgconfigdir}/mozilla-nss.pc
$RPM_BUILD_ROOT%{_pkgconfigdir}/mozilla-nspr.pc
+rm -f $RPM_BUILD_ROOT%{_pkgconfigdir}/seamonkey-nss.pc
$RPM_BUILD_ROOT%{_pkgconfigdir}/seamonkey-nspr.pc
-install %{SOURCE1} %{SOURCE3} %{SOURCE5} %{SOURCE6} %{SOURCE7} \
- %{SOURCE9} %{SOURCE10} $RPM_BUILD_ROOT%{_desktopdir}
+#install %{SOURCE1} %{SOURCE3} %{SOURCE5} %{SOURCE6} %{SOURCE7} \
+# %{SOURCE9} %{SOURCE10} $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
+#install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
-install dist/bin/mozilla-bin $RPM_BUILD_ROOT%{_bindir}
+install dist/bin/seamonkey-bin $RPM_BUILD_ROOT%{_bindir}
install dist/bin/regchrome $RPM_BUILD_ROOT%{_bindir}
install dist/bin/regxpcom $RPM_BUILD_ROOT%{_bindir}
install dist/bin/xpidl $RPM_BUILD_ROOT%{_bindir}
-cp $RPM_BUILD_ROOT%{_chromedir}/installed-chrome.txt \
- $RPM_BUILD_ROOT%{_chromedir}/%{name}-installed-chrome.txt
-
-cat << 'EOF' > $RPM_BUILD_ROOT%{_bindir}/mozilla
+cat << 'EOF' > $RPM_BUILD_ROOT%{_bindir}/seamonkey
#!/bin/sh
# (c) vip at linux.pl, wolf at pld-linux.org
-MOZILLA_FIVE_HOME=%{_libdir}/mozilla
+MOZILLA_FIVE_HOME=%{_libdir}/seamonkey
if [ "$1" == "-remote" ]; then
- %{_bindir}/mozilla-bin "$@"
+ %{_bindir}/seamonkey-bin "$@"
else
- PING=`%{_bindir}/mozilla-bin -remote 'ping()' 2>&1 >/dev/null`
+ PING=`%{_bindir}/seamonkey-bin -remote 'ping()' 2>&1 >/dev/null`
if [ -n "$PING" ]; then
if [ -f "`pwd`/$1" ]; then
- %{_bindir}/mozilla-bin "file://`pwd`/$1"
+ %{_bindir}/seamonkey-bin "file://`pwd`/$1"
else
- %{_bindir}/mozilla-bin "$@"
+ %{_bindir}/seamonkey-bin "$@"
fi
else
if [ -z "$1" ]; then
- %{_bindir}/mozilla-bin -remote 'xfeDoCommand
(openBrowser)'
+ %{_bindir}/seamonkey-bin -remote 'xfeDoCommand
(openBrowser)'
elif [ "$1" == "-mail" ]; then
- %{_bindir}/mozilla-bin -remote 'xfeDoCommand
(openInbox)'
+ %{_bindir}/seamonkey-bin -remote 'xfeDoCommand
(openInbox)'
elif [ "$1" == "-compose" ]; then
- %{_bindir}/mozilla-bin -remote 'xfeDoCommand
(composeMessage)'
+ %{_bindir}/seamonkey-bin -remote 'xfeDoCommand
(composeMessage)'
else
if [ -f "`pwd`/$1" ]; then
URL="file://`pwd`/$1"
@@ -371,9 +364,9 @@
fi
grep browser.tabs.opentabfor.middleclick
~/.mozilla/default/*/prefs.js | grep true > /dev/null
if [ $? -eq 0 ]; then
- %{_bindir}/mozilla-bin -remote
"OpenUrl($URL,new-tab)"
+ %{_bindir}/seamonkey-bin -remote
"OpenUrl($URL,new-tab)"
else
- %{_bindir}/mozilla-bin -remote
"OpenUrl($URL,new-window)"
+ %{_bindir}/seamonkey-bin -remote
"OpenUrl($URL,new-window)"
fi
fi
fi
@@ -384,7 +377,6 @@
#!/bin/sh
umask 022
cd %{_datadir}/mozilla/chrome
-cat *-installed-chrome.txt > installed-chrome.txt
rm -f chrome.rdf overlayinfo/*/*/*.rdf
rm -f %{_libdir}/mozilla/components/{compreg,xpti}.dat
MOZILLA_FIVE_HOME=%{_libdir}/mozilla %{_bindir}/regxpcom
@@ -656,9 +648,6 @@
%dir %{_datadir}/%{name}/chrome/overlayinfo/navigator/content
%ghost %{_datadir}/%{name}/chrome/overlayinfo/navigator/content/overlays.rdf
-%{_datadir}/%{name}/chrome/mozilla-installed-chrome.txt
-%ghost %{_datadir}/%{name}/chrome/installed-chrome.txt
-
%{_datadir}/%{name}/defaults
%{_datadir}/%{name}/greprefs
%exclude %{_datadir}/%{name}/defaults/pref/inspector.js
@@ -807,6 +796,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.8 2006/02/02 15:09:15 qboosh
+- install updates
+
Revision 1.7 2006/02/01 20:15:01 qboosh
- revised mozilla patches and configure options
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/seamonkey.spec?r1=1.7&r2=1.8&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
