SPECS: google-gadgets-for-linux.spec - switch back to automake (at least i ...

[glen]

Author: glen                         Date: Tue Dec 16 08:14:25 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- switch back to automake (at least i can patch it)
- fix smjs-script-runtime
- cmake patches need review, but it works now here

---- Files affected:
SPECS:
   google-gadgets-for-linux.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: SPECS/google-gadgets-for-linux.spec
diff -u SPECS/google-gadgets-for-linux.spec:1.16 SPECS/google-gadgets-for-linux.spec:1.17
--- SPECS/google-gadgets-for-linux.spec:1.16	Tue Dec 16 00:23:21 2008
+++ SPECS/google-gadgets-for-linux.spec	Tue Dec 16 09:14:19 2008
@@ -1,25 +1,22 @@
 # $Revision$, $Date$
 # use this to get latest rev:
-# svn checkout http://google-gadgets-for-linux.googlecode.com/svn/trunk/ google-gadgets-for-linux-read-only
+# svn export http://google-gadgets-for-linux.googlecode.com/svn/trunk/ google-gadgets-for-linux
 # TODO:
 # - add gtk BRs
-# - smjs-script-runtime.so: undefined symbol: _ZN7ggadget2js14MassageJScriptEPKcbS2_i
-# c++filt _ZN7ggadget2js14MassageJScriptEPKcbS2_i
-# ggadget::js::MassageJScript(char const*, bool, char const*, int)
 # - update desc
 # Conditional build:
-#%bcond_with	debug	# build with debug
+#% bcond_with	debug	# build with debug
 #% bcond_without	gtk	# without gtk support
 #% bcond_without	qt	# without qt support
 #% bcond_without	gadgets	# without gadgets
 
 %define		realname	google-gadgets
 %define		rev	r1028
-#
+%define		rel	1.1
 Summary:	google-gadgets-for-linux
 Name:		google-gadgets-for-linux
 Version:	0.10.4
-Release:	0.%{rev}.1
+Release:	0.%{rev}.%{rel}
 License:	Apache License v2.0
 Group:		X11/Applications
 Source0:	%{name}-%{version}-%{rev}.tar.bz2
@@ -28,6 +25,7 @@
 Source2:	%{name}-qt.desktop
 Patch0:		%{name}-cmake.patch
 Patch1:		%{name}-link_with_qtnetwork.patch
+Patch2:		%{name}-js.patch
 URL:		http://code.google.com/p/google-gadgets-for-linux/
 BuildRequires:	QtCore-devel >= 4.4.3
 BuildRequires:	QtNetwork-devel >= 4.4.3
@@ -91,32 +89,38 @@
 find -name '.svn' | xargs rm -rf
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
-install -d build
-cd build
-%cmake \
-	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-	-DSYSCONF_INSTALL_DIR=%{_sysconfdir} \
-%if "%{_lib}" == "lib64"
-	-DLIB_SUFFIX=64 \
-%endif
-	../
-
+install -d libltdl
+%{__libtoolize}
+%{__aclocal} -I autotools
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+	--disable-ltdl-install \
+	--disable-static \
+	--disable-werror \
+	--with-oem-brand=pld-linux \
+	--with-browser-plugins-dir=%{_libdir}/browser-plugins
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
-%{__make} -C build install \
+%{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# desync with cmake/ac makefiles
+mv $RPM_BUILD_ROOT%{_datadir}/mime/packages/{00-,}google-gadgets.xml
 # desktop files
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/ggl-gtk.desktop
 install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/ggl-qt.desktop
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/google-gadgets/modules/smjs-script-runtime.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -176,6 +180,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2008/12/16 08:14:19  glen
+- switch back to automake (at least i can patch it)
+- fix smjs-script-runtime
+- cmake patches need review, but it works now here
+
 Revision 1.16  2008/12/15 23:23:21  glen
 - get rid of .svn dirs (next time exclude .svn please from tarball)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/google-gadgets-for-linux.spec?r1=1.16&r2=1.17&f=u