Index: SPECS/iceape.spec
===================================================================
--- SPECS/iceape.spec   (Revision 222469)
+++ SPECS/iceape.spec   (Arbeitskopie)
@@ -9,7 +9,7 @@
 %define devel_nss_name %mklibname nss
 #warning : always end release date with 00
 # (it should be the hour of build but it is not significant for rpm)
-%define releasedate 2011061000
+%define releasedate 2012032500
 %define dirversion  %{version}
 %define mozillalibdir %{_libdir}/iceape-%{dirversion}
 %define mozillaplugindir %{_libdir}/mozilla/plugins
@@ -20,7 +20,6 @@
 %define enable_svg       1
 %define build_is_final   1
 %define enable_l10n      1
-%define build_debug      0
 %define build_corefonts     0
 %define build_ggdefaults 0
 %define build_gtk   0
@@ -35,10 +34,6 @@

 %{?_with_enigmail: %global build_enigmail 1}

-# Build a mozilla with debug enabled
-%{?_with_mydebug: %global build_debug 1}
-%{?_without_mydebug: %global build_debug 0}
-
 # Use corefonts as default (Patch105)
 %{?_with_corefonts: %global build_corefonts 1}
 %{?_without_corefonts: %global build_corefonts 0}
@@ -76,7 +71,7 @@

 Name:      iceape
 Summary:   IceApe, the all-in-one internet application suite
-Version:   2.6.1
+Version:   2.7.2
 Release:   %mkrel 1
 License:   MPL
 # debian iceape: http://git.debian.org/?p=pkg-mozilla/iceape.git
@@ -85,7 +80,6 @@
 Source99:  locale.alias
 %define l10ns ca cs de en-GB en-US es-AR es-ES fi fr hu it ja lt nb-NO nl pl pt-PT ru sk sv-SE tr
 # not up-to-date: be el-GR eu-ES gl he-IL hi-IN ka ne-NP pt-BR ur-PK zh-CN
-
 Source101: http://fr2.rpmfind.net/linux/mozilla/seamonkey/releases/%{version}/langpack/seamonkey-%{version}.be.langpack.xpi
 Source102: http://fr2.rpmfind.net/linux/mozilla/seamonkey/releases/%{version}/langpack/seamonkey-%{version}.ca.langpack.xpi
 Source103: http://fr2.rpmfind.net/linux/mozilla/seamonkey/releases/%{version}/langpack/seamonkey-%{version}.cs.langpack.xpi
@@ -111,13 +105,6 @@
 Source123: http://fr2.rpmfind.net/linux/mozilla/seamonkey/releases/%{version}/langpack/seamonkey-%{version}.sv-SE.langpack.xpi
 Source124: http://fr2.rpmfind.net/linux/mozilla/seamonkey/releases/%{version}/langpack/seamonkey-%{version}.tr.langpack.xpi
 Source125: http://fr2.rpmfind.net/linux/mozilla/seamonkey/releases/%{version}/langpack/seamonkey-%{version}.zh-CN.langpack.xpi
-#Source111: seamonkey-2.14.ka.langpack.xpi
-#Source113: seamonkey-1.0.2.ne-NP.langpack.xpi
-#Source118: seamonkey-1.1.17.pt-BR.langpack.xpi
-#Source121: seamonkey-1.1.9.ur-PK.langpack.xpi
-#Source122: seamonkey-1.1.7.hi-IN.langpack.xpi
-#Source127: seamonkey-2.14.gl.langpack.xpi
-#Source130: seamonkey-2.14.zh-CN.langpack.xpi
 %endif
 # (fc) 0.9.8-1mdk fix loading of file through command line (contributed by Chmouel) ,
 # set MOZ_PLUGIN_PATH to $HOME/.mozilla/plugins, autodetect locale, add -splash parameter
@@ -132,7 +119,12 @@
 # (fc) 1.1-0.beta.1mdk remove Debug menu
 Patch0:    mozilla-1.7-no-debug-overlay-menu.patch
 Patch1:    seamonkey-2.4-fix-str-fmt.patch
-Patch7:    mozilla-browser-home-page.patch
+# (doktor5000) replaced with proper patch from Debian, taken from Debian:
+# http://patch-tracker.debian.org/patch/series/dl/iceape/2.7.3-2/0011-Set-homepage-and-throbber-url-to-about.patch
+Patch7:    0011-Set-homepage-and-throbber-url-to-about.patch
+# (doktor5000) don't hardcode vendor and application name, taken from Debian:
+# http://patch-tracker.debian.org/patch/series/dl/iceape/2.7.3-2/0015-Don-t-hardcode-anything-in-application.ini-files.patch
+Patch8:    0015-Don-t-hardcode-anything-in-application.ini-files.patch
 # (fc) 0.9.6-3mdk remove buildid from titlebar (Ximian)
 Patch23:   mozilla-1.1-remove-buildid-from-title.patch

@@ -149,23 +141,13 @@
 Patch104:  mozilla-1.7-a4paper.patch
 # (gg) Patch for default font names for x-western
 Patch105:  mozilla-1.7-corefonts-fontnames.patch
-# (fc) 1.4-10mdk use xvt instead of xterm
-Patch132:  mozilla-1.7-xvt.patch
-# (fc) 1.7.3-2mdk fix compilation with latest freetype2 (Moz bug #234035)
-Patch258:  mozilla-1.7.7-freetype-compile.patch
-# (gb) 1.7.5-5mdk fix loading of libXext.so.6 and libXt.so.6
-Patch274:  mozilla-load-full-dso.patch
-# (fc) 1.7.5-5mdk enable automatic language detection at startup (Debian)
-Patch276:  mozilla-1.7.5-lang.patch
-#
-Patch299:  seamonkey-1.0.3-gcc41.patch
-# (cjw) fix build error from enigmail due to a visibility problem
-Patch303:  enigmail-0.95.6-visibility.patch
 # (cjw) fix opt flags passing to mozilla subdir's configure script
 Patch305:  seamonkey-2.0-configure-optflags-fix.patch
-# (cjw) rename to iceape, patch from debian package
-Patch310:  iceape-2.5-branding.patch
-Patch311:  firefox-9.0-libpng15.patch
+# (cjw) branding patch from debian package
+# taken from http://patch-tracker.debian.org/patch/series/dl/iceape/2.7.3-2/0016-Branding.patch
+Patch310:  0016-Branding.patch
+# (doktor5000) remove useless menu item for updater, still existent with updater disabled
+Patch311:  iceape-2.7.2-mga-remove-updater-menu-item.patch

 Epoch:     %{epoch_mozilla}
 Provides:  seamonkey = %{epoch}:%{version}-%{release}
@@ -186,7 +168,7 @@
 BuildRequires: dbus-glib-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libnotify-devel
-BuildRequires: libpng-devel >= 2:1.4.1
+#BuildRequires:    libpng-devel >= 2:1.4.1
 BuildRequires:  libxft-devel
 BuildRequires: libxt-devel
 BuildRequires: mesagl-devel
@@ -438,14 +420,10 @@
 %patch0 -p1 -b .nodebug
 %patch23 -p1 -b .nobuildid
 %endif
-%patch1 -p1 -b .str
+#%patch1 -p1 -b .str
+%patch7 -p1 -b .change_homepage_and_throbber
+%patch8 -p1 -b .dont_hardcode_vendor_and_name

-%patch7 -p1 -b .browser-home-page
-
-#patch46 -p1 -b .enigmailpackage
-#patch53 -p1 -b .spellcheck-system-dicts
-#patch54 -p1 -b .spellcheck-full-langname
-
 %if %build_ggdefaults
 %patch100 -p1 -b .pipelining
 %patch101 -p1 -b .mailnews
@@ -458,20 +436,17 @@
 %endif

 # Other patches
-%patch132 -p1 -b .xvt
+# replace xvt patch with sed call, avoids useless rediffing
+# use xvt instead of xterm
+sed -i s/xterm/xvt/ mozilla/modules/libpref/src/init/all.js

-#if %build_ggdefaults
-#patch258 -p0 -b .freetype-compile
-#endif
-#patch274 -p0 -b .load-full-dso
-#patch276 -p1 -b .lang
-
-#patch299 -p2 -b .gcc41
-#patch303 -p1 -b .enigmail-visibility
 %patch305 -p1 -b .subdir-optflags
+
 %patch310 -p1 -b .branding
-%patch311 -p1 -b .libpng

+%patch311 -p2 -b .remove-updater-memu-item
+
+
 # remove all trademarked logos
 rm -f suite/branding/nightly/icons/*/seamonkey.* \
       suite/branding/nightly/content/{logo.gif,icon64.png,about.png} \
@@ -544,11 +519,6 @@
    --with-system-libxul \
    --enable-optimize="$OPT_FLAGS" \
    --disable-strip \
-%if %build_debug
-   --enable-debug \
-%else
-   --disable-debug \
-%endif
    --disable-pedantic \
    --disable-tests \
    --disable-necko-wifi \
@@ -570,13 +540,13 @@
    --enable-system-cairo \
    --with-system-bz2 \
    --with-system-jpeg \
-   --with-system-png \
+   --without-system-png \
    --enable-ipv6 \
    --enable-system-sqlite \
    --enable-system-hunspell \
    --disable-gnomevfs \
    --enable-gio \
-   --enable-old-abi-compat-wrappers --mandir=%{_mandir} \
+   --mandir=%{_mandir} \
 %if %enable_svg
    --enable-svg \
    --enable-svg-renderer-libart \
@@ -590,7 +560,9 @@
 %if %build_pango
    --enable-pango \
 %endif
-   --enable-default-toolkit=%{toolkit}
+   --enable-default-toolkit=%{toolkit} \
+   --disable-updater \
+   --disable-installer

 %make -s export
 pushd ldap/sdks/c-sdk/ldap
@@ -600,9 +572,6 @@
 %make -s libs

 %if %build_enigmail
-#cd extensions/ipc
-#./makemake
-#%make -s
 pushd mailnews/extensions/enigmail
 ./makemake -r
 %make -s
@@ -734,20 +703,6 @@
 make xpi
 popd
 install mozilla/dist/bin/enigmail-*.xpi $RPM_BUILD_ROOT%{mozillalibdir}/extensions
-
-#rm -f %{_tmppath}/mozilla-enigmail.list
-#%{SOURCE25} --package enigmail \
-#    --output-file %{_tmppath}/mozilla-enigmail.list \
-#    --package-file suite/installer/package-manifest \
-#    --install-dir $RPM_BUILD_ROOT%{mozillalibdir} \
-#    --install-root %{mozillalibdir}
-#
-#rm -f %{_tmppath}/mozilla-enigmime.list
-#%{SOURCE25} --package enigmime \
-#    --output-file %{_tmppath}/mozilla-enigmime.list \
-#    --package-file suite/installer/package-manifest \
-#    --install-dir $RPM_BUILD_ROOT%{mozillalibdir} \
-#    --install-root %{mozillalibdir}
 %endif

 # copy xmlterm files
@@ -798,8 +753,6 @@
 # we don't need to do this anymore
 pushd `pwd`
   cd $RPM_BUILD_ROOT%{mozillalibdir}
-  # register our components
-#  LD_LIBRARY_PATH=`pwd`/..:`pwd` MOZILLA_FIVE_HOME=`pwd` ./regxpcom
   # set up the default skin and locale to trigger the generation of
   # the user-locales and users-skins.rdf
   echo "skin,install,select,classic/1.0" >> chrome/installed-chrome.txt
@@ -836,13 +789,6 @@
 %endif


-# copy our devel tools
-#install -c -m 755 dist/bin/xpcshell \
-#  dist/bin/xpidl \
-#  dist/bin/xpt_dump \
-#  dist/bin/xpt_link \
-#  $RPM_BUILD_ROOT%{mozillalibdir}
-
 mkdir -p %{buildroot}%{_miconsdir} $RPM_BUILD_ROOT%{_liconsdir}
 mkdir -p %{buildroot}%{_iconsdir}/hicolor/{16x16,32x32,48x48,64x64}/apps

@@ -861,10 +807,6 @@
 rsvg-convert mageia/branding/iceape_mail_icon_plain.svg -w 48 -h 48 -a -o %{buildroot}%{_iconsdir}/hicolor/48x48/apps/%{name}-mail.png
 rsvg-convert mageia/branding/iceape_mail_icon_plain.svg -w 64 -h 64 -a -o %{buildroot}%{_iconsdir}/hicolor/64x64/apps/%{name}-mail.png

-# move manpage in the correct directory
-#mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-#mv $RPM_BUILD_ROOT/usr/man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1/
-
 # install our mozilla.sh file
 rm -f $RPM_BUILD_ROOT%{_bindir}/iceape
 cat %{SOURCE10} | sed -e "s|ICEAPE_VERSION|%{dirversion}|g;s|LIBDIR|%{_libdir}|g" > $RPM_BUILD_ROOT%{_bindir}/iceape
@@ -1010,9 +952,6 @@
  $RPM_BUILD_ROOT%{mozillalibdir}/res/samples \
  $RPM_BUILD_ROOT%{mozillalibdir}/dictionaries

-# $RPM_BUILD_ROOT%{mozillalibdir}/extensions \
-# $RPM_BUILD_ROOT%{mozillalibdir}/res/samples/sampleimages
-
 %if %{build_xmlterm}
 rm -f $RPM_BUILD_ROOT%{mozillalibdir}/{xcat,xenv,xls,xmlterm} \
  $RPM_BUILD_ROOT%{mozillalibdir}/escape \
@@ -1028,24 +967,34 @@
  $RPM_BUILD_ROOT%{mozillalibdir}/{libplc4.so,libplds4.so,libsmime3.so,libsoftokn3.so,libssl3.so,libnspr4.so,libnss3.so,libnssckbi.so} \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/iceape-{nspr,nss}.pc \
  $RPM_BUILD_ROOT%{_datadir}/aclocal/nspr.m4
-##sed -i -e 's/mozilla-nspr = %{version}/mozilla-nspr/'   $RPM_BUILD_ROOT%{_libdir}/pkgconfig/iceape-xpcom.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/iceape-js.pc
-##ln -s nspr.pc %{buildroot}%{_libdir}/pkgconfig/iceape-nspr.pc
-##ln -s nss.pc %{buildroot}%{_libdir}/pkgconfig/iceape-nss.pc
 %endif

-# multiarch
-##multiarch_binaries $RPM_BUILD_ROOT%{_bindir}/iceape-config
-##multiarch_includes $RPM_BUILD_ROOT%{_includedir}/iceape-%{version}/{mozilla-config.h,js/jsautocfg.h}

+
 # myspell dictionaries
 ln -s ../../share/dict/mozilla $RPM_BUILD_ROOT%{mozillalibdir}/dictionaries

-%if %build_debug
-export DONT_STRIP=1
-%endif
+# files in this directory are read on every startup, and can change/add
+# preferences for existing profiles
+# extensions.autoDisableScopes is a new preference added in firefox 8
+# it defines "scopes" where newly installed addons are disabled by default
+# this is an additive bit field, and the value defaults to 15 (1+2+4+8)
+# we need to remove system scope (8) from it so language packs and other addons
+# which are installed systemwide won't get marked as 3rd party and disabled
+# documentation: http://kb.mozillazine.org/About:config_entries#Extensions.
+# or in toolkit/mozapps/extensions/AddonManager.jsm
+# we also need to disable the "disable addon selection dialog"
+mkdir -p %{buildroot}%{mozillalibdir}/defaults/pref/
+cat << EOF > %{buildroot}%{mozillalibdir}/defaults/pref/mga.js
+pref("extensions.autoDisableScopes", 0);
+pref("extensions.shownSelectionUI", true);
+# disable loading an URL from clipboard, to close tabs via middle mouse
+# workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=107147
+# and https://bugzilla.mozilla.org/show_bug.cgi?id=738786
+pref("middlemouse.contentLoadURL", false);
+EOF

 %clean
-rm -rf $RPM_BUILD_ROOT
 rm -f %{_tmppath}/mozilla*.list


@@ -1071,9 +1020,8 @@
 *216) paper="letter";;
 *) paper="a4";;
 esac
-#perl -pi -e "s/^(pref\(\"print.postscript.paper_size\",[^\"]+)\"[a-z0-9]+\"/\"$paper\"/" \
-#  %{mozillalibdir}/greprefs/all.js

+
 %preun
 if [ "$1" = "0" ]; then
     /bin/rm -rf %{mozillalibdir}/chrome/overlayinfo
@@ -1199,7 +1147,6 @@
 %if %build_gre
 %config(noreplace) %{_sysconfdir}/gre.conf
 %endif
-##{_mandir}/man1/*
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/applications/%{name}-composer.desktop
 %{_miconsdir}/*.png
@@ -1208,90 +1155,30 @@
 %{_iconsdir}/hicolor/*/apps/*.png
 %dir %{_libdir}/mozilla
 %dir %{mozillaplugindir}
-
 %{mozillalibdir}/defaults/profile/bookmarks.html
 %{mozillalibdir}/components/binary.manifest
-%{mozillalibdir}/omni.jar
-#dir %{mozillalibdir}/defaults/autoconfig
+%{mozillalibdir}/omni.ja
 %dir %{mozillalibdir}/defaults/pref
-#{mozillalibdir}/defaults/pref/enigmail.js
-#{mozillalibdir}/defaults/pref/suite-l10n.js
-##dir %{mozillalibdir}/defaults/messenger/US
 %dir %{mozillalibdir}/defaults/messenger
-##dir %{mozillalibdir}/defaults/profile/US
 %dir %{mozillalibdir}/defaults/profile
-##dir %{mozillalibdir}/defaults/wallet
 %dir %{mozillalibdir}/defaults
 %dir %{mozillalibdir}/chrome
 %dir %{mozillalibdir}/chrome/icons
 %dir %{mozillalibdir}/chrome/icons/default
 %dir %{mozillalibdir}/components
-#dir %{mozillalibdir}/greprefs
-##dir %{mozillalibdir}/init.d
-#dir %{mozillalibdir}/res/dtd
-#dir %{mozillalibdir}/res/html
-#dir %{mozillalibdir}/res/samples
-#dir %{mozillalibdir}/res/entityTables
-#dir %{mozillalibdir}/res/rdf
-#dir %{mozillalibdir}/res/fonts
-#dir %{mozillalibdir}/res
 %dir %{mozillalibdir}/searchplugins
 %dir %{mozillalibdir}/plugins
 %dir %{mozillalibdir}
-##verify (not md5 mtime size) %{mozillalibdir}/components/compreg.dat
-##verify (not md5 mtime size) %{mozillalibdir}/components/xpti.dat
-##verify (not md5 mtime size) %{mozillalibdir}/chrome/*.rdf
-#ghost %{mozillalibdir}/chrome/overlayinfo
-##verify (not md5 mtime size) %{mozillalibdir}/greprefs/all.js
-%if %{enable_svg}
-#{mozillalibdir}/chrome/svg.jar
-#{mozillalibdir}/components/gksvgrenderer.xpt
-#{mozillalibdir}/res/svg.css
-%endif
-##{mozillalibdir}/plugins/libunixprintplugin.so
-#{mozillalibdir}/chrome/reporter.jar
-##{mozillalibdir}/chrome/xforms.jar
-##{mozillalibdir}/components/xforms.xpt
-##{mozillalibdir}/components/libxforms.so
-##{mozillalibdir}/components/schemavalidation.xpt
-##{mozillalibdir}/components/libschemavalidation.so
-##{mozillalibdir}/components/nsSchemaValidatorRegexp.js
-##{mozillalibdir}/components/nsURLFormatter.js
-##{mozillalibdir}/components/saxparser.xpt
-##{mozillalibdir}/components/urlformatter.xpt
-##{mozillalibdir}/chrome/sql.jar
-##{mozillalibdir}/components/sql.xpt
-##{mozillalibdir}/components/libsql.so
-##{mozillalibdir}/chrome/xforms.manifest
-##{mozillalibdir}/chrome/inspector.manifest
-#{mozillalibdir}/chrome/reporter.manifest
-#{mozillalibdir}/.autoreg
-#{mozillalibdir}/chrome/en-US.jar
 %{mozillalibdir}/chrome.manifest
-#{mozillalibdir}/chrome/localized.manifest
-#{mozillalibdir}/chrome/nonlocalized.manifest
 %{mozillalibdir}/chrome/installed-chrome.txt
-#{mozillalibdir}/components/browser.xpt
+%{mozillalibdir}/defaults/pref/mga.js
 %{mozillalibdir}/defaults/profile/localstore.rdf
-#{mozillalibdir}/defaults/profile/mimeTypes.rdf
 %{mozillalibdir}/defaults/profile/panels.rdf
-#{mozillalibdir}/defaults/profile/search.rdf
-%{mozillalibdir}/hyphenation
-#{mozillalibdir}/regxpcom
 %{mozillalibdir}/removed-files
 %{mozillalibdir}/searchplugins/creativecommons.xml
 %{mozillalibdir}/searchplugins/google.xml
 %{mozillalibdir}/searchplugins/wikipedia.xml
 %{mozillalibdir}/searchplugins/yahoo.xml
-#{mozillalibdir}/searchplugins/dmoz.png
-#{mozillalibdir}/searchplugins/dmoz.src
-#{mozillalibdir}/searchplugins/google.png
-#{mozillalibdir}/searchplugins/google.src
-#{mozillalibdir}/searchplugins/jeeves.png
-#{mozillalibdir}/searchplugins/jeeves.src
-%{mozillalibdir}/update.locale
-%{mozillalibdir}/updater.ini
-#{mozillalibdir}/modules/gloda

 %files mail -f %{_tmppath}/mozilla-mail.list
 %defattr(-,root,root)
@@ -1299,9 +1186,7 @@
 %{_datadir}/applications/%{name}-news.desktop
 %{_datadir}/applications/%{name}-addressbook.desktop
 %dir %{mozillalibdir}
-#{mozillalibdir}/components/mail.xpt
 %{mozillalibdir}/defaults/messenger/mailViews.dat
-##{mozillalibdir}/isp

 %files irc -f %{_tmppath}/mozilla-chat.list
 %defattr(-,root,root)
@@ -1341,7 +1226,6 @@
 %dir  %{mozillaincludedir}/gfx
 %dir  %{mozillaincludedir}/gtkxtbin
 %dir  %{mozillaincludedir}/gtkembedmoz
-#dir  %{mozillaincludedir}/helperAppDlg
 %dir  %{mozillaincludedir}/history
 %dir  %{mozillaincludedir}/htmlparser
 %dir  %{mozillaincludedir}/imglib2
@@ -1349,7 +1233,6 @@
 %dir  %{mozillaincludedir}/import
 %dir  %{mozillaincludedir}/inspector
 %dir  %{mozillaincludedir}/intl
-#dir  %{mozillaincludedir}/ipcd
 %dir  %{mozillaincludedir}/jar
 %dir  %{mozillaincludedir}/java
 %dir  %{mozillaincludedir}/js
@@ -1393,12 +1276,10 @@
 %dir  %{mozillaincludedir}/prefmigr
 %dir  %{mozillaincludedir}/profdirserviceprovider
 %dir  %{mozillaincludedir}/profile
-#dir  %{mozillaincludedir}/profilesharingsetup
 %dir  %{mozillaincludedir}/progressDlg
 %dir  %{mozillaincludedir}/rdf
 %dir  %{mozillaincludedir}/rdfutil
 %dir  %{mozillaincludedir}/shistory
-#dir  %{mozillaincludedir}/sidebar
 %dir  %{mozillaincludedir}/spellchecker
 %dir  %{mozillaincludedir}/string
 %dir  %{mozillaincludedir}/system-pref
@@ -1426,9 +1307,7 @@
 %dir  %{mozillaincludedir}/webshell
 %dir  %{mozillaincludedir}/widget
 %dir  %{mozillaincludedir}/windowwatcher
-#dir  %{mozillaincludedir}/xlibrgb
 %dir  %{mozillaincludedir}/xml-rpc
-#dir  %{mozillaincludedir}/xmlextras
 %if %{build_xmlterm}
 %dir  %{mozillaincludedir}/xmlterm
 %endif
@@ -1437,8 +1316,6 @@
 %dir  %{mozillaincludedir}/xpconnect
 %dir  %{mozillaincludedir}/xpinstall
 %dir  %{mozillaincludedir}/xpnet
-#dir  %{mozillaincludedir}/xprintutil
-#dir  %{mozillaincludedir}/xremoteservice
 %dir  %{mozillaincludedir}/xul
 %dir  %{mozillaincludedir}/xuldoc
 %dir  %{mozillaincludedir}/xultmpl
@@ -1460,7 +1337,6 @@

 %if %{build_xmlterm}
 %files xmlterm
-%defattr(-, root, root)
 %{_bindir}/xmlterm
 %{_bindir}/xcat
 %{_bindir}/xls
@@ -1470,34 +1346,21 @@
 %endif

 %files js-debugger -f %{_tmppath}/mozilla-js-debugger.list
-%defattr(-,root,root)

 %files dom-inspector -f %{_tmppath}/mozilla-dom-inspector.list
-%defattr(-,root,root)
-#dir %{mozillalibdir}/res/inspector

 %files spellchecker -f %{_tmppath}/mozilla-spellchecker.list
-%defattr(-,root,root)
 %{mozillalibdir}/dictionaries

 %if %build_enigmail
 %files enigmail
-%defattr(-,root,root)
 %{mozillalibdir}/extensions/enigmail-*.xpi
-#{mozillalibdir}/chrome/enigmail.jar
-#{mozillalibdir}/components/enigmail.js
-#{mozillalibdir}/components/enigmail.xpt
-#{mozillalibdir}/components/ipc.xpt
-#{mozillalibdir}/components/enigprefs-service.js
 %endif

 %if %{build_nspr_nss}
-
 %files -n %{lib_nspr_name} -f %{_tmppath}/mozilla-nspr.list
-%defattr(-, root, root)

 %files -n %{devel_nspr_name} -f %{_tmppath}/mozilla-nspr-devel.list
-%defattr(-, root, root)
 %dir %{mozillaincludedir}
 %dir  %{mozillaincludedir}/nspr
 %dir  %{mozillaincludedir}/nspr/private
@@ -1507,14 +1370,9 @@
 %{_datadir}/aclocal/nspr.m4

 %files -n %{lib_nss_name} -f  %{_tmppath}/mozilla-nss.list
-%defattr(-, root, root)
 %{_libdir}/*.chk

 %files -n %{devel_nss_name} -f %{_tmppath}/mozilla-nss-devel.list
-%defattr(-, root, root)
 %dir  %{mozillaincludedir}/nss
 %{_libdir}/pkgconfig/mozilla-nss.pc
 %endif
-
-
-