Author: glen Date: Sat Oct 27 22:22:46 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - install startup wrapper - moved arch-independat stuff to datadir - -devel dropped
---- Files affected: SPECS: mozilla-sunbird.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/mozilla-sunbird.spec diff -u SPECS/mozilla-sunbird.spec:1.18 SPECS/mozilla-sunbird.spec:1.19 --- SPECS/mozilla-sunbird.spec:1.18 Sat Oct 27 23:42:05 2007 +++ SPECS/mozilla-sunbird.spec Sun Oct 28 00:22:41 2007 @@ -9,12 +9,13 @@ Summary(pl.UTF-8): Mozilla Sunbird - samodzielny kalendarz Name: mozilla-sunbird Version: 0.7 -Release: 0.2 +Release: 0.4 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: lightning-sunbird-%{version}-20071027-source.tar.bz2 # Source0-md5: 7bc573958c75630962a121d7ed12eb6f +Source1: %{name}.sh Patch0: mozilla-install.patch URL: http://www.mozilla.org/projects/sunbird/ BuildRequires: GConf2-devel >= 1.2.1 @@ -41,7 +42,7 @@ BuildRequires: xorg-lib-libXt-devel BuildRequires: zip BuildRequires: zlib-devel >= 1.2.3 -Requires: %{name}-lang-resources = %{version} +#Requires: %{name}-lang-resources = %{version} Requires: cairo >= 1.2.0 Requires: nspr >= 1:4.6.3 Requires: nss >= 1:3.11.3 @@ -65,20 +66,6 @@ Projekt Sunbird to wieloplatformowa aplikacja bedąca samodzielnym kalendarzem, oparta na języku interfejsu użytkownika XUL. -%package devel -Summary: Headers for developing programs that will use Mozilla Sunbird -Summary(pl.UTF-8): Mozilla Sunbird - pliki nagłówkowe -Group: X11/Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: nspr-devel >= 1:4.6.3 -Obsoletes: mozilla-devel - -%description devel -Mozilla Sunbird development package. - -%description devel -l pl.UTF-8 -Pliki nagłówkowe kalendarza Mozilla Sunbird. - %prep %setup -q -c cd mozilla @@ -151,51 +138,61 @@ %install rm -rf $RPM_BUILD_ROOT -cd mozilla -cd obj-%{_target_cpu} - install -d \ - $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}} + $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}} \ + $RPM_BUILD_ROOT%{_datadir}/%{name} -%{__make} -C xpinstall/packager stage-package \ +%{__make} -C mozilla/obj-%{_target_cpu}/xpinstall/packager stage-package \ DESTDIR=$RPM_BUILD_ROOT \ MOZ_PKG_APPDIR=%{_libdir}/%{name} \ PKG_SKIP_STRIP=1 +# move arch independant ones to datadir +mv $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome $RPM_BUILD_ROOT%{_datadir}/%{name}/chrome +mv $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults +mv $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions +mv $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs $RPM_BUILD_ROOT%{_datadir}/%{name}/greprefs +mv $RPM_BUILD_ROOT%{_libdir}/%{name}/icons $RPM_BUILD_ROOT%{_datadir}/%{name}/icons +mv $RPM_BUILD_ROOT%{_libdir}/%{name}/js $RPM_BUILD_ROOT%{_datadir}/%{name}/js +mv $RPM_BUILD_ROOT%{_libdir}/%{name}/res $RPM_BUILD_ROOT%{_datadir}/%{name}/res +ln -s ../../share/%{name}/chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome +ln -s ../../share/%{name}/defaults $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults +ln -s ../../share/%{name}/extensions $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions +ln -s ../../share/%{name}/greprefs $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs +ln -s ../../share/%{name}/icons $RPM_BUILD_ROOT%{_libdir}/%{name}/icons +ln -s ../../share/%{name}/js $RPM_BUILD_ROOT%{_libdir}/%{name}/js +ln -s ../../share/%{name}/res $RPM_BUILD_ROOT%{_libdir}/%{name}/res + +sed 's,@LIBDIR@,%{_libdir},' %{SOURCE1} > $RPM_BUILD_ROOT%{_bindir}/%{name} +ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/$(name=%{name}; echo ${name#mozilla-}) + rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/dependentlibs.list %clean rm -rf $RPM_BUILD_ROOT +%pretrans +for d in chrome defaults extensions greprefs icons js res; do + if [ -d %{_libdir}/%{name}/$d ] && [ ! -L %{_libdir}/%{name}/$d ]; then + install -d %{_datadir}/%{name} + mv %{_libdir}/%{name}/$d %{_datadir}/%{name}/$d + fi +done +exit 0 + #%post #%{_sbindir}/firefox-chrome+xpcom-generate -# -#%postun -#if [ "$1" = "0" ]; then -# 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 +%attr(755,root,root) %{_bindir}/%{name} +%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 @@ -206,14 +203,29 @@ %attr(755,root,root) %{_libdir}/%{name}/s* %attr(755,root,root) %{_libdir}/%{name}/reg* %attr(755,root,root) %{_libdir}/%{name}/x* + +%{_datadir}/%{name}/chrome +%{_datadir}/%{name}/defaults +%{_datadir}/%{name}/greprefs +%{_datadir}/%{name}/icons +%{_datadir}/%{name}/js +%{_datadir}/%{name}/res +%dir %{_datadir}/%{name}/extensions +# the signature of the default theme +%{_datadir}/%{name}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} +%{_datadir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103} + #%{_pixmapsdir}/* #%{_desktopdir}/* -#%files devel -#%defattr(644,root,root,755) -#%attr(755,root,root) %{_bindir}/sunbird-config -#%{_includedir}/sunbird-%{version} -#%{_pkgconfigdir}/sunbird-*.pc +# symlinks +%{_libdir}/%{name}/chrome +%{_libdir}/%{name}/defaults +%{_libdir}/%{name}/extensions +%{_libdir}/%{name}/greprefs +%{_libdir}/%{name}/icons +%{_libdir}/%{name}/js +%{_libdir}/%{name}/res %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -221,6 +233,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.19 2007/10/27 22:22:41 glen +- install startup wrapper +- moved arch-independat stuff to datadir +- -devel dropped + Revision 1.18 2007/10/27 21:42:05 glen - noauto stuff from mozilla-firefox.spec ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mozilla-sunbird.spec?r1=1.18&r2=1.19&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
