From 163f809ca970558fd389466194c07e730555681eb1f327148ec35ddcaabd549c Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 9 Aug 2007 13:40:17 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libgnomekbd?expand=0&rev=6 --- libgnomekbd.changes | 7 +++++++ libgnomekbd.spec | 20 +++++++++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/libgnomekbd.changes b/libgnomekbd.changes index e33fb30..8c31bc5 100644 --- a/libgnomekbd.changes +++ b/libgnomekbd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Aug 7 23:57:19 CEST 2007 - maw@suse.de + +- Use %fdupes +- Split off a -lang subpackage +- s#%run_ldconfig#/sbin/ldconfig/ in %post and %postun. + ------------------------------------------------------------------- Thu Jul 19 12:03:17 CEST 2007 - sbrabec@suse.cz diff --git a/libgnomekbd.spec b/libgnomekbd.spec index 03fa72f..d3cd161 100644 --- a/libgnomekbd.spec +++ b/libgnomekbd.spec @@ -11,9 +11,9 @@ # norootforbuild Name: libgnomekbd -BuildRequires: dbus-1-glib-devel gnome-common intltool libglade2-devel libgnomeui-devel libxklavier-devel +BuildRequires: dbus-1-glib-devel fdupes gnome-common intltool libglade2-devel libgnomeui-devel libxklavier-devel Version: 2.18.2 -Release: 4 +Release: 14 URL: http://www.gnome.org/ Group: System/GUI/GNOME License: LGPL v2 or later @@ -22,6 +22,7 @@ Source: %{name}-%{version}.tar.bz2 Patch0: desktop.patch Patch1: libgnomekbd-allow-old-dbus.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: %{name}-lang = %{version} %gconf_schemas_prereq @@ -48,6 +49,7 @@ Authors: -------- svu@users.sourceforge.net +%lang_package %prep %setup -q %patch0 -p1 @@ -66,7 +68,9 @@ make make DESTDIR=$RPM_BUILD_ROOT install %find_lang %{name} %find_gconf_schemas -cat %{name}.lang %{name}.schemas_list >%{name}.lst +cat %{name}.schemas_list >%{name}.lst + +%fdupes $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT @@ -74,14 +78,14 @@ rm -rf $RPM_BUILD_ROOT %pre -f %{name}.schemas_pre %post -%run_ldconfig +/sbin/ldconfig %posttrans -f %{name}.schemas_posttrans %preun -f %{name}.schemas_preun %postun -%run_ldconfig +/sbin/ldconfig %files -f %{name}.lst %defattr(-, root, root) @@ -93,6 +97,8 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/libgnomekbd %{_datadir}/icons/hicolor/48x48/apps/gkbd-indicator-plugins-capplet.png +%files lang -f %{name}.lang + %files devel %defattr(-, root, root) %{_includedir}/libgnomekbd @@ -101,6 +107,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Tue Aug 07 2007 - maw@suse.de +- Use %%fdupes +- Split off a -lang subpackage +- s#%%run_ldconfig#/sbin/ldconfig/ in %%post and %%postun. * Thu Jul 19 2007 - sbrabec@suse.cz - Allow to build with old dbus. * Fri Jul 06 2007 - maw@suse.de