SPECS: google-gadgets-for-linux.spec - back to cmake - add -qt and -gtk sub...

[shadzik]

Author: shadzik                      Date: Tue Dec 16 20:36:18 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- back to cmake
- add -qt and -gtk subpackages
- rel 1

---- Files affected:
SPECS:
   google-gadgets-for-linux.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: SPECS/google-gadgets-for-linux.spec
diff -u SPECS/google-gadgets-for-linux.spec:1.20 SPECS/google-gadgets-for-linux.spec:1.21
--- SPECS/google-gadgets-for-linux.spec:1.20	Tue Dec 16 21:03:22 2008
+++ SPECS/google-gadgets-for-linux.spec	Tue Dec 16 21:36:12 2008
@@ -16,7 +16,7 @@
 Summary:	google-gadgets-for-linux
 Name:		google-gadgets-for-linux
 Version:	0.10.4
-Release:	0.1
+Release:	1
 License:	Apache License v2.0
 Group:		X11/Applications
 #Source0:	%{name}-%{version}-%{rev}.tar.bz2
@@ -85,6 +85,22 @@
 %description static -l pl.UTF-8
 Statyczne biblioteki google-gadgets.
 
+%package qt
+Summary:	Qt Runtime Environment
+Group:		X11/Applications
+Requires:	%{name} = %{version}-%{release}
+
+%description qt
+Qt runtime environment.
+
+%package gtk
+Summary:	GTK Runtime Environment
+Group:		X11/Applications
+Requires:	%{name} = %{version}-%{release}
+
+%description gtk
+GTK runtime environment.
+
 %prep
 %setup -q
 find -name '.svn' | xargs rm -rf
@@ -93,25 +109,24 @@
 %patch2 -p1
 
 %build
-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
+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
+	../
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
-%{__make} install \
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 # desync with cmake/ac makefiles
@@ -130,20 +145,28 @@
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
 %{_datadir}/mime/packages/google-gadgets.xml
 %dir %{_datadir}/%{realname}
 %{_datadir}/%{realname}/*.gg
-%{_desktopdir}/*.desktop
+%{_desktopdir}/ggl-designer.desktop
 %{_iconsdir}/*/*/*/*.png
 %{_pixmapsdir}/%{realname}.png
-
 %attr(755,root,root) %{_libdir}/*.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/*.so.0
 %attr(755,root,root) %{_libdir}/%{realname}/gtkmoz-browser-child
 %dir %{_libdir}/%{realname}
 %dir %{_libdir}/%{realname}/modules
 
+%files qt 
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/ggl-qt
+%{_desktopdir}/ggl-qt.desktop
+
+%files gtk
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/ggl-gtk
+%{_desktopdir}/ggl-gtk.desktop
+
 %files gadgets
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{realname}/modules/*.so
@@ -181,6 +204,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2008/12/16 20:36:12  shadzik
+- back to cmake
+- add -qt and -gtk subpackages
+- rel 1
+
 Revision 1.20  2008/12/16 20:03:22  glen
 - my md5
 
================================================================

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