diff --git a/.cvsignore b/.cvsignore index 0dd7af2..2c7013f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -5,3 +5,4 @@ gnome-applets-2.14.2.tar.bz2 gnome-applets-2.15.1.1.tar.bz2 gnome-applets-2.15.2.tar.bz2 gnome-applets-2.15.3.tar.bz2 +gnome-applets-2.15.90.tar.bz2 diff --git a/gnome-applets.spec b/gnome-applets.spec index f499747..079e595 100644 --- a/gnome-applets.spec +++ b/gnome-applets.spec @@ -27,10 +27,12 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%define build_stickynotes 0 + Summary: Small applications for the GNOME panel Name: gnome-applets -Version: 2.15.3 -Release: 2%{?dist} +Version: 2.15.90 +Release: 1%{?dist} Epoch: 1 License: GPL Group: User Interface/Desktops @@ -40,12 +42,7 @@ Patch0: gnome-applets-2.15.2-use-old-modemlights.patch Patch2: gnome-applets-2.10.1-use-builtin-apm.patch Patch3: gnome-applets-2.3.6-ppp-command.patch Patch4: gnome-applets-2.15.1.1-cpufreq.patch -Patch10: gnome-applets-2.15.1.1-invest.patch -# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200970 Patch11: gnome-applets-2.15.1.1-dont-require-display.patch -Patch13: gnome-applets-2.15.1.1-destroy-on-close.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=351956 -Patch14: gnome-applets-2.15.3-invest-gconf.patch URL: http://www.gnome.org/ @@ -109,6 +106,8 @@ Requires: gnome-python2-libegg Obsoletes: battstat_applet Obsoletes: gnome-cpufreq-applet +# since we are installing .pc files +Requires: pkgconfig %description GNOME (GNU Network Object Model Environment) is a user-friendly set of @@ -121,10 +120,7 @@ small utilities for the GNOME panel. %patch0 -p1 -b .use-old-modemlights %patch2 -p1 -b .use-builtin-apm %patch4 -p1 -b .cpufreq -%patch10 -p1 -b .invest %patch11 -p1 -b .dont-require-display -%patch13 -p1 -b .destroy-on-close -%patch14 -p1 -b .invest-gconf cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png @@ -186,7 +182,6 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then fi export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/battstat.schemas \ %{_sysconfdir}/gconf/schemas/charpick.schemas \ @@ -199,10 +194,33 @@ gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/mini-commander.schemas \ %{_sysconfdir}/gconf/schemas/mixer.schemas \ %{_sysconfdir}/gconf/schemas/modemlights.schemas \ - %{_sysconfdir}/gconf/schemas/multiload.schemas \ - %{_sysconfdir}/gconf/schemas/stickynotes.schemas > /dev/null +%if %{build_stickynotes} + %{_sysconfdir}/gconf/schemas/stickynotes.schemas \ +%endif + %{_sysconfdir}/gconf/schemas/multiload.schemas > /dev/null %{_libexecdir}/gnome-applets/mc-install-default-macros > /dev/null +%preun +if [ "$1" -eq 0 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/battstat.schemas \ + %{_sysconfdir}/gconf/schemas/charpick.schemas \ + %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas \ + %{_sysconfdir}/gconf/schemas/drivemount.schemas \ + %{_sysconfdir}/gconf/schemas/geyes.schemas \ + %{_sysconfdir}/gconf/schemas/gswitchit.schemas \ + %{_sysconfdir}/gconf/schemas/gweather.schemas \ + %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \ + %{_sysconfdir}/gconf/schemas/mini-commander.schemas \ + %{_sysconfdir}/gconf/schemas/mixer.schemas \ + %{_sysconfdir}/gconf/schemas/modemlights.schemas \ +%if %{build_stickynotes} + %{_sysconfdir}/gconf/schemas/stickynotes.schemas \ +%endif + %{_sysconfdir}/gconf/schemas/multiload.schemas > /dev/null +fi + %postun /sbin/ldconfig touch --no-create %{_datadir}/icons/hicolor @@ -215,7 +233,12 @@ fi %doc AUTHORS COPYING ChangeLog NEWS README %{_datadir}/pixmaps +%{_datadir}/icons/hicolor/16x16/apps/* +%{_datadir}/icons/hicolor/22x22/apps/* +%{_datadir}/icons/hicolor/24x24/apps/* +%{_datadir}/icons/hicolor/32x32/apps/* %{_datadir}/icons/hicolor/48x48/apps/* +%{_datadir}/icons/hicolor/scalable/apps/* %{_datadir}/gnome-2.0/ui/* %{_datadir}/gnome %{_datadir}/gnome-applets @@ -241,7 +264,11 @@ fi %{_libexecdir}/modemlights_applet2 %{_libexecdir}/multiload-applet-2 %{_libexecdir}/null_applet + +%if %{build_stickynotes} %{_libexecdir}/stickynotes_applet +%endif + %{_libexecdir}/trashapplet %{_libexecdir}/invest-applet %{_sbindir}/* @@ -258,6 +285,17 @@ fi %{_libdir}/pkgconfig/gweather.pc %changelog +* Tue Aug 22 2006 Matthias Clasen - 1:2.15.90-1.fc6 +- Update to 2.15.90 +- Drop upstreamed patches +- Add a %%preun script +- Require pkgconfig +- Drop sticky-notes in favour of tomboy + *** docs ***: Tomboy supports importing sticky notes. Currently + that requires a manual step by the user. This should be pointed + out in the release notes (unless we can convince upstream to make + this automatic) + * Fri Aug 18 2006 Matthias Clasen - 1:2.15.3-2.fc6 - Make the invest applet work diff --git a/sources b/sources index b2aed18..e4072e1 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2 -f7693a0780fe4b288c62c25d410395a9 gnome-applets-2.15.2.tar.bz2 -88814125b056b32d7d34b8ac75cfbf7e gnome-applets-2.15.3.tar.bz2 +421eda161541b42d42ea04c59b9ee4f1 gnome-applets-2.15.90.tar.bz2