Author: shadzik Date: Thu Dec 18 01:51:26 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - reverted back to autotools (better supported than cmake) - BR: autoconf and automake - compiles, runs... the whole "show" now on 64bit too
---- Files affected: SPECS: google-gadgets.spec (1.26 -> 1.27) ---- Diffs: ================================================================ Index: SPECS/google-gadgets.spec diff -u SPECS/google-gadgets.spec:1.26 SPECS/google-gadgets.spec:1.27 --- SPECS/google-gadgets.spec:1.26 Wed Dec 17 01:50:03 2008 +++ SPECS/google-gadgets.spec Thu Dec 18 02:51:20 2008 @@ -15,7 +15,7 @@ Summary: Google Gadgets for Linux Name: google-gadgets Version: 0.10.4 -Release: 2 +Release: 3 License: Apache License v2.0 Group: X11/Applications Source0: http://google-gadgets-for-linux.googlecode.com/files/%{name}-for-linux-%{version}.tar.bz2 @@ -32,13 +32,15 @@ BuildRequires: QtScript-devel >= 4.4.3 BuildRequires: QtWebKit-devel >= 4.4.3 %endif +BuildRequires: autoconf +BuildRequires: automake %if %{with gtk} BuildRequires: cairo-devel >= 1.2.0 BuildRequires: gtk+2-devel >= 2:2.10.0 BuildRequires: startup-notification-devel %endif BuildRequires: NetworkManager-devel >= 0.6.5 -BuildRequires: cmake >= 2.6.1-2 +#BuildRequires: cmake >= 2.6.1-2 BuildRequires: curl-devel >= 7.18.2 BuildRequires: dbus-devel >= 1.0.2 BuildRequires: flex @@ -202,16 +204,18 @@ %patch2 -p1 %build -install -d build -cd build -%cmake \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DSYSCONF_INSTALL_DIR=%{_sysconfdir} \ - -DGTKMOZEMBED_CFLAGS='-I$EMBED_INCDIR/js -I$EMBED_INCDIR/string' \ -%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} @@ -219,7 +223,7 @@ 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 @@ -370,6 +374,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.27 2008/12/18 01:51:20 shadzik +- reverted back to autotools (better supported than cmake) +- BR: autoconf and automake +- compiles, runs... the whole "show" now on 64bit too + Revision 1.26 2008/12/17 00:50:03 glen - ggl-designer invokes ggl-gtk ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/google-gadgets.spec?r1=1.26&r2=1.27&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
