rpms/sunbird/devel find-external-requires, 1.1, 1.1.2.1 sunbird.spec, 1.4, 1.4.2.1

[Lubomir Kundrak (lkundrak)]

Author: lkundrak

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

Modified Files:
      Tag: sunbird-0_8-0_1_cvs20080331_test_dep
	find-external-requires sunbird.spec 
Log Message:
try to fix reqprov


Index: find-external-requires
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/find-external-requires,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- find-external-requires	19 Feb 2008 17:49:15 -0000	1.1
+++ find-external-requires	3 Apr 2008 13:45:41 -0000	1.1.2.1
@@ -1,14 +1,20 @@
-#!/bin/sh
+#!/bin/sh -x
 
 # Finds requirements provided outside of the current file set
+# $Id$
 
-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)
+
+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
 		for p in $provides ; do
 			if [ "$req" = "$p" ]; then
@@ -20,4 +26,4 @@
 		fi
 	done
 done
-} | sort -u
\ No newline at end of file
+} | sort -u


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sunbird.spec,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- sunbird.spec	1 Apr 2008 20:57:02 -0000	1.4
+++ sunbird.spec	3 Apr 2008 13:45:41 -0000	1.4.2.1
@@ -6,7 +6,7 @@
 
 Name:           sunbird
 Version:        0.8
-Release:        0.1.%{snapshot}
+Release:        0.2.%{snapshot}%{?dist}
 Summary:        Mozilla Sunbird Calendar
 
 Group:          Applications/Productivity
@@ -94,6 +94,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}
@@ -255,6 +256,9 @@
 
 
 %changelog
+* Tue Apr 01 2008 Lubomir Kundrak <lkundrak at redhat.com> 0.8-0.2.cvs20080331
+- Fix dependencies
+
 * 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