SPECS: google-gadgets-for-linux.spec - move to cmake - needs cmake patch - ...

[cactus]

Author: cactus                       Date: Wed Nov 19 00:29:44 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- move to cmake
- needs cmake patch
- does not build on x86_64 because of xulrunner-devel ? - see TODO
- works with kde4-kdebase-workspace

---- Files affected:
SPECS:
   google-gadgets-for-linux.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SPECS/google-gadgets-for-linux.spec
diff -u SPECS/google-gadgets-for-linux.spec:1.8 SPECS/google-gadgets-for-linux.spec:1.9
--- SPECS/google-gadgets-for-linux.spec:1.8	Tue Nov 11 01:15:31 2008
+++ SPECS/google-gadgets-for-linux.spec	Wed Nov 19 01:29:39 2008
@@ -3,9 +3,18 @@
 # - add gtk BRs
 # - configure: WARNING: Library SpiderMonkey is not available, smjs-script-runtime extension won't be built.
 # - update desc
+# - from xulrunner-devel on x86_64 : 
+# In file included from /home/users/uzi/rpm/BUILD/google-gadgets-for-linux-0.10.3/extensions/gtkmoz_browser_element/browser_child.cc:67:                                             
+# /usr/include/xulrunner/stable/nsStringAPI.h: In function 'const nsDependentSubstring_external Substring(const PRUnichar*, const PRUnichar*)':                                      
+# /usr/include/xulrunner/stable/nsStringAPI.h:1271: error: conversion to 'PRUint32' from 'long int' may alter its value                                                              
+# /usr/include/xulrunner/stable/nsStringAPI.h: In function 'const nsDependentCSubstring_external Substring(const char*, const char*)':                                               
+# /usr/include/xulrunner/stable/nsStringAPI.h:1309: error: conversion to 'PRUint32' from 'long int' may alter its value                                                              
+# make[2]: *** [extensions/gtkmoz_browser_element/CMakeFiles/gtkmoz-browser-child.dir/browser_child.o] Error 1                                                                       
+# make[1]: *** [extensions/gtkmoz_browser_element/CMakeFiles/gtkmoz-browser-child.dir/all] Error 2                                                                                   
+# make: *** [all] Error 2                                                                                                                                                            
 #
 # 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
@@ -15,13 +24,14 @@
 Summary:	google-gadgets-for-linux
 Name:		google-gadgets-for-linux
 Version:	0.10.3
-Release:	0.2
+Release:	0.3
 License:	Apache License v2.0
 Group:		X11/Applications
 Source0:	http://google-gadgets-for-linux.googlecode.com/files/%{name}-%{version}.tar.bz2
 # Source0-md5:	16d2cc4fe05e4416d3b720090237520b
 Source1:	%{name}-gtk.desktop
 Source2:	%{name}-qt.desktop
+Patch0:		%{name}-cmake.patch
 URL:		http://code.google.com/p/google-gadgets-for-linux/
 BuildRequires:	QtCore-devel >= 4.3
 BuildRequires:	QtScript-devel >= 4.3
@@ -29,14 +39,18 @@
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1.9.6
 BuildRequires:	curl-devel >= 7.18.2
+BuildRequires:	cmake >= 2.6.0
 BuildRequires:	dbus-devel >= 1.0.2
 BuildRequires:	flex
 BuildRequires:	gstreamer-plugins-base-devel >= 0.10.0
 BuildRequires:	libltdl-devel
 BuildRequires:	libtool >= 1.5.22
 BuildRequires:	libxml2-devel >= 2.4.0
-BuildRequires:	sed >= 4.0
+BuildRequires:	pkgconfig
 BuildRequires:	xulrunner-devel >= 1.8
+%ifarch %{x8664}
+BuildConflicts: 	xulrunner-devel
+%endif
 BuildRequires:	zip
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -81,33 +95,27 @@
 
 %prep
 %setup -q
-# little hack for xulrunner
-%{__sed} -i "s/PREDEFINED_MACROS)/& -I\/usr\/include\/xulrunner\/gtkembedmoz -I\/usr\/include\/xulrunner\/js -I\/usr\/include\/xulrunner\/xpcom /" extensions/gtkmoz_browser_element/Makefile.am
-mkdir -p build
+%patch0 -p1
+mkdir build
 
 %build
-# with our configure macro there are lots of unused variable errors (-Wall -Werror -D_something=2)
-export CC='%{__cc}'
-export CXX='%{__cxx}'
-export CXXFLAGS='%{rpmcxxflags}'
-%{__libtoolize}
-%{__aclocal} -I autotools
-%{__autoconf}
-%{__autoheader}
-%{__automake}
 cd build
-../configure \
-	--prefix=%{_prefix} \
-	--%{?with_debug:en}%{!?with_debug:dis}able-debug
-%{__make}
+%cmake \
+	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+	-DSYSCONF_INSTALL_DIR=%{_sysconfdir} \
+%if "%{_lib}" == "lib64"
+	-DLIB_SUFFIX=64 \
+%endif
+	../
+
+%{__make} -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
-cd build
-%{__make} install \
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 # desktop files
@@ -123,7 +131,7 @@
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
-%{_datadir}/mime/packages/00-google-gadgets.xml
+%{_datadir}/mime/packages/google-gadgets.xml
 %dir %{_datadir}/%{realname}
 %{_datadir}/%{realname}/*.gg
 %{_desktopdir}/*.desktop
@@ -172,6 +180,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2008/11/19 00:29:39  cactus
+- move to cmake
+- needs cmake patch
+- does not build on x86_64 because of xulrunner-devel ? - see TODO
+- works with kde4-kdebase-workspace
+
 Revision 1.8  2008/11/11 00:15:31  cactus
 - up to 0.10.3
 
================================================================

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