SPECS (DEVEL): mozilla-firefox.spec - cleanups, attrs for shared libs - ker...

[glen]

Author: glen                         Date: Tue Jun 10 11:01:13 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- cleanups, attrs for shared libs
- kerberos dep for ac

---- Files affected:
SPECS:
   mozilla-firefox.spec (1.228.4.31 -> 1.228.4.32) 

---- Diffs:

================================================================
Index: SPECS/mozilla-firefox.spec
diff -u SPECS/mozilla-firefox.spec:1.228.4.31 SPECS/mozilla-firefox.spec:1.228.4.32
--- SPECS/mozilla-firefox.spec:1.228.4.31	Thu Jun  5 11:49:51 2008
+++ SPECS/mozilla-firefox.spec	Tue Jun 10 13:01:06 2008
@@ -1,5 +1,6 @@
 # $Revision$, $Date$
 # TODO:
+# - crashreporter does not seem to be built on ac
 # - handle locales differently (runtime, since it's possible to do)
 # - see ftp://ftp.debian.org/debian/pool/main/m/mozilla-firefox/*diff*
 #   for hints how to make locales
@@ -46,7 +47,11 @@
 BuildRequires:	glib2-devel
 %{?with_gnomevfs:BuildRequires:	gnome-vfs2-devel >= 2.0}
 BuildRequires:	gtk+2-devel >= 2:2.10
+%if "%{pld_release}" == "ac"
+%{?with_kerberos:BuildRequires:	heimdal-devel >= 0.7.1}
+%else
 %{?with_kerberos:BuildRequires:	krb5-devel}
+%endif
 BuildRequires:	libIDL-devel >= 0.8.0
 %{?with_gnomevfs:BuildRequires:	libgnome-devel >= 2.0}
 %{?with_gnomeui:BuildRequires:	libgnomeui-devel >= 2.2.0}
@@ -321,11 +326,7 @@
 %{_libdir}/%{name}/libsoftokn3.chk
 
 %dir %{_libdir}/%{name}/components
-%if 0
-%{?with_gnomeui:%attr(755,root,root) %{_libdir}/%{name}/components/libimgicon.so}
-%{?with_gnomevfs:%attr(755,root,root) %{_libdir}/%{name}/components/libmozgnome.so}
-%{?with_gnomevfs:%attr(755,root,root) %{_libdir}/%{name}/components/libnkgnomevfs.so}
-%endif
+
 %{_libdir}/%{name}/components/aboutRobots.js
 %{_libdir}/%{name}/components/FeedConverter.js
 %{_libdir}/%{name}/components/FeedProcessor.js
@@ -334,12 +335,6 @@
 %{_libdir}/%{name}/components/browser.xpt
 %{_libdir}/%{name}/components/fuelApplication.js
 %{_libdir}/%{name}/components/jsconsole-clhandler.js
-%{_libdir}/%{name}/components/libbrowsercomps.so
-%{_libdir}/%{name}/components/libbrowserdirprovider.so
-%{_libdir}/%{name}/components/libdbusservice.so
-%{_libdir}/%{name}/components/libimgicon.so
-%{?with_gnomevfs:%{_libdir}/%{name}/components/libmozgnome.so}
-%{?with_gnomevfs:%{_libdir}/%{name}/components/libnkgnomevfs.so}
 %{_libdir}/%{name}/components/nsAddonRepository.js
 %{_libdir}/%{name}/components/nsBlocklistService.js
 %{_libdir}/%{name}/components/nsBrowserGlue.js
@@ -375,19 +370,24 @@
 %{_libdir}/%{name}/components/pluginGlue.js
 %{_libdir}/%{name}/components/storage-Legacy.js
 %{_libdir}/%{name}/components/txEXSLTRegExFunctions.js
-%if 0
-%{?with_gnomeui:%{_libdir}/%{name}/components/imgicon.xpt}
-%endif
 %{_libdir}/%{name}/components/nsBrowserContentHandler.js
+
+%attr(755,root,root) %{_libdir}/%{name}/components/libbrowsercomps.so
+%attr(755,root,root) %{_libdir}/%{name}/components/libbrowserdirprovider.so
+%attr(755,root,root) %{_libdir}/%{name}/components/libdbusservice.so
+%attr(755,root,root) %{_libdir}/%{name}/components/libimgicon.so
+
+%if %{with gnomevfs}
+%attr(755,root,root) %{_libdir}/%{name}/components/libmozgnome.so
+%attr(755,root,root) %{_libdir}/%{name}/components/libnkgnomevfs.so
+%endif
+
 %dir %{_libdir}/%{name}/plugins
 %attr(755,root,root) %{_libdir}/%{name}/plugins/*.so
 %attr(755,root,root) %{_libdir}/%{name}/*.sh
 %attr(755,root,root) %{_libdir}/%{name}/mozilla-xremote-client
 %attr(755,root,root) %{_libdir}/%{name}/firefox
 %attr(755,root,root) %{_libdir}/%{name}/firefox-bin
-#%attr(755,root,root) %{_libdir}/%{name}/regxpcom
-#%attr(755,root,root) %{_libdir}/%{name}/xpcshell
-#%attr(755,root,root) %{_libdir}/%{name}/xpicleanup
 %{_pixmapsdir}/mozilla-firefox.png
 %{_desktopdir}/mozilla-firefox.desktop
 
@@ -405,7 +405,6 @@
 # browserconfig
 %{_libdir}/%{name}/browserconfig.properties
 
-#%{_libdir}/%{name}/LICENSE
 %{_libdir}/%{name}/README.txt
 
 %dir %{_datadir}/%{name}
@@ -433,6 +432,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.228.4.32  2008-06-10 11:01:06  glen
+- cleanups, attrs for shared libs
+- kerberos dep for ac
+
 Revision 1.228.4.31  2008-06-05 09:49:51  shadzik
 - 3.0rc2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mozilla-firefox.spec?r1=1.228.4.31&r2=1.228.4.32&f=u