Author: arvenil Date: Wed Sep 3 13:17:51 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 8.4.6 - added gnet bcond - packaged missing files and removed unpackaged - BR: gnet-devel - BR: xorg-lib-libXxf86vm-devel - S: gnuchess - adapter
---- Files affected: SPECS: gcompris.spec (1.38 -> 1.39) ---- Diffs: ================================================================ Index: SPECS/gcompris.spec diff -u SPECS/gcompris.spec:1.38 SPECS/gcompris.spec:1.39 --- SPECS/gcompris.spec:1.38 Wed Apr 9 09:14:58 2008 +++ SPECS/gcompris.spec Wed Sep 3 15:17:46 2008 @@ -1,19 +1,24 @@ # $Revision$, $Date$ +# +# Conditional build: +%bcond_without gnet # build without gnet support (disallow GCompris fetch content from a web server) +# Summary: Educational suite for kids 2-10 years old Summary(pl.UTF-8): Zestaw edukacyjny dla dzieci w wieku 2-10 lat Name: gcompris -Version: 8.4.2 +Version: 8.4.6 Release: 1 License: GPL v3+ Group: X11/Applications/Games Source0: http://dl.sourceforge.net/gcompris/%{name}-%{version}.tar.gz -# Source0-md5: 226508072c72c0d78a66e918ef82715d +# Source0-md5: fc8d8364b8faf77be8281d90af66a481 Patch0: %{name}-info.patch Patch1: %{name}-desktop.patch URL: http://gcompris.net/ BuildRequires: autoconf BuildRequires: automake BuildRequires: gettext-devel +BuildRequires: gnet-devel BuildRequires: gstreamer-devel BuildRequires: intltool BuildRequires: libao-devel @@ -31,8 +36,10 @@ BuildRequires: sqlite3-devel BuildRequires: tetex BuildRequires: texinfo +BuildRequires: xorg-lib-libXxf86vm-devel Requires: python-gnome-canvas Requires: python-modules +Suggests: gnuchess Obsoletes: gcompris-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -97,16 +104,17 @@ %patch1 -p1 %build -cp /usr/share/gettext/config.rpath . -glib-gettextize --copy --force -intltoolize --copy --force +cp %{_datadir}/gettext/config.rpath . +%{__glib_gettextize} +%{__intltoolize} %{__libtoolize} %{__aclocal} %{__autoconf} %{__autoheader} %{__automake} %configure \ - GNUCHESS="%{_bindir}/gnuchess" + GNUCHESS="%{_bindir}/gnuchess" \ + --%{!?with_gnet:dis}%{?with_gnet:en}able-gnet %{__make} %install @@ -120,6 +128,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la +# remove unpackaged files +rm -f $RPM_BUILD_ROOT%{_datadir}/info/dir +rm -f $RPM_BUILD_ROOT%{_prefix}/lib/menu/%{name} + %find_lang %{name} --with-gnome %clean @@ -138,17 +150,7 @@ %dir %{_libdir}/%{name} %attr(755,root,root) %{_libdir}/%{name}/lib*.so %dir %{_datadir}/gcompris -%dir %{_datadir}/gcompris/boards -%{_datadir}/gcompris/boards/[!fs]* -%{_datadir}/gcompris/boards/f[iou]* -%{_datadir}/gcompris/boards/s[cekmu]* -%dir %{_datadir}/gcompris/boards/sounds -%{_datadir}/gcompris/boards/sounds/*.wav -%{_datadir}/gcompris/boards/flags -%{_datadir}/gcompris/boards/sounds/LuneRouge -%{_datadir}/gcompris/boards/sounds/chronos -%{_datadir}/gcompris/boards/sounds/melody -%{_datadir}/gcompris/boards/sounds/memory +%{_datadir}/gcompris/boards %{_datadir}/gcompris/python %{_desktopdir}/*.desktop %{_infodir}/*.info* @@ -161,6 +163,15 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.39 2008/09/03 13:17:46 arvenil +- up to 8.4.6 +- added gnet bcond +- packaged missing files and removed unpackaged +- BR: gnet-devel +- BR: xorg-lib-libXxf86vm-devel +- S: gnuchess +- adapter + Revision 1.38 2008/04/09 07:14:58 ankry - ar_TN dir added to glibc ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gcompris.spec?r1=1.38&r2=1.39&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
