packages: gluezilla/gluezilla.spec, gluezilla/gluezilla-opt.patch (NEW), gl...

[qboosh]

Author: qboosh                       Date: Sun Sep 26 07:39:25 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.6
- added xul patch to build with final xulrunner 1.9.x
- added opt patch not to override our optflags

---- Files affected:
packages/gluezilla:
   gluezilla.spec (1.2 -> 1.3) , gluezilla-opt.patch (NONE -> 1.1)  (NEW), gluezilla-xul.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gluezilla/gluezilla.spec
diff -u packages/gluezilla/gluezilla.spec:1.2 packages/gluezilla/gluezilla.spec:1.3
--- packages/gluezilla/gluezilla.spec:1.2	Thu Jun 19 00:39:07 2008
+++ packages/gluezilla/gluezilla.spec	Sun Sep 26 09:39:20 2010
@@ -1,23 +1,27 @@
 # $Revision$, $Date$
-# FIXME: xulrunner-devel is missing sdk (libs, collected headers)
 Summary:	Library to embed Gecko for the Mono Winforms WebControl
 Summary(pl.UTF-8):	Biblioteka osadzająca Gecko dla klasy Mono Winforms WebControl
 Name:		gluezilla
-Version:	1.9.1
-Release:	0.1
+Version:	2.6
+Release:	1
 License:	LGPL v2
 Group:		Libraries
 # latest downloads summary at http://ftp.novell.com/pub/mono/sources-stable/
 Source0:	http://ftp.novell.com/pub/mono/sources/gluezilla/%{name}-%{version}.tar.bz2
-# Source0-md5:	c9d143cd531ff978da8e6b417e0d65d2
+# Source0-md5:	bd4eb89747498945227877295fcd36b5
+Patch0:		%{name}-xul.patch
+Patch1:		%{name}-opt.patch
 URL:		http://www.mono-project.com/
+BuildRequires:	autoconf >= 2.50
+BuildRequires:	automake
 BuildRequires:	gtk+2-devel >= 1:2.0
 BuildRequires:	libstdc++-devel
+BuildRequires:	libtool >= 2:1.5
 BuildRequires:	mono-devel
 BuildRequires:	nspr-devel
 BuildRequires:	nss-devel
 BuildRequires:	pkgconfig
-BuildRequires:	xulrunner-devel >= 1.8
+BuildRequires:	xulrunner-devel >= 1.9
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -34,21 +38,18 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure
 
-# FIXME:
-# all needed headers are present (symlinked?) in sdk/include dir (missing in xulrunner-devel)
-# libxpcomglue is missing in xulrunner-devel (present in sdk/lib subdir of xulrunner dist dir)
-base=$(pkg-config --variable=includedir xulrunner-xpcom)
-flags="%{rpmcxxflags}"
-for d in dom embed_base necko pipboot pipnss pref shistory uriloader webbrwsr windowwatcher ; do
-	flags="$flags -I$base/$d"
-done
-%{__make} \
-	AM_CXXFLAGS="$flags" \
-	AM_LDFLAGS="-L../../xulrunner-1.8.1.14/mozilla/dist/sdk/lib"
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -56,7 +57,7 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/libgluezilla.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgluezilla.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -66,8 +67,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README TODO
-# LICENSE missing in tarball
+%doc AUTHORS ChangeLog LICENSE README TODO
 %attr(755,root,root) %{_libdir}/libgluezilla.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgluezilla.so.0
 # should be -avoid-version?
@@ -79,6 +79,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2010/09/26 07:39:20  qboosh
+- updated to 2.6
+- added xul patch to build with final xulrunner 1.9.x
+- added opt patch not to override our optflags
+
 Revision 1.2  2008/06/18 22:39:07  qboosh
 - up to 1.9.1
 

================================================================
Index: packages/gluezilla/gluezilla-opt.patch
diff -u /dev/null packages/gluezilla/gluezilla-opt.patch:1.1
--- /dev/null	Sun Sep 26 09:39:25 2010
+++ packages/gluezilla/gluezilla-opt.patch	Sun Sep 26 09:39:20 2010
@@ -0,0 +1,21 @@
+--- gluezilla-2.6/configure.ac.orig	2010-09-26 09:07:15.876564006 +0200
++++ gluezilla-2.6/configure.ac	2010-09-26 09:20:36.648559815 +0200
+@@ -142,15 +142,15 @@
+ 	user_set_cxxflags=yes
+ fi
+ 
+-#if test "$user_set_cxxflags" != yes; then
+-	autoconf_default_CXXFLAGS="$CXXFLAGS"
++autoconf_default_CXXFLAGS="$CXXFLAGS"
++if test "$user_set_cxxflags" != yes; then
+ 	CXXFLAGS=""
+ 	if test "x${optimize}" == xno ; then
+ 		autoconf_default_CXXFLAGS="-g3"
+ 	else
+ 		autoconf_default_CXXFLAGS="-g -O2"
+ 	fi
+-#fi
++fi
+ 
+ AC_SUBST(autoconf_default_CXXFLAGS)
+ 

================================================================
Index: packages/gluezilla/gluezilla-xul.patch
diff -u /dev/null packages/gluezilla/gluezilla-xul.patch:1.1
--- /dev/null	Sun Sep 26 09:39:25 2010
+++ packages/gluezilla/gluezilla-xul.patch	Sun Sep 26 09:39:20 2010
@@ -0,0 +1,11 @@
+--- gluezilla-2.6/configure.ac.orig	2009-09-25 18:03:05.000000000 +0200
++++ gluezilla-2.6/configure.ac	2010-09-26 09:05:23.548564006 +0200
+@@ -88,7 +88,7 @@
+ 	if test "x${oldxul}" != xyes ; then
+ 
+ 		AC_MSG_CHECKING(Mozilla XPCOM > 1.8)
+-		mozilla_xpcom_pcs="libxul-embedding-unstable"
++		mozilla_xpcom_pcs="libxul-embedding"
+ 		for pc in $mozilla_xpcom_pcs; do
+ 			if $PKG_CONFIG --exists $pc; then
+ 				AC_MSG_RESULT($pc)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gluezilla/gluezilla.spec?r1=1.2&r2=1.3&f=u