commit d890544fd1a5ed4ef91cca1f21d226ba1acf64a0
Author: grzegol <[email protected]>
Date:   Mon Sep 13 16:42:59 2004 +0000

    - merged from DEVEL and updated to 2.8.0
    - removed locale-names patch
    - remove no locale in %%install
    
    Changed files:
        gnome-applets.spec -> 1.136

 gnome-applets.spec | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)
---
diff --git a/gnome-applets.spec b/gnome-applets.spec
index d2bb538..3f690b1 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -3,40 +3,40 @@ Summary(pl):  Aplety GNOME - ma
 Summary(ru):   ��������� ���������, �������������� � ������ GNOME
 Summary(uk):   ������˦ ��������, �� ������������ � ������ GNOME
 Name:          gnome-applets
-Version:       2.6.2.1
+Version:       2.8.0
 Release:       1
 Epoch:         1
 License:       GPL v2, FDL
 Group:         X11/Applications
-Source0:       
http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.6/%{name}-%{version}.tar.bz2
-# Source0-md5: d29dc21035db8b93671058d7f1ac4aaa
+Source0:       
http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.8/%{name}-%{version}.tar.bz2
+# Source0-md5: 956ab6b71db8b75676f7e123c5d68b55
 Patch0:                %{name}-stickynotes-title-size.patch
-Patch1:                %{name}-locale-names.patch
 URL:           http://www.gnome.org/
+BuildRequires: GConf2-devel >= 2.7.92
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: gail-devel >= 1.6.6
+BuildRequires: gail-devel >= 1.8.0
 BuildRequires: gdbm-devel
 BuildRequires: gettext-devel
 BuildRequires: gnome-common >= 2.4.0
-BuildRequires: gnome-panel-devel >= 2.6.2
-BuildRequires: gnome-vfs2-devel >= 2.6.1.1
-BuildRequires: gstreamer-plugins-devel >= 0.8.1
-BuildRequires: gtk+2-devel >= 2:2.4.3
+BuildRequires: gnome-panel-devel >= 2.7.92
+BuildRequires: gnome-vfs2-devel >= 2.8.0
+BuildRequires: gstreamer-plugins-devel >= 0.8.3
+BuildRequires: gtk+2-devel >= 2:2.4.4
 BuildRequires: intltool >= 0.29
-BuildRequires: libgnome-devel >= 2.6.1.1
-BuildRequires: libgnomecanvas-devel >= 2.6.1.1
-BuildRequires: libgnomeui-devel >= 2.6.1.1
+BuildRequires: libgnome-devel >= 2.7.92
+BuildRequires: libgnomecanvas-devel >= 2.7.92
+BuildRequires: libgnomeui-devel >= 2.7.92
 BuildRequires: libglade2-devel >= 1:2.4.0
-BuildRequires: libgtop-devel >= 2.6.0
+BuildRequires: libgtop-devel >= 1:2.7.92
 BuildRequires: libtool
-BuildRequires: libwnck-devel >= 2.6.2
-BuildRequires: libxml2-devel >= 2.6.7
-BuildRequires: libxklavier-devel >= 1.02
+BuildRequires: libwnck-devel >= 2.7.92
+BuildRequires: libxml2-devel >= 2.6.11
+BuildRequires: libxklavier-devel >= 1.03
 BuildRequires: scrollkeeper >= 0.3.11-4
-Requires(post):        GConf2 >= 2.6.1
+Requires(post):        GConf2 >= 2.7.92
 Requires(post):        scrollkeeper
-Requires:      gnome-vfs2 >= 2.6.1.1
+Requires:      gnome-vfs2 >= 2.8.0
 Requires:      gstreamer-audiosink
 Obsoletes:     gnotes_applet
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -62,8 +62,8 @@ Summary:      Header files for gnome-applets
 Summary(pl):   Pliki nag��wkowe gnome-applets
 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      GConf2-devel >= 2.6.2
-Requires:      gtk+2-devel >= 2:2.4.3
+Requires:      GConf2-devel >= 2.7.92
+Requires:      gtk+2-devel >= 2:2.4.4
 
 %description devel
 Header files for gnome-applets.
@@ -74,9 +74,6 @@ Pliki nag
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-
-mv po/{no,nb}.po
 
 %build
 %{__aclocal}
@@ -99,6 +96,8 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT \
        GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+
 %find_lang %{name} --with-gnome --all-name
 
 find $RPM_BUILD_ROOT/%{_pixmapsdir}/gkb/|grep '/..\.png$'|sed 
"s=$RPM_BUILD_ROOT\(/%{_pixmapsdir}/gkb/\)\(..\)\(.png\)=%lang(\2) \1\2\3=" >> 
%{name}.lang
@@ -218,6 +217,7 @@ GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 
--get-default-source`" %{_libdir}/%
 %lang(sv) %{_datadir}/gnome/gkb/SE_Swedish*.keyprop
 %lang(sl) %{_datadir}/gnome/gkb/SI_Slovenian*.keyprop
 %lang(sk) %{_datadir}/gnome/gkb/Slovak.keyprop
+%lang(sk) %{_datadir}/gnome/gkb/SK_*
 %lang(sl) %{_datadir}/gnome/gkb/Sloven*.keyprop
 %lang(sr) %{_datadir}/gnome/gkb/SR_Dutch.keyprop
 %lang(sv) %{_datadir}/gnome/gkb/Swedish.keyprop
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mate-applets.git/commitdiff/65c1b73f8721e2c1dd8f5b7d875df06b87ad8453

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to