SPECS (AC-branch): gucharmap.spec - merged from HEAD

[baggins]

Author: baggins                      Date: Mon May 15 17:45:28 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SPECS:
   gucharmap.spec (1.35 -> 1.35.4.1) 

---- Diffs:

================================================================
Index: SPECS/gucharmap.spec
diff -u SPECS/gucharmap.spec:1.35 SPECS/gucharmap.spec:1.35.4.1
--- SPECS/gucharmap.spec:1.35	Tue Sep  6 22:30:25 2005
+++ SPECS/gucharmap.spec	Mon May 15 19:45:23 2006
@@ -2,12 +2,12 @@
 Summary:	Unicode character map
 Summary(pl):	Mapa znaków unikodowych
 Name:		gucharmap
-Version:	1.4.4
-Release:	1
+Version:	1.6.0
+Release:	3
 License:	GPL v2
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gucharmap/1.4/%{name}-%{version}.tar.bz2
-# Source0-md5:	c9741329d08908a271864664c3f2e91c
+Source0:	http://ftp.gnome.org/pub/gnome/sources/gucharmap/1.6/%{name}-%{version}.tar.bz2
+# Source0-md5:	8af03f350c988d1565922b10776bc725
 Patch0:		%{name}-desktop.patch
 URL:		http://www.gnome.org/
 BuildRequires:	autoconf
@@ -16,15 +16,16 @@
 BuildRequires:	gnome-doc-utils
 BuildRequires:	gtk+2-devel >= 2:2.6.3
 BuildRequires:	intltool
-BuildRequires:	libgnome-devel >= 2.10.0
-BuildRequires:	libgnomeui-devel >= 2.10.0-2
+BuildRequires:	libgnome-devel >= 2.14.0
+BuildRequires:	libgnomeui-devel >= 2.14.0
 BuildRequires:	libtool
 BuildRequires:	pango-devel >= 1:1.8.0
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	scrollkeeper
-Requires(post,postun):	/sbin/ldconfig
 Requires(post,postun):	scrollkeeper
+Requires:	%{name}-libs = %{version}-%{release}
+Requires:	hicolor-icon-theme
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -33,13 +34,24 @@
 %description -l pl
 Gucharmap jest wartościową mapą znaków unikodowych.
 
+%package libs
+Summary:	gucharmap library
+Summary(pl):	Biblioteka gucharmap
+Group:		Development/Libraries
+
+%description libs
+This package contains gucharmap library.
+
+%description libs -l pl
+Pakiet ten zawiera bibliotekę gucharmap.
+
 %package devel
 Summary:	Headers for gucharmap
 Summary(pl):	Pliki nagłówkowe gucharmap
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	gtk+2-devel >= 2:2.6.3
-Requires:	libgnomeui-devel >= 2.10.0-2
+Requires:	libgnomeui-devel >= 2.14.0
 Requires:	pango-devel >= 1:1.8.0
 
 %description devel
@@ -92,21 +104,25 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
 %scrollkeeper_update_post
 
 %postun
-/sbin/ldconfig
 %scrollkeeper_update_postun
 
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*charmap
-%attr(755,root,root) %{_libdir}/*.so.*.*.*
 %{_desktopdir}/*
-%{_pixmapsdir}/*
+%{_iconsdir}/hicolor/*/apps/*
 %{_omf_dest_dir}/*
 
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/*.so.*.*.*
+
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/*.so
@@ -124,6 +140,36 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.35.4.1  2006/05/15 17:45:23  baggins
+- merged from HEAD
+
+Revision 1.36  2006/04/02 10:29:48  freetz
+- merged from DEVEL
+
+Revision 1.35.2.8  2006/03/27 19:37:25  qboosh
+- fixed typo
+
+Revision 1.35.2.7  2006/03/27 17:48:32  glen
+-  typo?
+
+Revision 1.35.2.6  2006/03/27 17:31:13  freetz
+- fixed R: in -devel (oops), rel.3
+
+Revision 1.35.2.5  2006/03/27 17:26:19  freetz
+- libs subpkg, rel.2
+
+Revision 1.35.2.4  2006/03/13 08:13:12  freetz
+- 1.6.0
+
+Revision 1.35.2.3  2006/02/28 15:02:48  freetz
+- 1.5.3, updated file list
+
+Revision 1.35.2.2  2006/02/14 07:53:14  freetz
+- 1.5.2, redefine pixmapdir for now
+
+Revision 1.35.2.1  2006/01/29 21:33:57  freetz
+- 1.5.1
+
 Revision 1.35  2005/09/06 20:30:25  freetz
 - 1.4.4, use gnome-doc-utils
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gucharmap.spec?r1=1.35&r2=1.35.4.1&f=u