From 1b9115ecb768e31c02374b9ac0442925c87337ce7cffd2cac27b683dc7e34295 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Thu, 30 Dec 2010 00:12:49 +0000
Subject: [PATCH] Accepting request 56698 from
 home:vuntz:branches:GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/56698
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gucharmap?expand=0&rev=54
---
 gucharmap.changes | 10 +++++++
 gucharmap.spec    | 66 ++++++++++++++++++++++++++++-------------------
 2 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/gucharmap.changes b/gucharmap.changes
index 94c76af..81fa393 100644
--- a/gucharmap.changes
+++ b/gucharmap.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Dec 23 19:05:01 CET 2010 - vuntz@opensuse.org
+
+- Split libgucharmap7 and python-gucharmap subpackages, to respect
+  shared library packaging policy.
+- Improve summary and description.
+- Remove unneeded gconf2-devel, glib2-devel, gtk2-devel Requires in
+  devel package: they will automatically be added the pkgconfig()
+  way.
+
 -------------------------------------------------------------------
 Mon Nov 15 11:34:51 CET 2010 - dimstar@opensuse.org
 
diff --git a/gucharmap.spec b/gucharmap.spec
index 85b09e8..ca2e1b7 100644
--- a/gucharmap.spec
+++ b/gucharmap.spec
@@ -32,7 +32,7 @@ License:        GPLv3+ ; LGPLv2.1+
 Group:          System/GUI/GNOME
 Version:        2.32.1
 Release:        1
-Summary:        A Feature-Rich Unicode Character Map
+Summary:        A Featureful Unicode Character Map
 Source:         %{name}-%{version}.tar.bz2
 Url:            http://gucharmap.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -40,37 +40,43 @@ Requires:       %{name}-lang = %{version}
 %gconf_schemas_prereq
 
 %description
-Gucharmap is a feature-rich Unicode character map and font viewer.
+Gucharmap is a featureful unicode character map.
 
+%package -n libgucharmap7
+License:        GPLv3+ ; LGPLv2.1+
+Summary:        A Featureful Unicode Character Map -- Library
+Group:          System/GUI/GNOME
 
+%description -n libgucharmap7
+Gucharmap is a featureful unicode character map.
 
-Authors:
---------
-    Noah Levitt
+This package contains a library to use the character map.
+
+%package -n python-gucharmap
+License:        GPLv3+ ; LGPLv2.1+
+Summary:        A Featureful Unicode Character Map -- Python Bindings
+Group:          System/GUI/GNOME
+
+%description -n python-gucharmap
+Gucharmap is a featureful unicode character map.
+
+This package contains the python bindings to use the character map.
 
 %package devel
 License:        GPLv3+ ; LGPLv2.1+
-Summary:        Include Files and Libraries mandatory for Development
+Summary:        A Featureful Unicode Character Map -- Development Files
 Group:          Development/Libraries/GNOME
-Requires:       %{name} = %{version} gconf2-devel glib2-devel gtk2-devel
+Requires:       libgucharmap7 = %{version}
 
 %description devel
 This package contains all necessary include files and libraries needed
 to develop applications that require these.
 
-
-
-Authors:
---------
-    Noah Levitt
-
 %lang_package
 %prep
 %setup -q
 
 %build
-# FIXME: Build as root modifies system!
-#   gucharmap-1.8.0: --disable-scrollkeeper does not work properly.
 %configure --disable-static --with-pic \
     --disable-scrollkeeper \
     --enable-gtk-doc \
@@ -82,7 +88,7 @@ make %{?jobs:-j%jobs}
 %if 0%{?suse_version} <= 1120
 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
 %endif
-find %{buildroot} -type f -name "*.la" -exec %{__rm} -fv {} +
+find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
 %find_lang %{name}
 %find_gconf_schemas
 %fdupes $RPM_BUILD_ROOT
@@ -90,9 +96,9 @@ find %{buildroot} -type f -name "*.la" -exec %{__rm} -fv {} +
 # want TextEditor, since that's too wide.
 %suse_update_desktop_file -N "GNOME Character Map" -G "Character Map" %{name} X-SuSE-Editor
 
-%post -p /sbin/ldconfig
+%post -n libgucharmap7 -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun -n libgucharmap7 -p /sbin/ldconfig
 
 %pre -f %{name}.schemas_pre
 
@@ -106,19 +112,27 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.schemas_list
 %defattr(-,root,root)
 %doc COPYING ChangeLog NEWS README TODO
-%{_bindir}/*
-%{_libdir}/*.so.*
-%{_datadir}/applications/*.desktop
+%{_bindir}/charmap
+%{_bindir}/gnome-character-map
+%{_bindir}/gucharmap
+%{_datadir}/applications/gucharmap.desktop
+
+%files -n libgucharmap7
+%defattr(-,root,root)
+%{_libdir}/libgucharmap.so.*
+
+%files -n python-gucharmap
+%defattr(-,root,root)
 %{py_sitedir}/gtk-2.0/gucharmap.so
-%{_datadir}/pygtk/2.0/defs/*
+%{_datadir}/pygtk/2.0/defs/gucharmap.defs
 
 %files lang -f %{name}.lang
 
 %files devel
 %defattr (-, root, root)
-%{_includedir}/*
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*.pc
-%{_datadir}/gtk-doc/html/*
+%{_includedir}/gucharmap-2.0/
+%{_libdir}/libgucharmap.so
+%{_libdir}/pkgconfig/gucharmap-2.pc
+%doc %{_datadir}/gtk-doc/html/gucharmap-2.0/
 
 %changelog