This commit was manufactured by cvs2git to create branch 'unlabeled-1.2.2'.

Sprout from master 2007-12-26 13:39:43 UTC blekot <blekot@pld-linux.org> '- massive change ( validate errors warrings from desktop-file-validate)'
Delete:
    mozilla-firefox-bin.sh
    mozilla-firefox-bin.spec

diff --git a/mozilla-firefox-bin.sh b/mozilla-firefox-bin.sh
deleted file mode 100644 (file)
index 378a634..0000000
--- a/mozilla-firefox-bin.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-# based on script by (c) vip at linux.pl, wolf at pld-linux.org
-
-LIBDIR="@LIBDIR@/mozilla-firefox-bin"
-
-MOZILLA_FIVE_HOME=$LIBDIR
-
-MOZARGS=
-MOZLOCALE="$(/usr/bin/locale | grep "^LC_MESSAGES=" | \
-               sed -e "s|LC_MESSAGES=||g" -e "s|\"||g" )"
-for MOZLANG in $(echo $LANGUAGE | tr ":" " ") $MOZLOCALE; do
-       eval MOZLANG="$(echo $MOZLANG | sed -e "s|_\([^.]*\).*|-\1|g")"
-
-       if [ -f $MOZILLA_FIVE_HOME/chrome/$MOZLANG.jar ]; then
-               MOZARGS="-UILocale $MOZLANG"
-               break
-       fi
-done
-
-if [ -z "$MOZARGS" ]; then
-       # try harder
-       for MOZLANG in $(echo $LANGUAGE | tr ":" " ") $MOZLOCALE; do
-               eval MOZLANG="$(echo $MOZLANG | sed -e "s|_.*||g")"
-
-               LANGFILE=$(echo ${MOZILLA_FIVE_HOME}/chrome/${MOZLANG}*.jar \
-                               | sed 's/\s.*//g' )
-               if [ -f "$LANGFILE" ]; then
-                       MOZLANG=$(basename "$LANGFILE" | sed 's/\.jar//')
-                       MOZARGS="-UILocale $MOZLANG"
-                       break
-               fi
-       done
-fi
-
-# compreg.dat and/or chrome.rdf will screw things up if it's from an
-# older version.  http://bugs.gentoo.org/show_bug.cgi?id=63999
-for f in ~/{.,.mozilla/}firefox/*/{compreg.dat,chrome.rdf,XUL.mfasl}; do
-       if [[ -f ${f} && ${f} -ot /usr/bin/mozilla-firefox ]]; then
-               echo "Removing ${f} leftover from older firefox"
-               rm -f "${f}"
-       fi
-done
-
-if [ -n "$MOZARGS" ]; then
-       FIREFOX="$LIBDIR/firefox $MOZARGS"
-else
-       FIREFOX="$LIBDIR/firefox"
-fi
-
-if [ "$1" == "-remote" ]; then
-       exec $FIREFOX "$@"
-else
-       PING=`$FIREFOX -remote 'ping()' 2>&1 >/dev/null`
-       if [ -n "$PING" ]; then
-               if [ -f "`pwd`/$1" ]; then
-                       exec $FIREFOX "file://`pwd`/$1"
-               else
-                       exec $FIREFOX "$@"
-               fi
-       else
-               if [ -z "$1" ]; then
-                       exec $FIREFOX -remote 'xfeDoCommand(openBrowser)'
-               elif [ "$1" == "-mail" ]; then
-                       exec $FIREFOX -remote 'xfeDoCommand(openInbox)'
-               elif [ "$1" == "-compose" ]; then
-                       exec $FIREFOX -remote 'xfeDoCommand(composeMessage)'
-               else
-                       if [ -f "`pwd`/$1" ]; then
-                               URL="file://`pwd`/$1"
-                       else
-                               URL="$1"
-                       fi
-                       grep browser.tabs.opentabfor.middleclick ~/.mozilla/firefox/*/prefs.js | grep true > /dev/null
-                       if [ $? -eq 0 ]; then
-                               exec $FIREFOX -new-tab "$URL"
-                       else
-                               exec $FIREFOX -new-window "$URL"
-                       fi
-               fi
-       fi
-fi

diff --git a/mozilla-firefox-bin.spec b/mozilla-firefox-bin.spec
deleted file mode 100644 (file)
index 416789c..0000000
--- a/mozilla-firefox-bin.spec
+++ /dev/null
@@ -1,84 +0,0 @@
-%define                realname        firefox
-Summary:       Mozilla Firefox web browser
-Summary(pl.UTF-8):     Mozilla Firefox - przeglądarka WWW
-Name:          mozilla-firefox-bin
-Version:       2.0.0.10
-Release:       1
-License:       MPL/LGPL
-Group:         X11/Applications/Networking
-Source0:       http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/linux-i686/en-US/%{realname}-%{version}.tar.gz
-# Source0-md5: 4a36d11c2a48b89e8cbe5a0256fea0ce
-Source1:       %{name}.desktop
-Source2:       %{name}.sh
-URL:           http://www.mozilla.org/projects/firefox/
-BuildRequires: zip
-Provides:      wwwbrowser
-Obsoletes:     mozilla-firebird
-Conflicts:     mozilla-firefox
-ExclusiveArch: i686 athlon
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-
-%define                _firefoxdir     %{_libdir}/%{name}
-
-%define                nss_caps        libfreebl3.so libnss3.so libnssckbi.so libsmime3.so ibsoftokn3.so libssl3.so
-%define                nspr_caps       libnspr4.so libplc4.so libplds4.so
-%define                moz_caps        libgkgfx.so libgtkembedmoz.so libgtkxtbin.so libjsj.so libmozjs.so libnullplugin.so libxpcom_compat.so libxpcom_core.so libxpcom.so libxpistub.so libxul.so
-
-# list of files (regexps) which don't generate Provides
-%define                _noautoprovfiles        %{_libdir}/%{name}/components
-# list of script capabilities (regexps) not to be used in Provides
-%define                _noautoprov                     %{moz_caps} %{nss_caps} %{nspr_caps}
-%define                _noautoreq                      %{_noautoprov}
-
-%description
-Mozilla Firefox is an open-source web browser, designed for standards
-compliance, performance and portability.
-
-%description -l pl.UTF-8
-Mozilla Firefox jest open sourcową przeglądarką sieci WWW, stworzoną z
-myślą o zgodności ze standardami, wydajnością i przenośnością.
-
-%prep
-%setup -q -n %{realname}
-
-%build
-%install
-rm -rf $RPM_BUILD_ROOT
-install -d \
-       $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}} \
-       $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir},%{_libdir}/%{name}} \
-
-cp -a * $RPM_BUILD_ROOT%{_libdir}/%{name}
-sed 's,@LIBDIR@,%{_libdir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox
-ln -s mozilla-firefox $RPM_BUILD_ROOT%{_bindir}/firefox
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/mozilla-firefox
-%attr(755,root,root) %{_bindir}/firefox
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/res
-%dir %{_libdir}/%{name}/components
-%attr(755,root,root) %{_libdir}/%{name}/components/*.so
-%{_libdir}/%{name}/components/*.js
-%{_libdir}/%{name}/components/*.xpt
-%{_libdir}/%{name}/chrome
-%{_libdir}/%{name}/defaults
-%{_libdir}/%{name}/greprefs
-%{_libdir}/%{name}/icons
-%{_libdir}/%{name}/plugins
-%{_libdir}/%{name}/searchplugins
-%{_libdir}/%{name}/dictionaries
-%{_libdir}/%{name}/browserconfig.properties
-%{_libdir}/%{name}/libfreebl3.chk
-%{_libdir}/%{name}/libsoftokn3.chk
-%attr(755,root,root) %{_libdir}/%{name}/*.so
-%attr(755,root,root) %{_libdir}/%{name}/*.sh
-%attr(755,root,root) %{_libdir}/%{name}/m*
-%attr(755,root,root) %{_libdir}/%{name}/f*
-%attr(755,root,root) %{_libdir}/%{name}/x*
-%{_desktopdir}/*.desktop