rpms/sunbird/devel .cvsignore, 1.6, 1.7 find-external-requires, 1.6, 1.7 sources, 1.6, 1.7 sunbird.spec, 1.11, 1.12
Lubomir Rintel (lkundrak)
fedora-extras-commits at redhat.com
Sun Aug 10 19:35:10 UTC 2008
Author: lkundrak
Update of /cvs/pkgs/rpms/sunbird/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4896
Modified Files:
.cvsignore find-external-requires sources sunbird.spec
Log Message:
* Sun Aug 10 2008 Lubomir Rintel <lkundrak at v3.sk> 0.9-0.1.20080807cvs
- First attempt at 0.9, CVS snapshot close to first RC
- Rewrite the requires generation, for it suffered bitrot
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 4 Apr 2008 16:36:34 -0000 1.6
+++ .cvsignore 10 Aug 2008 19:34:40 -0000 1.7
@@ -1,2 +1 @@
-lightning-sunbird-0.8-source.tar.bz2
-sunbird-langpacks-0.8.tar.gz
+sunbird-0.9pre.tar.gz
Index: find-external-requires
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/find-external-requires,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- find-external-requires 8 Apr 2008 20:00:47 -0000 1.6
+++ find-external-requires 10 Aug 2008 19:34:40 -0000 1.7
@@ -1,48 +1,23 @@
#!/bin/sh
+# Strips requirements that are against the package itself, since we
+# do not autoprovide them (for that we don't override gecko-devel's provides)
-# Finds requirements provided outside of the current file set
+# Lubomir Rintel <lkundrak at v3.sk>
-FIND_PROVIDES=$(rpm --eval %__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"
-
-filelist=$(sed "s/[]['\"*?{}]/\\\\\&/g")
-provides=$(echo $filelist | $FIND_PROVIDES)
-
-{
-for f in $filelist ; 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
- fi
- done
- if [ "$found" = "0" ]; then
- echo $req
- fi
- done
-done
-} | sort -u
+# This should be called with the real build root as argument, so that
+# we will be able to strip dependencies of lightning on what would be
+# provided by sunbird.
+
+FIND_PROVIDES="$(rpm --eval %__find_provides)"
+FIND_REQUIRES="$(rpm --eval %__find_requires)"
+RPM_BUILD_ROOT="$1"
+
+(
+ # Assume all ur subpackages require everything that all our
+ # subpackages provide (actually it's not true,
+ # this is just to prevent depending on it), thus print twice
+ find $RPM_BUILD_ROOT |$FIND_PROVIDES |awk '{print; print}'
+ # Add this subpackage's requires
+ $FIND_REQUIRES
+# What wasn't mentioned twice is an external dependency
+) |sort |uniq -u
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 4 Apr 2008 16:36:34 -0000 1.6
+++ sources 10 Aug 2008 19:34:40 -0000 1.7
@@ -1,2 +1 @@
-b432234e9a2b04710543df72ed88e383 lightning-sunbird-0.8-source.tar.bz2
-979b858b93225c30f3960c88222ad205 sunbird-langpacks-0.8.tar.gz
+5aa8ae209704276194ba465d8bcf1af5 sunbird-0.9pre.tar.gz
Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sunbird.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sunbird.spec 19 May 2008 12:57:13 -0000 1.11
+++ sunbird.spec 10 Aug 2008 19:34:40 -0000 1.12
@@ -3,21 +3,21 @@
%{?_with_official:%define official 1}
Name: sunbird
-Version: 0.8
-Release: 4%{?dist}
+Version: 0.9
+Release: 0.1.20080807cvs%{?dist}
Summary: Mozilla Sunbird Calendar
Group: Applications/Productivity
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
+Source0: sunbird-0.9pre.tar.gz
+#http://releases.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/%{version}/source/lightning-sunbird-%{version}-source.tar.bz2
Source1: sunbird.desktop
Source2: sunbird-langpacks-0.8.tar.gz
Source3: mozilla-extension-update.sh
Source100: find-external-requires
# build patches
-Patch1: sunbird-0.3.1-link-layout.patch
Patch2: sunbird-0.7-path.patch
Patch3: sunbird-0.7-uilocale.patch
@@ -31,13 +31,12 @@
BuildRequires: freetype-devel >= 2.1.9
BuildRequires: libXt-devel
BuildRequires: desktop-file-utils
-BuildRequires: xulrunner-devel
Requires(pre): desktop-file-utils
AutoProv: 0
%define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE100}
+%define __find_requires %{SOURCE100} %{buildroot}
%description
Mozilla Sunbirdâ„¢ is a cross-platform calendar application, built upon
@@ -71,7 +70,6 @@
%prep
%setup -q -n mozilla
-%patch1 -p1 -b .link-layout
%patch2 -p1 -b .path
%patch3 -p1 -b .uilocale
# Fix source perms to avoid errors in the debuginfo RPM (bug 357661)
@@ -117,9 +115,8 @@
ac_add_options --enable-extensions=default,lightning
ac_add_options --disable-updater
ac_add_options --disable-crashreporter
-ac_add_options --with-libxul-sdk="$(pkg-config --variable=sdkdir libxul)"
EOF
-make -f client.mk build
+make -f client.mk MOZ_CAIRO_LIBS='-lcairo -lX11 -lXrender' build
# make package directory
make -C xpinstall/packager STRIP=/bin/true
@@ -256,6 +253,10 @@
%changelog
+* Sun Aug 10 2008 Lubomir Rintel <lkundrak at v3.sk> 0.9-0.1.20080807cvs
+- First attempt at 0.9, CVS snapshot close to first RC
+- Rewrite the requires generation, for it suffered bitrot
+
* Mon May 19 2008 Lubomir Rintel <lkundrak at v3.sk> 0.8-4
- Rebuild for new hunspell
More information about the fedora-extras-commits
mailing list