SPECS: gucharmap.spec - merge from DEVEL

[qwiat]

Author: qwiat                        Date: Thu Oct  2 22:12:51 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merge from DEVEL

---- Files affected:
SPECS:
   gucharmap.spec (1.53 -> 1.54) 

---- Diffs:

================================================================
Index: SPECS/gucharmap.spec
diff -u SPECS/gucharmap.spec:1.53 SPECS/gucharmap.spec:1.54
--- SPECS/gucharmap.spec:1.53	Mon Jun 30 15:08:59 2008
+++ SPECS/gucharmap.spec	Fri Oct  3 00:12:45 2008
@@ -2,12 +2,12 @@
 Summary:	Unicode character map
 Summary(pl.UTF-8):	Mapa znaków unikodowych
 Name:		gucharmap
-Version:	2.22.3
+Version:	2.24.0
 Release:	1
 License:	GPL v2
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gucharmap/2.22/%{name}-%{version}.tar.bz2
-# Source0-md5:	f57290934466fda80eb883f77c0a2ff1
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gucharmap/2.24/%{name}-%{version}.tar.bz2
+# Source0-md5:	5dc5f1af56a5bd1a525125b315708d86
 URL:		http://www.gnome.org/
 BuildRequires:	GConf2-devel >= 2.22.0
 BuildRequires:	autoconf >= 2.56
@@ -24,7 +24,6 @@
 BuildRequires:	scrollkeeper
 BuildRequires:	sed >= 4.0
 Requires(post,postun):	gtk+2
-Requires(post,postun):	hicolor-icon-theme
 Requires(post,postun):	scrollkeeper
 Requires(post,preun):	GConf2
 Requires:	%{name}-libs = %{version}-%{release}
@@ -81,15 +80,12 @@
 %prep
 %setup -q
 
-sed -i -e 's#sr at Latn#sr at latin#' po/LINGUAS
-mv po/sr@{Latn,latin}.po
-
 %build
 %{__gnome_doc_prepare}
 %{__glib_gettextize}
 %{__intltoolize}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__automake}
 %{__autoheader}
 %{__autoconf}
@@ -111,14 +107,12 @@
 %post
 %gconf_schema_install gucharmap.schemas
 %scrollkeeper_update_post
-%update_icon_cache hicolor
 
 %preun
 %gconf_schema_uninstall gucharmap.schemas
 
 %postun
 %scrollkeeper_update_postun
-%update_icon_cache hicolor
 
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
@@ -130,19 +124,18 @@
 %attr(755,root,root) %{_bindir}/gnome-character-map
 %{_sysconfdir}/gconf/schemas/gucharmap.schemas
 %{_desktopdir}/gucharmap.desktop
-%{_iconsdir}/hicolor/*/apps/*
 
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgucharmap.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgucharmap.so.6
+%attr(755,root,root) %ghost %{_libdir}/libgucharmap.so.7
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgucharmap.so
 %{_libdir}/libgucharmap.la
-%{_includedir}/gucharmap
-%{_pkgconfigdir}/gucharmap.pc
+%{_includedir}/gucharmap-2
+%{_pkgconfigdir}/gucharmap-2.pc
 
 %files static
 %defattr(644,root,root,755)
@@ -154,8 +147,20 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.54  2008/10/02 22:12:45  qwiat
+- merge from DEVEL
+
+Revision 1.52.2.3  2008/10/02 22:10:05  qwiat
+- up to 2.24
+
+Revision 1.52.2.2  2008/08/31 15:16:47  patrys
+- 2.23.91
+
 Revision 1.53  2008/06/30 13:08:59  megabajt
 - updated to 2.22.3
+
+Revision 1.52.2.1  2008/06/17 12:37:27  patrys
+- 2.23.4
 
 Revision 1.52  2008/04/07 12:54:48  megabajt
 - updated to 2.22.1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gucharmap.spec?r1=1.53&r2=1.54&f=u