Author: megabajt Date: Sun Mar 29 11:43:13 2009 GMT Module: SPECS Tag: HEAD ---- Log message: - removed modemlights applet and added appropriate Obsoletes - release 2
---- Files affected: SPECS: gnome-applets.spec (1.214 -> 1.215) ---- Diffs: ================================================================ Index: SPECS/gnome-applets.spec diff -u SPECS/gnome-applets.spec:1.214 SPECS/gnome-applets.spec:1.215 --- SPECS/gnome-applets.spec:1.214 Wed Mar 18 16:54:26 2009 +++ SPECS/gnome-applets.spec Sun Mar 29 13:43:08 2009 @@ -5,56 +5,56 @@ Summary(uk.UTF-8): Маленькі програми, що вбудовуються в панель GNOME Name: gnome-applets Version: 2.26.0 -Release: 1 +Release: 2 Epoch: 1 License: GPL v2, FDL Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-applets/2.26/%{name}-%{version}.tar.bz2 # Source0-md5: eed64366b0a1f4032506ac7221ce898a # check paths in Makefile before removing it! -Patch1: %{name}-m4_fix.patch +Patch0: %{name}-m4_fix.patch URL: http://www.gnome.org/ -BuildRequires: GConf2-devel >= 2.24.0 +BuildRequires: GConf2-devel >= 2.26.0 +BuildRequires: NetworkManager-devel >= 0.7 BuildRequires: PolicyKit-gnome-devel >= 0.7 BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1:1.8 BuildRequires: cpufrequtils-devel >= 0.3 -BuildRequires: dbus-glib-devel >= 0.73 +BuildRequires: dbus-glib-devel >= 0.74 BuildRequires: gettext-devel -BuildRequires: glib2-devel >= 1:2.18.0 +BuildRequires: glib2-devel >= 1:2.20.0 BuildRequires: gnome-common >= 2.24.0 -BuildRequires: gnome-desktop-devel >= 2.24.0 +BuildRequires: gnome-desktop-devel >= 2.26.0 BuildRequires: gnome-doc-utils >= 0.14.0 -BuildRequires: gnome-icon-theme >= 2.24.0 -BuildRequires: gnome-panel-devel >= 2.24.0 -BuildRequires: gnome-settings-daemon-devel >= 2.24.0 +BuildRequires: gnome-icon-theme >= 2.26.0 +BuildRequires: gnome-panel-devel >= 2.26.0 +BuildRequires: gnome-settings-daemon-devel >= 2.26.0 BuildRequires: gstreamer-plugins-base-devel >= 0.10.10 -BuildRequires: gtk+2-devel >= 2:2.14.0 -BuildRequires: gucharmap-devel >= 2.24.0 +BuildRequires: gtk+2-devel >= 2:2.16.0 +BuildRequires: gucharmap-devel >= 2.26.0 BuildRequires: hal-devel >= 0.5.10 BuildRequires: intltool >= 0.40.0 -BuildRequires: libgnomekbd-devel >= 2.21.4.1 -BuildRequires: libgnomeui-devel >= 2.24.0 +BuildRequires: libgnomekbd-devel >= 2.24.0 BuildRequires: libgtop-devel >= 1:2.22.0 -BuildRequires: libgweather-devel >= 2.24.0 -BuildRequires: libnotify-devel >= 0.4.2 +BuildRequires: libgweather-devel >= 2.26.0 +BuildRequires: libnotify-devel >= 0.4.4 BuildRequires: libtool -BuildRequires: libwnck-devel >= 2.24.0 +BuildRequires: libwnck-devel >= 2.26.0 BuildRequires: libxml2-devel >= 1:2.6.30 BuildRequires: libxslt-progs >= 1.1.20 BuildRequires: pkgconfig >= 1:0.19 BuildRequires: python-devel >= 1:2.4 BuildRequires: python-gnome-desktop-devel BuildRequires: python-gnome-devel >= 2.22.0 -BuildRequires: python-pygtk-devel >= 2:2.12.0 +BuildRequires: python-pygtk-devel >= 2:2.14.0 BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(find_lang) >= 1.23 BuildRequires: rpmbuild(macros) >= 1.311 BuildRequires: scrollkeeper >= 0.3.11-4 -Requires: gnome-icon-theme >= 2.24.0 -Requires: gnome-panel >= 2.24.0 +Requires: gnome-icon-theme >= 2.26.0 +Requires: gnome-panel >= 2.26.0 Requires: hicolor-icon-theme -Requires: libgnomeui >= 2.24.0 +Obsoletes: gnome-applets-modemlights # s...@latn vs. s...@latin Conflicts: glibc-misc < 6:2.7 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -82,7 +82,7 @@ Requires(post,postun): gtk+2 Requires(post,postun): scrollkeeper Requires: %{name} = %{epoch}:%{version}-%{release} -Suggests: gnome-control-center >= 2.24.0 +Suggests: gnome-control-center >= 2.26.0 Conflicts: gnome-applets <= 0:2.10.0-5 %description accessx-status @@ -252,21 +252,6 @@ %description mixer -l pl.UTF-8 Aplet regulacji głośności. -%package modemlights -Summary: Modem Lights applet -Summary(pl.UTF-8): Aplet kontrolek modemu -Group: X11/Applications -Requires(post,postun): gtk+2 -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: system-tools-backends -Conflicts: gnome-applets <= 0:2.10.0-5 - -%description modemlights -Modem Lights applet. - -%description modemlights -l pl.UTF-8 -Aplet kontrolek modemu. - %package multiload Summary: System Monitor applet Summary(pl.UTF-8): Aplet monitora systemu @@ -316,7 +301,7 @@ %prep %setup -q -%patch1 -p1 +%patch0 -p1 %build %{__gnome_doc_prepare} @@ -332,8 +317,7 @@ --disable-static \ --disable-schemas-install \ --enable-mini-commander \ - --enable-mixer-applet \ - --with-gstreamer=0.10 + --enable-mixer-applet %{__make} %install @@ -485,12 +469,6 @@ %postun mixer %scrollkeeper_update_postun -%post modemlights -%update_icon_cache hicolor - -%postun modemlights -%update_icon_cache hicolor - %post multiload %scrollkeeper_update_post %gconf_schema_install multiload.schemas @@ -713,16 +691,6 @@ %{_datadir}/gnome-2.0/ui/GNOME_MixerApplet.xml %{_sysconfdir}/gconf/schemas/mixer.schemas -#does not build -#%%files modemlights -#%%defattr(644,root,root,755) -#%%doc modemlights/ChangeLog -#%attr(755,root,root) %{_libdir}/modem_applet -#%{_libdir}/bonobo/servers/GNOME_ModemLights.server -#%{_datadir}/gnome-2.0/ui/GNOME_ModemLights.xml -#%{_datadir}/gnome-applets/builder/modemlights.ui -#%{_iconsdir}/hicolor/*/apps/gnome-modem-monitor-applet.* - %files multiload -f multiload.lang %defattr(644,root,root,755) %doc multiload/ChangeLog @@ -756,6 +724,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.215 2009/03/29 11:43:08 megabajt +- removed modemlights applet and added appropriate Obsoletes +- release 2 + Revision 1.214 2009/03/18 15:54:26 patrys - 2.26.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnome-applets.spec?r1=1.214&r2=1.215&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
