- Remove requirement on the main package from -libs, and move the icons

from the main package to the -libs sub-package (#515845)
This commit is contained in:
Bastien Nocera 2009-08-06 09:34:40 +00:00
parent 1839e60978
commit 9d677f1718

View File

@ -1,6 +1,6 @@
Name: gnome-bluetooth
Version: 2.27.9
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Bluetooth graphical utilities
Group: Applications/Communications
@ -41,7 +41,6 @@ monitor and use Bluetooth devices.
Summary: GTK+ Bluetooth device selection widgets
Group: System Environment/Libraries
License: LGPLv2+
Requires: %{name} = %{version}-%{release}
%description libs
This package contains libraries needed for applications that
@ -114,10 +113,6 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
%{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas \
>& /dev/null || :
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%pre
if [ "$1" -gt 1 ]; then
@ -155,9 +150,19 @@ if [ $1 -eq 0 ] ; then
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%post libs -p /sbin/ldconfig
%post libs
/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun libs -p /sbin/ldconfig
%posttrans libs
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%postun libs
/sbin/ldconfig
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%files -f gnome-bluetooth2.lang
%defattr(-,root,root,-)
@ -168,14 +173,14 @@ fi
%{_libdir}/gnome-bluetooth/
%{_datadir}/applications/*.desktop
%{_datadir}/gnome-bluetooth/
%{_datadir}/icons/hicolor/*/apps/*
%{_datadir}/icons/hicolor/*/status/*
%{_mandir}/man1/*
%files libs
%defattr(-,root,root,-)
%doc COPYING.LIB
%{_libdir}/libgnome-bluetooth.so.*
%{_datadir}/icons/hicolor/*/apps/*
%{_datadir}/icons/hicolor/*/status/*
%files libs-devel
%defattr(-,root,root,-)
@ -185,6 +190,10 @@ fi
%{_datadir}/gtk-doc/html/gnome-bluetooth/
%changelog
* Thu Aug 06 2009 Bastien Nocera <bnocera@redhat.com> 2.27.9-2
- Remove requirement on the main package from -libs, and move
the icons from the main package to the -libs sub-package (#515845)
* Tue Aug 04 2009 Bastien Nocera <bnocera@redhat.com> 2.27.9-1
- Update to 2.27.9