SPECS: gucharmap.spec - updated to 2.22.0; merged changes from DEVEL

[megabajt]

Author: megabajt                     Date: Tue Mar 25 16:43:09 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 2.22.0; merged changes from DEVEL

---- Files affected:
SPECS:
   gucharmap.spec (1.50 -> 1.51) 

---- Diffs:

================================================================
Index: SPECS/gucharmap.spec
diff -u SPECS/gucharmap.spec:1.50 SPECS/gucharmap.spec:1.51
--- SPECS/gucharmap.spec:1.50	Mon Nov  5 00:10:41 2007
+++ SPECS/gucharmap.spec	Tue Mar 25 17:43:04 2008
@@ -2,29 +2,31 @@
 Summary:	Unicode character map
 Summary(pl.UTF-8):	Mapa znaków unikodowych
 Name:		gucharmap
-Version:	1.10.1
-Release:	2
+Version:	2.22.0
+Release:	1
 License:	GPL v2
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gucharmap/1.10/%{name}-%{version}.tar.bz2
-# Source0-md5:	2b65ae7bef1b11048e77b287a2051020
-Patch0:		%{name}-desktop.patch
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gucharmap/2.22/%{name}-%{version}.tar.bz2
+# Source0-md5:	aff0c556ab360e0d6c63be911260637e
 URL:		http://www.gnome.org/
+BuildRequires:	GConf2-devel >= 2.22.0
 BuildRequires:	autoconf >= 2.56
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	gettext-devel
-BuildRequires:	gnome-doc-utils >= 0.12.0
-BuildRequires:	gtk+2-devel >= 2:2.12.0
-BuildRequires:	intltool >= 0.36.2
-BuildRequires:	libgnomeui-devel >= 2.19.1
+BuildRequires:	gnome-common >= 2.20.0
+BuildRequires:	gnome-doc-utils >= 0.12.2
+BuildRequires:	gtk+2-devel >= 2:2.12.8
+BuildRequires:	intltool >= 0.37.0
 BuildRequires:	libtool
-BuildRequires:	pango-devel >= 1:1.18.2
 BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.311
 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}
 # sr at Latn vs. sr at latin
 Conflicts:	glibc-misc < 6:2.7
@@ -39,9 +41,8 @@
 %package libs
 Summary:	gucharmap library
 Summary(pl.UTF-8):	Biblioteka gucharmap
-Group:		Development/Libraries
-Requires:	libgnomeui >= 2.19.1
-Requires:	pango >= 1:1.18.2
+Group:		X11/Libraries
+Requires:	pango >= 1:1.20.0
 
 %description libs
 This package contains gucharmap library.
@@ -52,11 +53,10 @@
 %package devel
 Summary:	Headers for gucharmap
 Summary(pl.UTF-8):	Pliki nagłówkowe gucharmap
-Group:		Development/Libraries
+Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	gtk+2-devel >= 2:2.12.0
-Requires:	libgnomeui-devel >= 2.19.1
-Requires:	pango-devel >= 1:1.18.2
+Requires:	GConf2-devel >= 2.22.0
+Requires:	gtk+2-devel >= 2:2.12.8
 
 %description devel
 The gucharmap-devel package includes the header files that you will
@@ -69,7 +69,7 @@
 %package static
 Summary:	Static gucharmap libraries
 Summary(pl.UTF-8):	Statyczne biblioteki gucharmap
-Group:		Development/Libraries
+Group:		X11/Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
@@ -80,7 +80,9 @@
 
 %prep
 %setup -q
-%patch0 -p1
+
+sed -i -e 's#sr at Latn#sr at latin#' po/LINGUAS
+mv po/sr@{Latn,latin}.po
 
 %build
 %{__gnome_doc_prepare}
@@ -89,6 +91,7 @@
 %{__libtoolize}
 %{__aclocal}
 %{__automake}
+%{__autoheader}
 %{__autoconf}
 %configure \
 	--enable-static
@@ -100,19 +103,19 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-ln -sf gucharmap $RPM_BUILD_ROOT%{_bindir}/charmap
-
-[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr at latin ] || \
-	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
-%find_lang %{name} --with-gnome
+%find_lang %{name} --with-gnome --with-omf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %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
@@ -122,25 +125,28 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*charmap
-%{_desktopdir}/*.desktop
+%attr(755,root,root) %{_bindir}/charmap
+%attr(755,root,root) %{_bindir}/gucharmap
+%attr(755,root,root) %{_bindir}/gnome-character-map
+%{_sysconfdir}/gconf/schemas/gucharmap.schemas
+%{_desktopdir}/gucharmap.desktop
 %{_iconsdir}/hicolor/*/apps/*
-%{_omf_dest_dir}/*
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/*.so.*.*.*
+%attr(755,root,root) %{_libdir}/libgucharmap.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgucharmap.so.6
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/*.so
-%{_libdir}/*.la
-%{_includedir}/%{name}
-%{_pkgconfigdir}/*
+%attr(755,root,root) %{_libdir}/libgucharmap.so
+%{_libdir}/libgucharmap.la
+%{_includedir}/gucharmap
+%{_pkgconfigdir}/gucharmap.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/*.a
+%{_libdir}/libgucharmap.a
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -148,6 +154,17 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.51  2008-03-25 16:43:04  megabajt
+- updated to 2.22.0; merged changes from DEVEL
+
+Revision 1.50.2.2  2008-02-10 23:16:23  megabajt
+- updated to 2.21.90
+- removed unnecessary -desktop.patch
+- more verbose files
+
+Revision 1.50.2.1  2008-01-15 15:49:47  patrys
+- 2.21.5
+
 Revision 1.50  2007-11-04 23:10:41  ankry
 - sr at Latn -> sr at latin, rel. 2
 
================================================================

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