Author: shadzik Date: Wed Nov 19 00:55:13 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- try to fix this mess
- BR: librsvg-devel
- update Qt BRs (qt 4.3 is defenitely not enough)
- no mkdir in %prep
- no BC for xulrunner on x86_64 (builds fine)
- for now comment out -static subpackge as there're no static BRs
---- Files affected:
SPECS:
google-gadgets-for-linux.spec (1.9 -> 1.10)
---- Diffs:
================================================================
Index: SPECS/google-gadgets-for-linux.spec
diff -u SPECS/google-gadgets-for-linux.spec:1.9
SPECS/google-gadgets-for-linux.spec:1.10
--- SPECS/google-gadgets-for-linux.spec:1.9 Wed Nov 19 01:29:39 2008
+++ SPECS/google-gadgets-for-linux.spec Wed Nov 19 01:55:08 2008
@@ -3,16 +3,6 @@
# - 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_without gtk # without gtk support
@@ -33,24 +23,20 @@
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
-BuildRequires: QtWebKit-devel >= 4.3
-BuildRequires: autoconf >= 2.59
-BuildRequires: automake >= 1.9.6
+BuildRequires: QtCore-devel >= 4.4.3
+BuildRequires: QtScript-devel >= 4.4.3
+BuildRequires: QtWebKit-devel >= 4.4.3
BuildRequires: curl-devel >= 7.18.2
-BuildRequires: cmake >= 2.6.0
+BuildRequires: cmake >= 2.6.1-2
BuildRequires: dbus-devel >= 1.0.2
BuildRequires: flex
BuildRequires: gstreamer-plugins-base-devel >= 0.10.0
BuildRequires: libltdl-devel
+BuildRequires: librsvg-devel
BuildRequires: libtool >= 1.5.22
BuildRequires: libxml2-devel >= 2.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)
@@ -96,9 +82,9 @@
%prep
%setup -q
%patch0 -p1
-mkdir build
%build
+install -d build
cd build
%cmake \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
@@ -108,7 +94,7 @@
%endif
../
-%{__make} -C build
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
@@ -166,13 +152,12 @@
%{_includedir}/%{realname}/ggadget/js/*.h
%dir %{_includedir}/%{realname}/ggadget/xdg
%{_includedir}/%{realname}/ggadget/xdg/*.h
-%{_libdir}/*.la
%attr(755,root,root) %{_libdir}/*.so
%{_pkgconfigdir}/*.pc
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+#%files static
+#%defattr(644,root,root,755)
+#%{_libdir}/lib*.a
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -180,6 +165,14 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.10 2008/11/19 00:55:08 shadzik
+- try to fix this mess
+- BR: librsvg-devel
+- update Qt BRs (qt 4.3 is defenitely not enough)
+- no mkdir in %prep
+- no BC for xulrunner on x86_64 (builds fine)
+- for now comment out -static subpackge as there're no static BRs
+
Revision 1.9 2008/11/19 00:29:39 cactus
- move to cmake
- needs cmake patch
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/google-gadgets-for-linux.spec?r1=1.9&r2=1.10&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
