rpms/gnome-bluetooth/devel gnome-bluetooth.spec,1.84,1.85
Bastien Nocera
hadess at fedoraproject.org
Thu Aug 6 09:34:41 UTC 2009
Author: hadess
Update of /cvs/pkgs/rpms/gnome-bluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21689
Modified Files:
gnome-bluetooth.spec
Log Message:
* Thu Aug 06 2009 Bastien Nocera <bnocera at 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)
Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- gnome-bluetooth.spec 4 Aug 2009 18:37:16 -0000 1.84
+++ gnome-bluetooth.spec 6 Aug 2009 09:34:40 -0000 1.85
@@ -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
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 at 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 at redhat.com> 2.27.9-1
- Update to 2.27.9
More information about the fedora-extras-commits
mailing list