rpms/firefox/F-9 .cvsignore, 1.78, 1.79 firefox.desktop, 1.7, 1.8 firefox.spec, 1.292, 1.293 sources, 1.90, 1.91

[Christopher Aillon (caillon)]

Author: caillon

Update of /cvs/extras/rpms/firefox/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17732

Modified Files:
	.cvsignore firefox.desktop firefox.spec sources 
Log Message:
* Mon Apr  7 2008 Christopher Aillon <caillon at redhat.com> 3.0-0.53
- Add langpacks, marked with %lang
- Translate the .desktop file



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-9/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- .cvsignore	31 Mar 2008 23:28:26 -0000	1.78
+++ .cvsignore	8 Apr 2008 01:29:51 -0000	1.79
@@ -1 +1,2 @@
 firefox-3.0b5-source.tar.bz2
+firefox-langpacks-3.0b5-20080407.tar.bz2


Index: firefox.desktop
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-9/firefox.desktop,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- firefox.desktop	4 Dec 2007 16:25:53 -0000	1.7
+++ firefox.desktop	8 Apr 2008 01:29:52 -0000	1.8
@@ -2,11 +2,70 @@
 Version=1.0
 Encoding=UTF-8
 Name=Firefox Web Browser
+Name[ca]=Navegador web Firefox
+Name[cs]=Firefox Webový prohlížeč
+Name[es]=Navegador web Firefox
+Name[fa]=مرورگر اینترنتی Firefox
+Name[fi]=Firefox-selain
+Name[fr]=Navigateur Web Firefox
+Name[hu]=Firefox webböngésző
+Name[it]=Firefox Browser Web
+Name[ja]=Firefox ウェブ・ブラウザ
+Name[ko]=Firefox 웹 ë¸Œë¼ìš°ì €
+Name[nb]=Firefox Nettleser
+Name[nl]=Firefox webbrowser
+Name[nn]=Firefox Nettlesar
+Name[no]=Firefox Nettleser
+Name[pl]=PrzeglÄ…darka WWW Firefox
+Name[pt]=Firefox Navegador Web
+Name[pt_BR]=Navegador Web Firefox
+Name[sk]=Internetový prehliadač Firefox
+Name[sv]=Webbläsaren Firefox
 GenericName=Web Browser
+GenericName[ca]=Navegador web
+GenericName[cs]=Webový prohlížeč
+GenericName[es]=Navegador web
+GenericName[fa]=مرورگر اینترنتی
+GenericName[fi]=WWW-selain
+GenericName[fr]=Navigateur Web
+GenericName[hu]=Webböngésző
+GenericName[it]=Browser Web
+GenericName[ja]=ウェブ・ブラウザ
+GenericName[ko]=웹 ë¸Œë¼ìš°ì €
+GenericName[nb]=Nettleser
+GenericName[nl]=Webbrowser
+GenericName[nn]=Nettlesar
+GenericName[no]=Nettleser
+GenericName[pl]=PrzeglÄ…darka WWW
+GenericName[pt]=Navegador Web
+GenericName[pt_BR]=Navegador Web
+GenericName[sk]=Internetový prehliadač
+GenericName[sv]=Webbläsare
 Comment=Browse the Web
+Comment[ca]=Navegueu per el web
+Comment[cs]=Prohlížení stránek World Wide Webu
+Comment[de]=Im Internet surfen
+Comment[es]=Navegue por la web
+Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید
+Comment[fi]=Selaa Internetin WWW-sivuja
+Comment[fr]=Navigue sur Internet
+Comment[hu]=A világháló böngészése
+Comment[it]=Esplora il web
+Comment[ja]=ウェブを閲覧します
+Comment[ko]=웹을 돌아 다닙니다
+Comment[nb]=Surf på nettet
+Comment[nl]=Verken het internet
+Comment[nn]=Surf på nettet
+Comment[no]=Surf på nettet
+Comment[pl]=PrzeglÄ…danie stron WWW 
+Comment[pt]=Navegue na Internet
+Comment[pt_BR]=Navegue na Internet
+Comment[sk]=Prehliadanie internetu
+Comment[sv]=Surfa på webben
 Exec=firefox %u
 Icon=firefox
 Terminal=false
 Type=Application
 StartupWMClass=Firefox-bin
 MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;
+StartupNotify=true


Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-9/firefox.spec,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- firefox.spec	2 Apr 2008 20:46:20 -0000	1.292
+++ firefox.spec	8 Apr 2008 01:29:52 -0000	1.293
@@ -9,7 +9,7 @@
 %define gecko_version	1.9
 
 %define official_branding    1
-%define build_langpacks      0
+%define build_langpacks      1
 
 %if ! %{official_branding}
 %define cvsdate 20080327
@@ -21,7 +21,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        3.0
-Release:        0.52%{?version_pre}%{?nightly}%{?dist}
+Release:        0.53%{?version_pre}%{?nightly}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -31,7 +31,9 @@
 %define tarball mozilla-%{cvsdate}.tar.bz2
 %endif
 Source0:        %{tarball}
-#Source2:        firefox-langpacks-20080104.tar.bz2
+%if %{build_langpacks}
+Source2:        firefox-langpacks-%{version_internal}-20080407.tar.bz2
+%endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
 Source12:       firefox-redhat-default-prefs.js
@@ -208,6 +210,7 @@
 
 %if %{build_langpacks}
 # Install langpacks
+touch ../%{name}.lang
 %{__mkdir_p} $RPM_BUILD_ROOT/%{mozappdir}/extensions
 %{__tar} xjf %{SOURCE2}
 for langpack in `ls firefox-langpacks/*.xpi`; do
@@ -233,6 +236,10 @@
   zip -r -D $jarfile locale
   cd -
   %{__rm} -rf $tmpdir
+
+  language=`echo $language | sed -e 's/-/_/g'`
+  extensiondir=`echo $extensiondir | sed -e "s,^$RPM_BUILD_ROOT,,"`
+  echo "%%lang($language) $extensiondir" >> ../%{name}.lang
 done
 %{__rm} -rf firefox-langpacks
 %endif # build_langpacks
@@ -242,7 +249,7 @@
 %{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{firefox_app_id}
 
 # Copy over the LICENSE
-install -c -m 644 LICENSE $RPM_BUILD_ROOT/%{mozappdir}
+%{__install} -p -c -m 644 LICENSE $RPM_BUILD_ROOT/%{mozappdir}
 
 # ghost files
 touch $RPM_BUILD_ROOT/%{mozappdir}/components/compreg.dat
@@ -278,7 +285,7 @@
 fi
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_bindir}/firefox
 %{_mandir}/man1/*
@@ -299,7 +306,8 @@
 %attr(644, root, root) %{mozappdir}/blocklist.xml
 %attr(644, root, root) %{mozappdir}/components/*.js
 %{mozappdir}/defaults
-%{mozappdir}/extensions
+%dir %{mozappdir}/extensions
+%{mozappdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
 %{mozappdir}/icons
 %{mozappdir}/searchplugins
 %{mozappdir}/firefox
@@ -315,6 +323,10 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Apr  7 2008 Christopher Aillon <caillon at redhat.com> 3.0-0.53
+- Add langpacks, marked with %%lang
+- Translate the .desktop file
+
 * Wed Apr  2 2008 Christopher Aillon <caillon at redhat.com> 3.0-0.52
 - Beta 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-9/sources,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- sources	31 Mar 2008 23:28:27 -0000	1.90
+++ sources	8 Apr 2008 01:29:52 -0000	1.91
@@ -1 +1,2 @@
 6a97a0933f8cd71b34436daa41530c29  firefox-3.0b5-source.tar.bz2
+6efb14be492b8c73f456c06e2b73e410  firefox-langpacks-3.0b5-20080407.tar.bz2