SPECS (AC-branch): gnome-applets.spec - merged from HEAD - updated...

baggins baggins at pld-linux.org
Wed May 17 14:31:55 CEST 2006 

Author: baggins                      Date: Wed May 17 12:31:55 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD
- updated BRs for GNOME 2.14

---- Files affected:
SPECS:
   gnome-applets.spec (1.160 -> 1.160.2.1) 

---- Diffs:

================================================================
Index: SPECS/gnome-applets.spec
diff -u SPECS/gnome-applets.spec:1.160 SPECS/gnome-applets.spec:1.160.2.1
--- SPECS/gnome-applets.spec:1.160	Wed Feb  8 17:54:37 2006
+++ SPECS/gnome-applets.spec	Wed May 17 14:31:50 2006
@@ -4,17 +4,17 @@
 Summary(ru):	íÁĚĹÎŘËÉĹ ĐŇĎÇŇÁÍÍŮ, ×ÓÔŇÁÉ×ÁŔÝÉĹÓŃ × ĐÁÎĹĚŘ GNOME
 Summary(uk):	íÁĚĹÎŘËŚ ĐŇĎÇŇÁÍÉ, ÝĎ ×ÂŐÄĎ×ŐŔÔŘÓŃ × ĐÁÎĹĚŘ GNOME
 Name:		gnome-applets
-Version:	2.12.3
+Version:	2.14.1
 Release:	1
 Epoch:		1
 License:	GPL v2, FDL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-applets/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5:	39987d3e8726e58a6a72047ada05e25d
+Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-applets/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5:	1b5e834450812a6a3e7ab00652587ef4
 Patch0:		%{name}-stickynotes-title-size.patch
 Patch1:		%{name}-m4_fix.patch
 URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.12.0
+BuildRequires:	GConf2-devel >= 2.14.0
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	dbus-glib-devel >= 0.34
@@ -22,21 +22,21 @@
 BuildRequires:	gdbm-devel
 BuildRequires:	gettext-devel
 BuildRequires:	gnome-common >= 2.8.0-2
-BuildRequires:	gnome-desktop-devel >= 2.12.1
+BuildRequires:	gnome-desktop-devel >= 2.14.0
 BuildRequires:	gnome-doc-utils >= 0.4.0
-BuildRequires:	gnome-panel-devel >= 2.12.1
-BuildRequires:	gnome-vfs2-devel >= 2.12.1
-BuildRequires:	gstreamer-plugins-devel >= 0.8.11
+BuildRequires:	gnome-panel-devel >= 2.14.0
+BuildRequires:	gnome-vfs2-devel >= 2.14.0
+BuildRequires:	gstreamer-plugins-base-devel >= 0.10
 BuildRequires:	gtk+2-devel >= 2:2.8.3
 BuildRequires:	gucharmap-devel >= 1.4.0
 BuildRequires:	hal-devel >= 0.5.3
 BuildRequires:	intltool >= 0.33
-BuildRequires:	libgnomeui-devel >= 2.12.0
+BuildRequires:	libgnomeui-devel >= 2.14.0
 BuildRequires:	libglade2-devel >= 1:2.5.1
-BuildRequires:	libgtop-devel >= 1:2.12.0
-BuildRequires:	libnotify-devel
+BuildRequires:	libgtop-devel >= 1:2.14.0
+BuildRequires:	libnotify-devel >= 0.3.2
 BuildRequires:	libtool
-BuildRequires:	libwnck-devel >= 2.12.1
+BuildRequires:	libwnck-devel >= 2.14.1
 BuildRequires:	libxml2-devel >= 1:2.6.21
 BuildRequires:	libxklavier-devel >= 2.0
 BuildRequires:	libxslt-progs
@@ -44,9 +44,9 @@
 BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	scrollkeeper >= 0.3.11-4
 BuildRequires:	system-tools-backends >= 1.4.0
-Requires:	gnome-icon-theme >= 2.12.1
-Requires:	gnome-panel >= 2.12.1
-Requires:	gnome-vfs2 >= 2.12.1
+Requires:	gnome-icon-theme >= 2.14.0
+Requires:	gnome-panel >= 2.14.0
+Requires:	gnome-vfs2 >= 2.14.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_gnomehelpdir	%{_datadir}/gnome/help
@@ -72,7 +72,7 @@
 Summary(pl):	Pliki nagłówkowe gnome-applets
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	GConf2-devel >= 2.12.0
+Requires:	GConf2-devel >= 2.14.0
 Requires:	gtk+2-devel >= 2:2.8.3
 
 %description devel
@@ -239,7 +239,7 @@
 Requires(post,preun):	GConf2
 Requires(post,postun):	scrollkeeper
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	gstreamer-audio-effects
+Requires:	gstreamer-audio-effects-base >= 0.10
 Requires:	gstreamer-audiosink
 Conflicts:	gnome-applets <= 0:2.10.0-5
 
@@ -325,7 +325,8 @@
 %{__autoconf}
 %configure \
 	--disable-static \
-	--disable-schemas-install
+	--disable-schemas-install \
+	--enable-mini-commander
 %{__make}
 
 %install
@@ -336,6 +337,7 @@
 	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
 rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+rm -r $RPM_BUILD_ROOT%{_libdir}/libgweather.la
 
 %find_lang %{name} --all-name --with-gnome
 %find_lang char-palette --with-gnome
@@ -429,6 +431,7 @@
 %scrollkeeper_update_postun
 
 %post gweather
+/sbin/ldconfig
 %scrollkeeper_update_post
 %gconf_schema_install gweather.schemas
 
@@ -436,6 +439,7 @@
 %gconf_schema_uninstall gweather.schemas
 
 %postun gweather
+/sbin/ldconfig
 %scrollkeeper_update_postun
 
 %post keyboard
@@ -530,6 +534,7 @@
 %{_iconsdir}/hicolor/48x48/apps/ax-applet.png
 %dir %{_omf_dest_dir}/accessx-status
 %{_omf_dest_dir}/accessx-status/accessx-status-C.omf
+%lang(bg) %{_omf_dest_dir}/accessx-status/accessx-status-bg.omf
 %lang(es) %{_omf_dest_dir}/accessx-status/accessx-status-es.omf
 %lang(fr) %{_omf_dest_dir}/accessx-status/accessx-status-fr.omf
 %lang(it) %{_omf_dest_dir}/accessx-status/accessx-status-it.omf
@@ -546,7 +551,9 @@
 %{_sysconfdir}/sound/events/battstat_applet.soundlist
 %dir %{_omf_dest_dir}/battstat
 %{_omf_dest_dir}/battstat/battstat-C.omf
+%lang(bg) %{_omf_dest_dir}/battstat/battstat-bg.omf
 %lang(es) %{_omf_dest_dir}/battstat/battstat-es.omf
+%lang(fr) %{_omf_dest_dir}/battstat/battstat-fr.omf
 %lang(uk) %{_omf_dest_dir}/battstat/battstat-uk.omf
 
 %files charpicker -f char-palette.lang
@@ -559,7 +566,9 @@
 %{_sysconfdir}/gconf/schemas/charpick.schemas
 %dir %{_omf_dest_dir}/char-palette
 %{_omf_dest_dir}/char-palette/char-palette-C.omf
+%lang(bg) %{_omf_dest_dir}/char-palette/char-palette-bg.omf
 %lang(es) %{_omf_dest_dir}/char-palette/char-palette-es.omf
+%lang(fr) %{_omf_dest_dir}/char-palette/char-palette-fr.omf
 %lang(it) %{_omf_dest_dir}/char-palette/char-palette-it.omf
 %lang(nl) %{_omf_dest_dir}/char-palette/char-palette-nl.omf
 %lang(pt_BR) %{_omf_dest_dir}/char-palette/char-palette-pt_BR.omf
@@ -579,6 +588,7 @@
 %dir %{_omf_dest_dir}/cpufreq-applet
 %{_omf_dest_dir}/cpufreq-applet/cpufreq-applet-C.omf
 %lang(es) %{_omf_dest_dir}/cpufreq-applet/cpufreq-applet-es.omf
+%lang(nl) %{_omf_dest_dir}/cpufreq-applet/cpufreq-applet-nl.omf
 %lang(uk) %{_omf_dest_dir}/cpufreq-applet/cpufreq-applet-uk.omf
 
 %files drivemount -f drivemount.lang
@@ -591,6 +601,7 @@
 %dir %{_omf_dest_dir}/drivemount
 %{_omf_dest_dir}/drivemount/drivemount-C.omf
 %lang(es) %{_omf_dest_dir}/drivemount/drivemount-es.omf
+%lang(fr) %{_omf_dest_dir}/drivemount/drivemount-fr.omf
 %lang(it) %{_omf_dest_dir}/drivemount/drivemount-it.omf
 %lang(pa) %{_omf_dest_dir}/drivemount/drivemount-pa.omf
 %lang(uk) %{_omf_dest_dir}/drivemount/drivemount-uk.omf
@@ -606,8 +617,12 @@
 %{_sysconfdir}/gconf/schemas/geyes.schemas
 %dir %{_omf_dest_dir}/geyes
 %{_omf_dest_dir}/geyes/geyes-C.omf
+%lang(bg) %{_omf_dest_dir}/geyes/geyes-bg.omf
 %lang(es) %{_omf_dest_dir}/geyes/geyes-es.omf
+%lang(es) %{_omf_dest_dir}/geyes/geyes-es.omf
+%lang(fr) %{_omf_dest_dir}/geyes/geyes-fr.omf
 %lang(it) %{_omf_dest_dir}/geyes/geyes-it.omf
+%lang(ru) %{_omf_dest_dir}/geyes/geyes-ru.omf
 %lang(uk) %{_omf_dest_dir}/geyes/geyes-uk.omf
 
 %files gtik -f gtik2_applet2.lang
@@ -621,12 +636,14 @@
 %dir %{_omf_dest_dir}/gtik2_applet2
 %{_omf_dest_dir}/gtik2_applet2/gtik2_applet2-C.omf
 %lang(es) %{_omf_dest_dir}/gtik2_applet2/gtik2_applet2-es.omf
+%lang(fr) %{_omf_dest_dir}/gtik2_applet2/gtik2_applet2-fr.omf
 %lang(uk) %{_omf_dest_dir}/gtik2_applet2/gtik2_applet2-uk.omf
 
 %files gweather -f gweather.lang
 %defattr(644,root,root,755)
 %doc gweather/ChangeLog
 %attr(755,root,root) %{_libdir}/gweather-applet-2
+%attr(755,root,root) %{_libdir}/libgweather.so*
 %{_libdir}/bonobo/servers/GNOME_GWeatherApplet_Factory.server
 %{_datadir}/gnome-2.0/ui/GNOME_GWeatherApplet.xml
 %{_datadir}/%{name}/gweather
@@ -634,6 +651,8 @@
 %dir %{_omf_dest_dir}/gweather
 %{_omf_dest_dir}/gweather/gweather-C.omf
 %lang(es) %{_omf_dest_dir}/gweather/gweather-es.omf
+%lang(fr) %{_omf_dest_dir}/gweather/gweather-fr.omf
+%lang(nl) %{_omf_dest_dir}/gweather/gweather-nl.omf
 %lang(uk) %{_omf_dest_dir}/gweather/gweather-uk.omf
 
 %files keyboard -f gswitchit.lang
@@ -712,6 +731,7 @@
 %dir %{_omf_dest_dir}/command-line
 %{_omf_dest_dir}/command-line/command-line-C.omf
 %lang(es) %{_omf_dest_dir}/command-line/command-line-es.omf
+%lang(fr) %{_omf_dest_dir}/command-line/command-line-fr.omf
 %lang(pt_BR) %{_omf_dest_dir}/command-line/command-line-pt_BR.omf
 %lang(uk) %{_omf_dest_dir}/command-line/command-line-uk.omf
 
@@ -725,6 +745,8 @@
 %dir %{_omf_dest_dir}/mixer_applet2
 %{_omf_dest_dir}/mixer_applet2/mixer_applet2-C.omf
 %lang(es) %{_omf_dest_dir}/mixer_applet2/mixer_applet2-es.omf
+%lang(it) %{_omf_dest_dir}/mixer_applet2/mixer_applet2-it.omf
+%lang(fr) %{_omf_dest_dir}/mixer_applet2/mixer_applet2-fr.omf
 %lang(uk) %{_omf_dest_dir}/mixer_applet2/mixer_applet2-uk.omf
 
 %files modemlights
@@ -746,6 +768,7 @@
 %dir %{_omf_dest_dir}/multiload
 %{_omf_dest_dir}/multiload/multiload-C.omf
 %lang(es) %{_omf_dest_dir}/multiload/multiload-es.omf
+%lang(fr) %{_omf_dest_dir}/multiload/multiload-fr.omf
 %lang(uk) %{_omf_dest_dir}/multiload/multiload-uk.omf
 
 %files stickynotes -f stickynotes_applet.lang
@@ -760,6 +783,7 @@
 %dir %{_omf_dest_dir}/stickynotes_applet
 %{_omf_dest_dir}/stickynotes_applet/stickynotes_applet-C.omf
 %lang(es) %{_omf_dest_dir}/stickynotes_applet/stickynotes_applet-es.omf
+%lang(fr) %{_omf_dest_dir}/stickynotes_applet/stickynotes_applet-fr.omf
 %lang(uk) %{_omf_dest_dir}/stickynotes_applet/stickynotes_applet-uk.omf
 
 %files trash -f trashapplet.lang
@@ -774,7 +798,9 @@
 %lang(es) %{_omf_dest_dir}/trashapplet/trashapplet-es.omf
 %lang(fr) %{_omf_dest_dir}/trashapplet/trashapplet-fr.omf
 %lang(it) %{_omf_dest_dir}/trashapplet/trashapplet-it.omf
+%lang(nl) %{_omf_dest_dir}/trashapplet/trashapplet-nl.omf
 %lang(pa) %{_omf_dest_dir}/trashapplet/trashapplet-pa.omf
+%lang(ru) %{_omf_dest_dir}/trashapplet/trashapplet-ru.omf
 %lang(uk) %{_omf_dest_dir}/trashapplet/trashapplet-uk.omf
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -783,6 +809,31 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.160.2.1  2006/05/17 12:31:50  baggins
+- merged from HEAD
+- updated BRs for GNOME 2.14
+
+Revision 1.162  2006/04/10 17:26:02  freetz
+- 2.14.1
+
+Revision 1.161  2006/04/02 10:49:54  freetz
+- merged from DEVEL
+
+Revision 1.159.2.5  2006/03/12 14:20:29  freetz
+- 2.14.0
+
+Revision 1.159.2.4  2006/02/26 15:24:47  freetz
+- 2.13.90
+
+Revision 1.159.2.3  2006/02/12 18:15:34  freetz
+- 2.13.4
+
+Revision 1.159.2.2  2006/01/31 16:47:39  freetz
+- fixed gstreamer deps
+
+Revision 1.159.2.1  2006/01/31 16:23:31  freetz
+- 2.13.3
+
 Revision 1.160  2006/02/08 16:54:37  freetz
 - 2.12.3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnome-applets.spec?r1=1.160&r2=1.160.2.1&f=u

More information about the pld-cvs-commit mailing list