rpms/sunbird/devel .cvsignore, 1.3, 1.4 find-external-requires, 1.1, 1.2 sources, 1.3, 1.4 sunbird.spec, 1.4, 1.5

[Lubomir Kundrak (lkundrak)]

Author: lkundrak

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

Modified Files:
	.cvsignore find-external-requires sources sunbird.spec 
Log Message:
* 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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Apr 2008 20:57:02 -0000	1.3
+++ .cvsignore	3 Apr 2008 16:47:28 -0000	1.4
@@ -1,2 +1,2 @@
-sunbird-langpacks-0.7.tar.gz
 sunbird-0.8.cvs20080331.tar.gz
+sunbird-langpacks-0.7.tar.gz


Index: find-external-requires
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/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:49:15 -0000	1.1
+++ find-external-requires	3 Apr 2008 16:47:28 -0000	1.2
@@ -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: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Apr 2008 20:57:02 -0000	1.3
+++ sources	3 Apr 2008 16:47:28 -0000	1.4
@@ -1,2 +1,2 @@
-6de364aa11992f2e5d3e714592913c3c  sunbird-langpacks-0.7.tar.gz
 1c1f620ac35452b7649cdc0a4bb78d23  sunbird-0.8.cvs20080331.tar.gz
+6de364aa11992f2e5d3e714592913c3c  sunbird-langpacks-0.7.tar.gz


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/devel/sunbird.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sunbird.spec	1 Apr 2008 20:57:02 -0000	1.4
+++ sunbird.spec	3 Apr 2008 16:47:28 -0000	1.5
@@ -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,10 @@
 
 
 %changelog
+* 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