packages: libgnomekbd/libgnomekbd.spec - updated to 3.0.0; merged from DEVEL

[megabajt]

Author: megabajt                     Date: Mon Apr  4 21:33:29 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 3.0.0; merged from DEVEL

---- Files affected:
packages/libgnomekbd:
   libgnomekbd.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: packages/libgnomekbd/libgnomekbd.spec
diff -u packages/libgnomekbd/libgnomekbd.spec:1.23 packages/libgnomekbd/libgnomekbd.spec:1.24
--- packages/libgnomekbd/libgnomekbd.spec:1.23	Wed Sep 29 20:06:52 2010
+++ packages/libgnomekbd/libgnomekbd.spec	Mon Apr  4 23:33:24 2011
@@ -2,27 +2,27 @@
 Summary:	A keyboard configuration library
 Summary(pl.UTF-8):	Biblioteka do konfiguracji klawiatury
 Name:		libgnomekbd
-Version:	2.32.0
+Version:	3.0.0
 Release:	1
 License:	LGPL v2+
 Group:		X11/Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/libgnomekbd/2.32/%{name}-%{version}.tar.bz2
-# Source0-md5:	de32a6e3e3464b566eecdc4332bf34bd
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/libgnomekbd/3.0/%{name}-%{version}.tar.bz2
+# Source0-md5:	d7f10a243c2d3f830630b3bf10a11db9
 URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.24.0
-BuildRequires:	autoconf >= 2.59
+BuildRequires:	autoconf >= 2.62
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	gettext-devel
 BuildRequires:	gnome-common >= 2.20.0
-BuildRequires:	gtk+2-devel >= 2:2.16.0
+BuildRequires:	gobject-introspection-devel >= 0.10.0
+BuildRequires:	gtk+3-devel >= 3.0.0
 BuildRequires:	intltool >= 0.40.0
 BuildRequires:	libtool
-BuildRequires:	libxklavier-devel >= 5.0
+BuildRequires:	libxklavier-devel >= 5.1
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.198
+BuildRequires:	rpmbuild(macros) >= 1.593
 BuildRequires:	sed >= 4.0
 Requires(post,postun):	/sbin/ldconfig
-Requires(post,preun):	GConf2
+Requires(post,postun):	glib2 >= 1:2.26.0
 Conflicts:	control-center < 1:2.17.92
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -41,9 +41,8 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libgnomekbd
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	GConf2-devel >= 2.24.0
-Requires:	gtk+2-devel >= 2:2.16.0
-Requires:	libxklavier-devel >= 5.0
+Requires:	gtk+3-devel >= 3.0.0
+Requires:	libxklavier-devel >= 5.1
 
 %description devel
 Header files for libgnomekbd.
@@ -66,9 +65,6 @@
 %prep
 %setup -q
 
-rm -f po/en at shaw.po
-sed -i -e 's/en at shaw//' po/LINGUAS
-
 %build
 %{__glib_gettextize}
 %{__intltoolize}
@@ -78,7 +74,6 @@
 %{__automake}
 %configure \
 	--disable-silent-rules \
-	--disable-schemas-install \
 	--enable-static
 %{__make}
 
@@ -88,6 +83,8 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+
 %find_lang %{name}
 
 %clean
@@ -95,35 +92,38 @@
 
 %post
 /sbin/ldconfig
-%gconf_schema_install desktop_gnome_peripherals_keyboard_xkb.schemas
-
-%preun
-%gconf_schema_uninstall desktop_gnome_peripherals_keyboard_xkb.schemas
+%glib_compile_schemas
 
 %postun
 /sbin/ldconfig
+if [ "$1" = "0" ]; then
+	%glib_compile_schemas
+fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog
 %attr(755,root,root) %{_bindir}/gkbd-indicator-plugins-capplet
+%attr(755,root,root) %{_bindir}/gkbd-keyboard-display
 %attr(755,root,root) %{_libdir}/libgnomekbd.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgnomekbd.so.4
+%attr(755,root,root) %ghost %{_libdir}/libgnomekbd.so.7
 %attr(755,root,root) %{_libdir}/libgnomekbdui.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgnomekbdui.so.4
-%{_sysconfdir}/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas
+%attr(755,root,root) %ghost %{_libdir}/libgnomekbdui.so.7
 %{_desktopdir}/gkbd-indicator-plugins-capplet.desktop
+%{_desktopdir}/gkbd-keyboard-display.desktop
+%{_datadir}/GConf/gsettings/libgnomekbd.convert
+%{_datadir}/glib-2.0/schemas/*.gschema.xml
 %{_datadir}/libgnomekbd
+%{_libdir}/girepository-1.0/Gkbd-3.0.typelib
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgnomekbd.so
 %attr(755,root,root) %{_libdir}/libgnomekbdui.so
 %{_includedir}/libgnomekbd
-%{_libdir}/libgnomekbd.la
-%{_libdir}/libgnomekbdui.la
 %{_pkgconfigdir}/libgnomekbd.pc
 %{_pkgconfigdir}/libgnomekbdui.pc
+%{_datadir}/gir-1.0/Gkbd-3.0.gir
 
 %files static
 %defattr(644,root,root,755)
@@ -136,6 +136,31 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2011/04/04 21:33:24  megabajt
+- updated to 3.0.0; merged from DEVEL
+
+Revision 1.23.2.7  2011/03/22 22:29:57  megabajt
+- updated to 2.91.92
+
+Revision 1.23.2.6  2011/03/08 19:54:40  megabajt
+- updated to 2.91.91
+
+Revision 1.23.2.5  2011/02/26 11:28:57  patrys
+- 2.91.90
+
+Revision 1.23.2.4  2011/02/12 19:22:51  wiget
+- BR stable gtk+
+- kill libtool files
+
+Revision 1.23.2.3  2011/01/13 22:15:07  wiget
+- 2.91.5
+
+Revision 1.23.2.2  2010/12/28 21:40:59  wiget
+- 2.91.4
+
+Revision 1.23.2.1  2010/11/21 13:58:11  megabajt
+- updated to 2.91.2
+
 Revision 1.23  2010/09/29 18:06:52  megabajt
 - updated to 2.32.0; merged changes from DEVEL
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libgnomekbd/libgnomekbd.spec?r1=1.23&r2=1.24&f=u