- started update to 2.1.0; waiting for gtk+-2.1.0

[packages/gnome-panel.git] / gnome-panel.spec

diff --git a/gnome-panel.spec b/gnome-panel.spec
index a7ec85305d9124201facdd3ad3044d4ad681dbfb..5d0271a8b84e582522ae1811966438f15a0a6aee 100644 (file)
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -1,31 +1,34 @@
 Summary:       The core programs for the GNOME GUI desktop environment
 Summary(pl):   Podstawowe programy ¶rodowiska graficznego GNOME
 Name:          gnome-panel
-Version:       2.0.1
+Version:       2.1.0
 Release:       1
 License:       LGPL
 Group:         X11/Applications
-Source0:       ftp://ftp.gnome.org/pub/gnome/pre-gnome2/sources/%{name}/%{name}-%{version}.tar.bz2
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.1/%{name}-%{version}.tar.bz2
 URL:           http://www.gnome.org/
-Requires:      gnome-desktop >= 2.0.1
-BuildRequires: ORBit2-devel >= 2.4.0
-BuildRequires: glib2-devel >= 2.0.4
-BuildRequires: gnome-desktop-devel >= 2.0.0
-BuildRequires: gtk+2-devel >= 2.0.3
-BuildRequires: libglade2-devel >= 2.0.0
-BuildRequires: libgnomeui-devel >= 2.0.1
-BuildRequires: libwnck-devel >= 0.14
-BuildRequires: pkgconfig >= 0.12.0
+BuildRequires: ORBit2-devel >= 2.4.3
+Buildrequires: gdk-pixbuf-devel >= 2.1.0
+BuildRequires: glib2-devel >= 2.1.0
+BuildRequires: gnome-desktop-devel >= 2.1.0
+BuildRequires:  gtk-doc
+BuildRequires: gtk+2-devel >= 2.1.0
 BuildRequires: intltool >= 0.22
-BuildRequires: scrollkeeper >= 0.3.6
+BuildRequires: libglade2-devel >= 2.0.1
+BuildRequires: libgnomeui-devel >= 2.1.0
+BuildRequires: libwnck-devel >= 2.1.1
+BuildRequires: pkgconfig >= 0.12.0
+BuildRequires: scrollkeeper >= 0.3.11
 Requires(post,postun): scrollkeeper
 Requires(post,postun): /sbin/ldconfig
 Requires(post):        GConf2
+Requires:      gnome-desktop >= 2.1.0
 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)
 
 %description
@@ -51,6 +54,7 @@ Summary:      GNOME panel includes, and more
 Summary(pl):   Pliki nag³ówkowe biblioteki panelu GNOME
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}
+Requires:      gtk-doc-common
 
 %description devel
 Panel header files for creating GNOME panels.
@@ -80,8 +84,10 @@ glib-gettextize --copy --force
 %{__aclocal} -I %{_aclocaldir}/gnome2-macros
 %{__autoconf}
 %{__automake}
-%configure  \
-       --enable-gtk-doc=no
+%configure \
+       --enable-gtk-doc \
+       --with-html-path=%{_gtkdocdir}
+
 %{__make}
 
 %install
@@ -90,7 +96,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
        omf_dest_dir=%{_omf_dest_dir}/%{name} \
-       pkgconfigdir=%{_pkgconfigdir}
+       pkgconfigdir=%{_pkgconfigdir} \
+       HTML_DIR=%{_gtkdocdir}
 
 mv ChangeLog main-ChangeLog
 find . -name ChangeLog |awk '{src=$0; dst=$0;sub("^./","",dst);gsub("/","-",dst); print "cp " src " " dst}'|sh
@@ -103,7 +110,7 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/ldconfig
 scrollkeeper-update
-GCONF_CONFIG_SOURCE="" \
+GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" \
 %{_bindir}/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/*.schemas > /dev/null 
 
 %postun        
@@ -116,6 +123,7 @@ scrollkeeper-update
 %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}/libgen_util_applet*.la
@@ -125,7 +133,6 @@ scrollkeeper-update
 %{_datadir}/gnome/panel
 %{_datadir}/gnome-2.0/ui/*
 %{_datadir}/gnome-panel*
-%{_datadir}/gtk-doc/html/panel-applet
 %{_datadir}/idl/gnome-panel-2.0
 %{_datadir}/pixmaps/*
 %{_omf_dest_dir}/%{name}
@@ -134,9 +141,10 @@ scrollkeeper-update
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpanel-applet*.??
+%{_gtkdocdir}/panel-applet
 %{_includedir}/panel-2.0
 %{_pkgconfigdir}/*.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libpanel-applet*.a
+%{_libdir}/lib*.a