SPECS: mozilla-sunbird.spec - install and package files

Sat Oct 27 23:30:40 CEST 2007

Author: glen                         Date: Sat Oct 27 21:30:40 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- install and package files

---- Files affected:
SPECS:
   mozilla-sunbird.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: SPECS/mozilla-sunbird.spec
diff -u SPECS/mozilla-sunbird.spec:1.16 SPECS/mozilla-sunbird.spec:1.17

--- SPECS/mozilla-sunbird.spec:1.16	Sat Oct 27 22:35:07 2007
+++ SPECS/mozilla-sunbird.spec	Sat Oct 27 23:30:35 2007
@@ -12,10 +12,10 @@
 Release:	0.1
 License:	MPL/LGPL
 Group:		X11/Applications/Networking
-Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/%{version}/source/lightning-sunbird-%{version}-source.tar.bz2
-# Source0-md5:	7bc573958c75630962a121d7ed12eb6f
+#Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/%{version}/source/lightning-sunbird-%{version}-source.tar.bz2
 Source0:	lightning-sunbird-%{version}-20071027-source.tar.bz2
 # Source0-md5:	7bc573958c75630962a121d7ed12eb6f
+Patch0:		mozilla-install.patch
 URL:		http://www.mozilla.org/projects/sunbird/
 BuildRequires:	GConf2-devel >= 1.2.1
 BuildRequires:	automake
@@ -47,8 +47,6 @@
 Requires:	nss >= 1:3.11.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_sunbirddir	%{_libdir}/mozilla-sunbird
-
 %description
 The Sunbird Project is a cross platform standalone calendar
 application based on Mozilla's XUL user interface language.
@@ -73,10 +71,11 @@
 
 %prep
 %setup -q -c
+cd mozilla
+%patch0 -p1
 
 %build
 cd mozilla
-
 cat << 'EOF' > .mozconfig
 # Options for 'configure' (same as command-line options).
 ac_add_options --prefix=%{_prefix}
@@ -106,9 +105,10 @@
 %else
 ac_add_options --disable-tests
 %endif
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj- at CONFIG_GUESS@
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-%{_target_cpu}
 ac_add_options --disable-freetype2
 ac_add_options --disable-logging
+ac_add_options --disable-updater
 ac_add_options --disable-old-abi-compat-wrappers
 ac_add_options --enable-application=calendar
 ac_add_options --enable-default-toolkit=gtk2
@@ -123,7 +123,7 @@
 ac_add_options --enable-system-cairo
 ac_add_options --enable-url-classifier
 ac_add_options --enable-xft
-ac_add_options --with-default-mozilla-five-home=%{_sunbirddir}
+ac_add_options --with-default-mozilla-five-home=%{_libdir}/%{name}
 ac_add_options --with-distribution-id=org.pld-linux
 ac_add_options --with-java-bin-path=/usr/bin
 ac_add_options --with-java-include-path=/usr/include
@@ -141,8 +141,18 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} -C mozilla -f client.mk install \
-	DESTDIR=$RPM_BUILD_ROOT
+cd mozilla
+cd obj-%{_target_cpu}
+
+install -d \
+	$RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}}
+
+%{__make} -C xpinstall/packager stage-package \
+	DESTDIR=$RPM_BUILD_ROOT \
+	MOZ_PKG_APPDIR=%{_libdir}/%{name} \
+	PKG_SKIP_STRIP=1
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/dependentlibs.list
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -152,49 +162,48 @@
 #
 #%postun
 #if [ "$1" = "0" ]; then
-#	rm -rf %{_sunbirddir}/chrome/overlayinfo
-#	rm -f  %{_sunbirddir}/chrome/*.rdf
-#	rm -rf %{_sunbirddir}/components
-#	rm -rf %{_sunbirddir}/extensions
+#	rm -rf %{_libdir}/%{name}/chrome/overlayinfo
+#	rm -f  %{_libdir}/%{name}/chrome/*.rdf
+#	rm -rf %{_libdir}/%{name}/components
+#	rm -rf %{_libdir}/%{name}/extensions
 #fi
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/sunbird
-%dir %{_sunbirddir}
-%{_sunbirddir}/res
-%dir %{_sunbirddir}/components
-%attr(755,root,root) %{_sunbirddir}/components/*.so
-%{_sunbirddir}/components/*.js
-%{_sunbirddir}/components/*.xpt
-%dir %{_sunbirddir}/plugins
-%attr(755,root,root) %{_sunbirddir}/plugins/*.so
-%{_sunbirddir}/searchplugins
-%{_sunbirddir}/icons
-%{_sunbirddir}/defaults
-%{_sunbirddir}/greprefs
-%dir %{_sunbirddir}/extensions
-%attr(755,root,root) %{_sunbirddir}/*.so
-%attr(755,root,root) %{_sunbirddir}/*.sh
-%attr(755,root,root) %{_sunbirddir}/m*
-%attr(755,root,root) %{_sunbirddir}/f*
-%attr(755,root,root) %{_sunbirddir}/reg*
-%attr(755,root,root) %{_sunbirddir}/x*
-%{_datadir}/idl/sunbird-%{version}
+#%attr(755,root,root) %{_bindir}/sunbird
+%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}/icons
+%{_libdir}/%{name}/chrome
+%{_libdir}/%{name}/defaults
+%{_libdir}/%{name}/greprefs
+%{_libdir}/%{name}/js
+%dir %{_libdir}/%{name}/extensions
+# the signature of the default theme
+%{_libdir}/%{name}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}
+
+%{_libdir}/%{name}/LICENSE
+%{_libdir}/%{name}/README.txt
+
+%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}/s*
+%attr(755,root,root) %{_libdir}/%{name}/reg*
+%attr(755,root,root) %{_libdir}/%{name}/x*
 #%{_pixmapsdir}/*
 #%{_desktopdir}/*
 
-%dir %{_sunbirddir}/chrome
-%{_sunbirddir}/chrome/*.jar
-%{_sunbirddir}/chrome/*.manifest
-%dir %{_sunbirddir}/chrome/icons
-%{_sunbirddir}/chrome/icons/default
-
-%files devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/sunbird-config
-%{_includedir}/sunbird-%{version}
-%{_pkgconfigdir}/sunbird-*.pc
+#%files devel
+#%defattr(644,root,root,755)
+#%attr(755,root,root) %{_bindir}/sunbird-config
+#%{_includedir}/sunbird-%{version}
+#%{_pkgconfigdir}/sunbird-*.pc
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -202,6 +211,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2007/10/27 21:30:35  glen
+- install and package files
+
 Revision 1.16  2007/10/27 20:35:07  glen
 - 0.7, but install fails
 
================================================================

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

