rpms/sunbird/devel find-external-requires, 1.5, 1.6 sunbird.spec, 1.9, 1.10
Lubomir Kundrak (lkundrak)
fedora-extras-commits at redhat.com
Tue Apr 8 20:01:30 UTC 2008
- Previous message (by thread): rpms/system-config-lvm/devel .cvsignore, 1.22, 1.23 sources, 1.24, 1.25
- Next message (by thread): rpms/pungi/devel .cvsignore, 1.45, 1.46 pungi.spec, 1.48, 1.49 sources, 1.46, 1.47
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: lkundrak
Update of /cvs/pkgs/rpms/sunbird/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20277/devel
Modified Files:
find-external-requires sunbird.spec
Log Message:
* 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)
Index: find-external-requires
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/find-external-requires,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- find-external-requires 7 Apr 2008 19:48:40 -0000 1.5
+++ find-external-requires 8 Apr 2008 20:00:47 -0000 1.6
@@ -1,7 +1,6 @@
#!/bin/sh
# Finds requirements provided outside of the current file set
-# $Id$
FIND_PROVIDES=$(rpm --eval %__find_provides)
@@ -15,12 +14,13 @@
{
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 "($(echo \
+ echo $req | egrep -q "($(echo \
libgfxpsshar.so \
libgkgfx.so \
libgtkembedmoz.so \
@@ -35,7 +35,6 @@
sed 's/ /|/g'))" &&
found=1
- found=0
for p in $provides ; do
if [ "$req" = "$p" ]; then
found=1
Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sunbird.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sunbird.spec 7 Apr 2008 19:48:40 -0000 1.9
+++ sunbird.spec 8 Apr 2008 20:00:47 -0000 1.10
@@ -4,7 +4,7 @@
Name: sunbird
Version: 0.8
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Mozilla Sunbird Calendar
Group: Applications/Productivity
@@ -176,6 +176,9 @@
mkdir -p $extensiondir
unzip $langpack -d $extensiondir
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
# Lightning
@@ -253,6 +256,10 @@
%changelog
+* 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
- Previous message (by thread): rpms/system-config-lvm/devel .cvsignore, 1.22, 1.23 sources, 1.24, 1.25
- Next message (by thread): rpms/pungi/devel .cvsignore, 1.45, 1.46 pungi.spec, 1.48, 1.49 sources, 1.46, 1.47
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list