SPECS: gok.spec - updated to 1.2.5 - desktop patch applied upstrea...

[megabajt]

Author: megabajt                     Date: Fri Jun  1 20:22:51 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 1.2.5
- desktop patch applied upstream
- added apidocs bcond

---- Files affected:
SPECS:
   gok.spec (1.62 -> 1.63) 

---- Diffs:

================================================================
Index: SPECS/gok.spec
diff -u SPECS/gok.spec:1.62 SPECS/gok.spec:1.63
--- SPECS/gok.spec:1.62	Thu Mar 15 14:13:03 2007
+++ SPECS/gok.spec	Fri Jun  1 22:22:46 2007
@@ -1,40 +1,45 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	apidocs		# disable gtk-doc
+#
 Summary:	GNOME Onscreen Keyboard
 Summary(pl.UTF-8):	Klawiatura na ekranie dla GNOME
 Name:		gok
-Version:	1.2.3
+Version:	1.2.5
 Release:	1
 License:	LGPL v2+
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/gnome/sources/gok/1.2/%{name}-%{version}.tar.bz2
-# Source0-md5:	1ef0a71467936c5a2e08963b51a4e75c
-Patch0:		%{name}-desktop.patch
+# Source0-md5:	2ef1f171385a37f93408dbca7ecfdf11
 URL:		http://www.gok.ca/
 BuildRequires:	ORBit2-devel >= 1:2.14.7
-BuildRequires:	at-spi-devel >= 1.18.0
+BuildRequires:	at-spi-devel >= 1.18.1
 BuildRequires:	atk-devel >= 1:1.18.0
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	esound-devel >= 0.2.37
 BuildRequires:	gail-devel >= 1.18.0
 BuildRequires:	gettext-devel
-BuildRequires:	gnome-common >= 2.12.0
+BuildRequires:	gnome-common >= 2.18.0
 BuildRequires:	gnome-speech-devel >= 0.4.10
 BuildRequires:	gtk+2-devel >= 2:2.10.10
-BuildRequires:	gtk-doc >= 1.8
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.8}
 BuildRequires:	intltool >= 0.35.5
 BuildRequires:	libbonobo-devel >= 2.18.0
 BuildRequires:	libglade2-devel >= 1:2.6.0
 BuildRequires:	libgnomeui-devel >= 2.18.1
 BuildRequires:	libtool
-BuildRequires:	libwnck-devel >= 2.18.0
-BuildRequires:	libxml2-devel >= 1:2.6.27
+BuildRequires:	libwnck-devel >= 2.18.2
+BuildRequires:	libxml2-devel >= 1:2.6.28
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	scrollkeeper >= 0.3.14
 BuildRequires:	xorg-lib-libXevie-devel
 BuildRequires:	xorg-lib-libXi-devel
 Requires(post,preun):	GConf2
+Requires(post,postun):	gtk+2 >= 2:2.10.10
+Requires(post,postun):	hicolor-icon-theme
 Requires:	libgnomeui >= 2.18.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -75,7 +80,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 cp /usr/share/gnome-common/data/omf.make .
@@ -88,7 +92,7 @@
 %configure \
 	--with-html-dir=%{_gtkdocdir} \
 	--disable-schemas-install \
-	--enable-gtk-doc
+	--%{?with_apidocs:en}%{!?with_apidocs:dis}able-gtk-doc
 %{__make}
 
 %install
@@ -98,6 +102,8 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
+%{!?with_apidocs:rm -rf $RPM_BUILD_ROOT%{_gtkdocdir}}
+
 %find_lang %{name} --with-gnome
 
 %clean
@@ -105,25 +111,32 @@
 
 %post
 %gconf_schema_install gok.schemas
+%update_icon_cache hicolor
 
 %preun
 %gconf_schema_uninstall gok.schemas
 
+%postun
+%update_icon_cache hicolor
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
 %attr(755,root,root) %{_bindir}/*
 %{_libdir}/bonobo/servers/*.server
 %{_datadir}/%{name}
-%{_pkgconfigdir}/*
+%{_pkgconfigdir}/*.pc
 %{_omf_dest_dir}/%{name}
-%{_sysconfdir}/gconf/schemas/*
+%{_sysconfdir}/gconf/schemas/gok.schemas
+%{_iconsdir}/hicolor/*/apps/gok.png
 %{_pixmapsdir}/*
 %{_desktopdir}/*.desktop
 
+%if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/gok
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -131,6 +144,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.63  2007/06/01 20:22:46  megabajt
+- updated to 1.2.5
+- desktop patch applied upstream
+- added apidocs bcond
+
 Revision 1.62  2007/03/15 13:13:03  megabajt
 - updated to 1.2.3
 - added apidocs subpackage
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gok.spec?r1=1.62&r2=1.63&f=u