]> git.pld-linux.org Git - packages/gnome-panel.git/blobdiff - gnome-panel.spec
- move capplet to {_datadir}/gnome/capplets
[packages/gnome-panel.git] / gnome-panel.spec
index d84280d88930987de19880c9a23d2c0f74a2a81a..dfd79322c040cac9f97a511d4656fb670a03449f 100644 (file)
@@ -1,48 +1,53 @@
 Summary:       The core programs for the GNOME GUI desktop environment
 Summary(pl):   Podstawowe programy ¶rodowiska graficznego GNOME
 Name:          gnome-panel
-Version:       2.1.2
-Release:       2
+Version:       2.4.1
+Release:       3
 License:       LGPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.1/%{name}-%{version}.tar.bz2
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.4/%{name}-%{version}.tar.bz2
+# Source0-md5: bdef7c238e1d1eb7976f2bca3b0c8aca
+Patch0:                %{name}-clock.patch
+Patch1:                %{name}-no_launchers_on_panel.patch
+Patch2:                %{name}-focus.patch
+Patch3:                %{name}-finalize-memleak.patch
+Patch4:                %{name}-menu_icon.patch
 URL:           http://www.gnome.org/
-BuildRequires: ORBit2-devel >= 2.4.3
+BuildRequires: GConf2-devel >= 2.4.0
+BuildRequires: ORBit2-devel >= 2.8.1
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: glib2-devel >= 2.1.0
-BuildRequires: gnome-desktop-devel >= 2.1.2
-BuildRequires:  gtk-doc >= 0.9-4
-BuildRequires: gtk+2-devel >= 2.1.0
-BuildRequires: intltool >= 0.23
+BuildRequires: glib2-devel >= 2.2.3
+BuildRequires: gnome-common >= 2.3.0
+BuildRequires: gnome-desktop-devel >= 2.4.0
+BuildRequires: gtk+2-devel >= 2.2.4
+BuildRequires: gtk-doc >= 1.1
+BuildRequires: intltool >= 0.27.2
+BuildRequires: libart_lgpl-devel >= 2.3.15
 BuildRequires: libglade2-devel >= 2.0.1
-BuildRequires: libgnomeui-devel >= 2.1.2
+BuildRequires: libgnomeui-devel >= 2.4.0.1
 BuildRequires: libtool
-BuildRequires: libwnck-devel >= 2.1.3
-BuildRequires: pkgconfig >= 0.12.0
+BuildRequires: libwnck-devel >= 2.4.0
+BuildRequires: pkgconfig >= 0.15.0
+BuildRequires: rpm-build >= 4.1-10
 BuildRequires: scrollkeeper >= 0.3.11
 BuildConflicts:        GConf-devel < 1.0.9-7
-Requires(post,postun): scrollkeeper
-Requires(post,postun): /sbin/ldconfig
-Requires(post):        GConf2
-Requires:      gnome-desktop >= 2.1.2
-Requires:      libgnomeui >= 2.1.2
+Requires(post,postun): /sbin/ldconfig
+Requires(post,postun): scrollkeeper
+Requires(post):        GConf2 >= 2.4.0
+Requires:      gnome-desktop >= 2.4.0
+Requires:      gnome-icon-theme >= 1.0.9
+Requires:      libgnomeui >= 2.4.0.1
+Requires:      librsvg >= 2.4.0-3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define         _prefix         /usr/X11R6
-%define         _mandir         %{_prefix}/man
-%define         _sysconfdir     /etc/X11/GNOME2
-%define                _gtkdocdir      %{_defaultdocdir}/gtk-doc/html
-%define         _omf_dest_dir   %(scrollkeeper-config --omfdir)
-%define                _bonobo_server_dir      /usr/lib/bonobo/servers
-
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of
 applications and desktop tools to be used in conjunction with a window
 manager for the X Window System. GNOME is similar in purpose and scope
 to CDE and KDE, but GNOME is based completely on free software.
 
-The GNOME panel packages provides the gnome panel, menus and some
+The gnome-panel packages provides the GNOME panel, menus and some
 basic applets for the panel.
 
 %description -l pl
@@ -60,6 +65,7 @@ Summary(pl):  Pliki nag
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}
 Requires:      gtk-doc-common
+Requires:      libgnomeui-devel >= 2.4.0.1
 
 %description devel
 Panel header files for creating GNOME panels.
@@ -81,17 +87,23 @@ Statyczne biblioteki panelu GNOME.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 intltoolize --copy --force
 %{__libtoolize}
 glib-gettextize --copy --force
 %{__aclocal} -I %{_aclocaldir}/gnome2-macros
+%{__autoheader}
 %{__autoconf}
 %{__automake}
 %configure \
        --enable-gtk-doc \
-       --with-html-path=%{_gtkdocdir}
+       --with-html-dir=%{_gtkdocdir}
 
 %{__make}
 
@@ -99,11 +111,12 @@ glib-gettextize --copy --force
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       omf_dest_dir=%{_omf_dest_dir}/%{name} \
-       pkgconfigdir=%{_pkgconfigdir} \
-       HTML_DIR=%{_gtkdocdir} \
-       serverdir=%{_bonobo_server_dir}
+       DESTDIR=$RPM_BUILD_ROOT
+
+install %{name}/panel-default-setup.entries $RPM_BUILD_ROOT%{_datadir}/%{name}
+
+install -d $RPM_BUILD_ROOT%{_datadir}/gnome/capplets
+mv $RPM_BUILD_ROOT%{_datadir}/control-center-2.0/capplets/*.desktop $RPM_BUILD_ROOT%{_datadir}/gnome/capplets/*.desktop
 
 mv ChangeLog main-ChangeLog
 find . -name ChangeLog |awk '{src=$0; dst=$0;sub("^./","",dst);gsub("/","-",dst); print "cp " src " " dst}'|sh
@@ -116,44 +129,44 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/ldconfig
 scrollkeeper-update
-GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" \
-%{_bindir}/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/*.schemas > /dev/null 
+%gconf_schema_install
+%{_bindir}/gconftool-2 --direct \
+--config-source="`%{_bindir}/gconftool-2 --get-default-source`" \
+--load %{_datadir}/%{name}/panel-default-setup.entries > /dev/null
 
-%postun        
+%postun
 /sbin/ldconfig
 scrollkeeper-update
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS *ChangeLog NEWS README
+%doc AUTHORS NEWS README *ChangeLog
 %config %{_sysconfdir}/gconf/schemas/*
-%config %{_sysconfdir}/sound/events/*
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/fish-applet-2
 %attr(755,root,root) %{_libdir}/libpanel-applet*.so.*.*
-%attr(755,root,root) %{_libdir}/libgen_util_applet*.so
-%attr(755,root,root) %{_libdir}/%{name}/libnotification-area-applet.so
-%{_bonobo_server_dir}/*
-%{_datadir}/control-center-2.0/capplets/*
-%{_datadir}/gen_util
+%attr(755,root,root) %{_libdir}/libclock-applet*.so
+%attr(755,root,root) %{_libdir}/wnck-applet
+%attr(755,root,root) %{_libdir}/notification-area-applet
+%{_libdir}/bonobo/servers/*
+%{_datadir}/gnome/capplets/*
 %{_datadir}/gnome/panel
 %{_datadir}/gnome-2.0/ui/*
-%{_datadir}/gnome-panel*
+%{_datadir}/gnome-panel
+%{_datadir}/gnome-panelrc
 %{_datadir}/idl/gnome-panel-2.0
-%{_datadir}/pixmaps/*
+%{_pixmapsdir}/*
 %{_omf_dest_dir}/%{name}
 %{_mandir}/man1/*
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpanel-applet*.??
+%attr(755,root,root) %{_libdir}/libpanel-applet*.so
+%{_libdir}/*.la
 %{_gtkdocdir}/panel-applet
 %{_includedir}/panel-2.0
 %{_pkgconfigdir}/*.pc
-%{_libdir}/libgen_util_applet*.la
-%{_libdir}/%{name}/libnotification-area-applet.la
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
-%{_libdir}/%{name}/*.a
This page took 0.056363 seconds and 4 git commands to generate.