rpms/sunbird/EL-5 .cvsignore, 1.2, 1.3 find-external-requires, 1.1, 1.2 sources, 1.2, 1.3 sunbird.spec, 1.3, 1.4
Lubomir Kundrak (lkundrak)
fedora-extras-commits at redhat.com
Fri Apr 11 11:12:07 UTC 2008
Author: lkundrak
Update of /cvs/pkgs/rpms/sunbird/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3142/EL-5
Modified Files:
.cvsignore find-external-requires sources sunbird.spec
Log Message:
Make it build for RHEL
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 19 Feb 2008 17:52:03 -0000 1.2
+++ .cvsignore 11 Apr 2008 11:11:28 -0000 1.3
@@ -1,2 +1,2 @@
-lightning-sunbird-0.7-source.tar.bz2
-sunbird-langpacks-0.7.tar.gz
+lightning-sunbird-0.8-source.tar.bz2
+sunbird-langpacks-0.8.tar.gz
Index: find-external-requires
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/EL-5/find-external-requires,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- find-external-requires 19 Feb 2008 17:52:03 -0000 1.1
+++ find-external-requires 11 Apr 2008 11:11:28 -0000 1.2
@@ -2,14 +2,40 @@
# Finds requirements provided outside of the current file set
-filelist=`sed "s/[]['\"*?{}]/\\\\\&/g"`
+FIND_PROVIDES=$(rpm --eval %__find_provides)
-provides=`echo $filelist | /usr/lib/rpm/find-provides`
+# FIXME: for some reason objdump -p doesn't include libxul,
+# thus using the traditional ldd way to craft dependencies
+#FIND_REQUIRES="$(rpm --eval %__find_requires) ldd"
+FIND_REQUIRES="$(rpm --eval %__find_requires)"
+
+filelist=$(sed "s/[]['\"*?{}]/\\\\\&/g")
+provides=$(echo $filelist | $FIND_PROVIDES)
{
for f in $filelist ; do
- echo $f | /usr/lib/rpm/find-requires | while read req ; do
+ echo $f | $FIND_REQUIRES | while read req ; do
found=0
+
+ # XXX: If a lightning file has a dependency
+ # on some thunderbird file... how to do this
+ # correctly?
+ echo $f | grep -q thunderbird-lightning &&
+ echo $req | egrep -q "($(echo \
+ libgfxpsshar.so \
+ libgkgfx.so \
+ libgtkembedmoz.so \
+ libgtkxtbin.so \
+ libldap50.so \
+ libmozjs.so \
+ libprldap50.so \
+ libxpcom.so \
+ libxpcom_compat.so \
+ libxpcom_core.so \
+ libxpistub.so |
+ sed 's/ /|/g'))" &&
+ found=1
+
for p in $provides ; do
if [ "$req" = "$p" ]; then
found=1
@@ -20,4 +46,4 @@
fi
done
done
-} | sort -u
\ No newline at end of file
+} | sort -u
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 19 Feb 2008 17:52:03 -0000 1.2
+++ sources 11 Apr 2008 11:11:28 -0000 1.3
@@ -1,2 +1,2 @@
-14412fad1c72a5281164ca96f6c23cf4 lightning-sunbird-0.7-source.tar.bz2
-6de364aa11992f2e5d3e714592913c3c sunbird-langpacks-0.7.tar.gz
+b432234e9a2b04710543df72ed88e383 lightning-sunbird-0.8-source.tar.bz2
+979b858b93225c30f3960c88222ad205 sunbird-langpacks-0.8.tar.gz
Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/EL-5/sunbird.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sunbird.spec 10 Mar 2008 07:06:23 -0000 1.3
+++ sunbird.spec 11 Apr 2008 11:11:28 -0000 1.4
@@ -1,19 +1,21 @@
-%define cairo_version 0.5
+# Use rpmbuild --with xulrunner to enable building against xulrunner
+%define with_xulrunner %{!?_with_xulrunner:0}%{?_with_xulrunner:1}
+
%define progdir %{_prefix}/%{_lib}/%{name}-%{version}
%define docs LEGAL LICENSE README.txt
%{?_with_official:%define official 1}
Name: sunbird
-Version: 0.7
-Release: 10%{?official:.official}%{?dist}
+Version: 0.8
+Release: 3%{?dist}.1
Summary: Mozilla Sunbird Calendar
Group: Applications/Productivity
-License: MPLv1.1
+License: MPLv1.1 or GPLv2+ or LGPLv2+
URL: http://www.mozilla.org/projects/calendar/sunbird/
Source0: http://releases.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/%{version}/source/lightning-sunbird-%{version}-source.tar.bz2
Source1: sunbird.desktop
-Source2: sunbird-langpacks-%{version}.tar.gz
+Source2: sunbird-langpacks-0.8.tar.gz
Source3: mozilla-extension-update.sh
Source100: find-external-requires
@@ -23,18 +25,18 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: cairo-devel >= %{cairo_version}
-BuildRequires: libpng-devel, libjpeg-devel
-BuildRequires: zlib-devel, zip
+BuildRequires: zip unzip
BuildRequires: libIDL-devel
BuildRequires: desktop-file-utils
BuildRequires: libgnomeui-devel
BuildRequires: krb5-devel
+BuildRequires: pango-devel
BuildRequires: freetype-devel >= 2.1.9
BuildRequires: libXt-devel
BuildRequires: desktop-file-utils
-BuildRequires: glib2-devel
-BuildRequires: nss-devel
+%if %{with_xulrunner}
+BuildRequires: xulrunner-devel
+%endif
Requires(pre): desktop-file-utils
@@ -47,10 +49,12 @@
Mozilla Toolkit. Our goal is to bring Mozilla-style ease-of-use to your
calendar, without tying you to a particular storage solution.
-%package -n thunderbird-lightning
+%package -n thunderbird-lightning
Summary: The calendar extension to Thunderbird
Group: Applications/Productivity
Requires: thunderbird
+Obsoletes: thunderbird-lightning-wcap <= 0.8
+Provides: thunderbird-lightning-wcap = %{version}-%{release}
%description -n thunderbird-lightning
Lightning brings the Sunbird calendar to the popular email client,
@@ -58,18 +62,17 @@
integrated with Thunderbird, allowing it to easily perform email-related
calendaring tasks.
-%package -n thunderbird-lightning-wcap
-Summary: WCAP support in Mozilla Lightning
-Group: Applications/Productivity
-Requires: thunderbird-lightning = %{version}
-%description -n thunderbird-lightning-wcap
-This extension enables support for the Sun Java System Calendar Server
-(WCAP) in the Lightning calendar extension.
+%define lightning_extname '{e2fda1a4-762b-4020-b5ad-a41df1933103}'
+%define tbupdate_lightning \\\
+ %{_libdir}/thunderbird-lightning/mozilla-extension-update.sh \\\
+ --appname thunderbird \\\
+ --extname %{lightning_extname} \\\
+ --basedir %{_libdir} \\\
+ --extpath %{_libdir}/thunderbird-lightning \\\
+ --action
-%define tbupdate_lightning %{_libdir}/thunderbird-lightning/mozilla-extension-update.sh --appname thunderbird --extname {e2fda1a4-762b-4020-b5ad-a41df1933103} --basedir %{_libdir} --extpath %{_libdir}/thunderbird-lightning --action
-%define tbupdate_wcap %{_libdir}/thunderbird-lightning/mozilla-extension-update.sh --appname thunderbird --extname wcap-enabler at calendar.mozilla.org --basedir %{_libdir} --extpath %{_libdir}/thunderbird-lightning-wcap --action
%prep
%setup -q -n mozilla
@@ -85,7 +88,7 @@
export MOZILLA_OFFICIAL=1
export BUILD_OFFICIAL=1
%endif
-export CFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="$(echo $RPM_OPT_FLAGS |sed 's/-O2/-Os/;s/-Wall//')"
export CXXFLAGS="$CFLAGS"
cat << EOF > .mozconfig
%if 0%{?official}
@@ -93,6 +96,7 @@
mk_add_options BUILD_OFFICIAL=1
ac_add_options --enable-official-branding
%endif
+mk_add_options MOZ_MAKE_FLAGS=%{?_smp_mflags}
ac_add_options --enable-application=calendar
ac_add_options --prefix=%{_prefix}
ac_add_options --libdir=%{_libdir}
@@ -103,14 +107,12 @@
ac_add_options --with-system-nss
ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib
-ac_add_options --with-system-png
ac_add_options --with-pthreads
ac_add_options --disable-tests
ac_add_options --disable-debug
ac_add_options --disable-installer
-ac_add_options --enable-optimize="$RPM_OPT_FLAGS"
+ac_add_options --enable-optimize="$CFLAGS"
ac_add_options --enable-xinerama
-ac_add_options --enable-default-toolkit=gtk2
ac_add_options --disable-xprint
ac_add_options --disable-strip
ac_add_options --enable-pango
@@ -119,11 +121,22 @@
ac_add_options --enable-canvas
ac_add_options --enable-extensions=default,lightning
ac_add_options --disable-updater
+ac_add_options --disable-crashreporter
+%if %{with_xulrunner}
+ac_add_options --with-libxul-sdk="$(pkg-config --variable=sdkdir libxul)"
+%endif
EOF
make -f client.mk build
# make package directory
make -C xpinstall/packager STRIP=/bin/true
+#ac_add_options --enable-default-toolkit=cairo-gtk2
+# configure: error: Toolkit must be cairo-gtk2.
+
+#ac_add_options --with-system-png
+# checking for png_get_valid in -lpng... yes
+# checking for png_get_acTL in -lpng... no
+# configure: error: --with-system-png won't work because the system's libpng doesn't have APNG support
%install
rm -rf $RPM_BUILD_ROOT
@@ -136,49 +149,51 @@
ln -sf ../..%{progdir}/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
-desktop-file-install --vendor="mozilla" \
- --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \
- %{SOURCE1}
+desktop-file-install --vendor="fedora" \
+ --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \
+ %{SOURCE1}
# Fix some permissions
-find $RPM_BUILD_ROOT%{progdir} -name "*.xpm" -o -name "*.png" | xargs chmod -x
-chmod -x $RPM_BUILD_ROOT%{progdir}/defaults/profile/prefs.js \
- $RPM_BUILD_ROOT%{progdir}/js/calAlarmMonitor.js \
- $RPM_BUILD_ROOT%{progdir}/js/calFreeBusyService.js
+find $RPM_BUILD_ROOT%{progdir} -name "*.xpm" -o -name "*.png" |xargs chmod -x
+chmod -x $RPM_BUILD_ROOT%{progdir}/defaults/profile/prefs.js \
+ $RPM_BUILD_ROOT%{progdir}/js/calAlarmMonitor.js \
+ $RPM_BUILD_ROOT%{progdir}/js/calFreeBusyService.js
# Avoid "Chrome Registration Failed" message on first startup and extension installation
-touch $RPM_BUILD_ROOT%{progdir}/extensions/\{e2fda1a4-762b-4020-b5ad-a41df1933103\}/chrome.manifest
+touch $RPM_BUILD_ROOT%{progdir}/extensions/%{lightning_extname}/chrome.manifest
# Icon
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
ln -s %{progdir}/icons/mozicon128.png \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
# Docs in %%doc
-for doc in %{docs}; do rm -f $RPM_BUILD_ROOT%{progdir}/$doc; done
+for doc in %{docs}; do
+ rm -f $RPM_BUILD_ROOT%{progdir}/$doc
+done
# Install langpacks
mkdir -p $RPM_BUILD_ROOT%{progdir}/extensions
-rm -rf sunbird-langpacks ; mkdir sunbird-langpacks
+rm -rf sunbird-langpacks
+mkdir sunbird-langpacks
tar xzf %{SOURCE2} -C sunbird-langpacks
-for langpack in `ls sunbird-langpacks/*.xpi`; do
- language=`basename $langpack .xpi`
+for langpack in sunbird-langpacks/*.xpi; do
+ language=$(basename $langpack .xpi)
extensiondir=$RPM_BUILD_ROOT%{progdir}/extensions/langpack-$language at sunbird.mozilla.org
mkdir -p $extensiondir
unzip $langpack -d $extensiondir
- find $extensiondir -type f | xargs chmod 644
+ find $extensiondir -type f -print0 |xargs -0 chmod 644
+ # Fix #441500
+ sed 's/\r//g' $extensiondir/install.rdf |awk '/^$/ {next} {print}' >lala
+ mv lala $extensiondir/install.rdf
done
-rm -rf sunbird-langpacks
# Lightning
unzip -d $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning dist/xpi-stage/lightning.xpi
install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/mozilla-extension-update.sh
# Fix some permissions
chmod -x $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/js/calAlarmMonitor.js \
- $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/js/calFreeBusyService.js
-# WCAP support for Lightning
-unzip -d $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning-wcap dist/xpi-stage/wcap-enabler.xpi
-
+ $RPM_BUILD_ROOT%{_libdir}/thunderbird-lightning/js/calFreeBusyService.js
%clean
@@ -192,6 +207,7 @@
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
+
%postun
update-desktop-database %{_datadir}/applications
touch --no-create %{_datadir}/icons/hicolor
@@ -199,79 +215,82 @@
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
+
%post -n thunderbird-lightning
-%{tbupdate_lightning} install ||Â true
+%{tbupdate_lightning} install ||Â :
+
%preun -n thunderbird-lightning
-if [ $1 = 0 ] ; then
- %{tbupdate_lightning} remove ||Â true
+if [ $1 = 0 ]; then
+ %{tbupdate_lightning} remove ||Â :
fi
+
%postun -n thunderbird-lightning
# This is needed not to reverse the effect of our preun, which
# is guarded against upgrade, but because of our triggerun,
# which is run on self-upgrade, though triggerpostun isn't
-if [ $1 != 0 ] ; then
- %{tbupdate_lightning} install ||Â true
+if [ $1 != 0 ]; then
+ %{tbupdate_lightning} install || :
fi
%triggerin -n thunderbird-lightning -- thunderbird
-%{tbupdate_lightning} install ||Â true
+%{tbupdate_lightning} install ||Â :
%triggerun -n thunderbird-lightning -- thunderbird
-%{tbupdate_lightning} remove ||Â true
+%{tbupdate_lightning} remove ||Â :
%triggerpostun -n thunderbird-lightning -- thunderbird
# Guard against being run post-self-uninstall, even though that
# doesn't happen currently (see comment above)
-if [ "$1" != 0 ] ; then
- %{tbupdate_lightning} install ||Â true
-fi
-
-# Same thing here for the second extension
-%post -n thunderbird-lightning-wcap
-%{tbupdate_wcap} install ||Â true
-
-%preun -n thunderbird-lightning-wcap
-if [ $1 = 0 ] ; then
- %{tbupdate_wcap} remove ||Â true
-fi
-
-%postun -n thunderbird-lightning-wcap
-if [ $1 != 0 ] ; then
- %{tbupdate_wcap} install ||Â true
-fi
-
-%triggerin -n thunderbird-lightning-wcap -- thunderbird
-%{tbupdate_wcap} install ||Â true
-
-%triggerun -n thunderbird-lightning-wcap -- thunderbird
-%{tbupdate_wcap} remove ||Â true
-
-%triggerpostun -n thunderbird-lightning-wcap -- thunderbird
-if [ "$1" != 0 ] ; then
- %{tbupdate_wcap} install ||Â true
+if [ $1 != 0 ]; then
+ %{tbupdate_lightning} install ||Â :
fi
%files
%defattr(-,root,root,-)
%doc %{docs}
+%{progdir}
%{_bindir}/sunbird
%{_datadir}/applications/*.desktop
-%{progdir}
%{_datadir}/icons/hicolor/128x128/apps/sunbird.png
+
%files -n thunderbird-lightning
%defattr(-,root,root,-)
%{_libdir}/thunderbird-lightning
-%files -n thunderbird-lightning-wcap
-%defattr(-,root,root,-)
-%{_libdir}/thunderbird-lightning-wcap
-
%changelog
+* Fri Apr 11 2008 Lubomir Kundrak <lkundrak at redhat.com> 0.8-3.1
+- Linking against libxul is kind of useless for us until thunderbird uses it
+- Fix BuildRequires for RHEL
+
+* Tue Apr 08 2008 Lubomir Kundrak <lkundrak at redhat.com> 0.8-3
+- Really fix lightning dependencies (#441340)
+- Fix "da" and "it" lanugage packs (#441500)
+
+* Mon Apr 07 2008 Lubomir Kundrak <lkundrak at redhat.com> 0.8-2
+- Blacklist dependencies of lightning on files included in tb (#441340)
+- Fix the extension update scriptlet escaping
+
+* Fri Apr 04 2008 Lubomir Kundrak <lkundrak at redhat.com> 0.8-1
+- 0.8 GA
+
+* Fri Apr 04 2008 Lubomir Kundrak <lkundrak at redhat.com> 0.8-0.3.cvs20080331
+- Translations
+
+* Tue Apr 01 2008 Lubomir Kundrak <lkundrak at redhat.com> 0.8-0.2.cvs20080331
+- Unbreak dependencies (hopefully)
+- Try concurrent builds again, they seem to work now
+
+* Tue Apr 01 2008 Lubomir Kundrak <lkundrak at redhat.com> 0.8-0.1.cvs20080331
+- Corrected license tag to mention all the applicable Licenses
+- Use libxul from XULrunner
+- Post 0.8 Release Candidate 1
+- Obsolete wcap subpackage -- got merged into mainline lightning
+
* Sun Mar 09 2008 Lubomir Kundrak <lkundrak at redhat.com> 0.7-10
- Parralel makes were failing unpredictably
More information about the fedora-extras-commits
mailing list