rpms/sunbird/devel find-external-requires, 1.3, 1.4 sunbird.spec, 1.7, 1.8

[Lubomir Kundrak (lkundrak)]

Author: lkundrak

Update of /cvs/pkgs/rpms/sunbird/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18158/devel

Modified Files:
	find-external-requires sunbird.spec 
Log Message:
* Mon Apr 07 2008 Lubomir Kundrak <lkundrak at redhat.com> 0.8-2
- Blacklist dependencies of lightning on files included in thunderbird
- Fix the extension update scriptlet escaping


Index: find-external-requires
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/find-external-requires,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- find-external-requires	3 Apr 2008 16:59:58 -0000	1.3
+++ find-external-requires	7 Apr 2008 19:41:56 -0000	1.4
@@ -15,6 +15,26 @@
 {
 for f in $filelist ; do
 	echo $f | $FIND_REQUIRES | while read req ; do
+
+		# 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	\
+				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
+
 		found=0
 		for p in $provides ; do
 			if [ "$req" = "$p" ]; then


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sunbird.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sunbird.spec	4 Apr 2008 16:36:34 -0000	1.7
+++ sunbird.spec	7 Apr 2008 19:41:56 -0000	1.8
@@ -4,7 +4,7 @@
 
 Name:           sunbird
 Version:        0.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Mozilla Sunbird Calendar
 
 Group:          Applications/Productivity
@@ -60,12 +60,12 @@
 
 %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                    \
+%define tbupdate_lightning                                      \\\
+  %{_libdir}/thunderbird-lightning/mozilla-extension-update.sh  \\\
+  --appname thunderbird                                         \\\
+  --extname %{lightning_extname}                                \\\
+  --basedir %{_libdir}                                          \\\
+  --extpath %{_libdir}/thunderbird-lightning                    \\\
   --action 
 
 
@@ -253,6 +253,10 @@
 
 
 %changelog
+* Mon Apr 07 2008 Lubomir Kundrak <lkundrak at redhat.com> 0.8-2
+- Blacklist dependencies of lightning on files included in thunderbird
+- Fix the extension update scriptlet escaping
+
 * Fri Apr 04 2008 Lubomir Kundrak <lkundrak at redhat.com> 0.8-1
 - 0.8 GA