+# TODO:
+# - NetworkManager bcond
+#
Summary: The core programs for the GNOME GUI desktop environment
-Summary(pl): Podstawowe programy ¶rodowiska graficznego GNOME
+Summary(pl.UTF-8): Podstawowe programy środowiska graficznego GNOME
Name: gnome-panel
-Version: 2.4.1
-Release: 6
+Version: 2.24.0
+Release: 1
License: LGPL
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.4/%{name}-%{version}.tar.bz2
-# Source0-md5: bdef7c238e1d1eb7976f2bca3b0c8aca
-Source1: pld-desktop-stripe.png
-# Source1-md5: 4b8b299a8aa7b95a606e7c4d8debd60c
-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
-Patch5: %{name}-action-stock.patch
-Patch6: %{name}-applet-categories.patch
-Patch7: %{name}-menu-stripe.patch
-Patch8: %{name}-notification_area_applet.patch
-Patch9: %{name}-top_panel_size.patch
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.24/%{name}-%{version}.tar.bz2
+# Source0-md5: 8720f9b42692904ce7df371715248255
+Patch0: %{name}-no_launchers_on_panel.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=552049
+Patch1: %{name}-use-sysconfig-timezone.patch
URL: http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.4.0
-BuildRequires: ORBit2-devel >= 2.8.1
+BuildRequires: GConf2-devel >= 2.24.0
+BuildRequires: NetworkManager-devel >= 0.6
+BuildRequires: ORBit2-devel >= 1:2.14.9
+BuildRequires: PolicyKit-gnome-devel >= 0.7
BuildRequires: autoconf
-BuildRequires: automake
-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.4.0.1
+BuildRequires: automake > 1:1.9
+BuildRequires: dbus-devel >= 1.1.2
+BuildRequires: dbus-glib-devel >= 0.74
+BuildRequires: evolution-data-server-devel >= 2.24.0
+BuildRequires: gettext-devel
+BuildRequires: glib2-devel >= 1:2.18.0
+BuildRequires: gnome-common >= 2.20.0
+BuildRequires: gnome-desktop-devel >= 2.24.0
+BuildRequires: gnome-doc-utils >= 0.12.0
+BuildRequires: gnome-menus-devel >= 2.24.0
+BuildRequires: gtk+2-devel >= 2:2.14.0
+BuildRequires: gtk-doc >= 1.9
+BuildRequires: intltool >= 0.37.0
+BuildRequires: libglade2-devel >= 1:2.6.2
+BuildRequires: libgnomeui-devel >= 2.24.0
+BuildRequires: libgweather-devel >= 2.24.0
+BuildRequires: librsvg-devel >= 2.22.0
BuildRequires: libtool
-BuildRequires: libwnck-devel >= 2.4.0
-BuildRequires: pkgconfig >= 0.15.0
+BuildRequires: libwnck-devel >= 2.24.0
+BuildRequires: libxml2-devel >= 1:2.6.31
+BuildRequires: perl-base
+BuildRequires: pkgconfig >= 1:0.15.0
BuildRequires: rpm-build >= 4.1-10
+BuildRequires: rpmbuild(find_lang) >= 1.23
+BuildRequires: rpmbuild(macros) >= 1.311
BuildRequires: scrollkeeper >= 0.3.11
+BuildRequires: sed >= 4.0
BuildConflicts: GConf-devel < 1.0.9-7
-Requires(post,postun): /sbin/ldconfig
+Requires(post,postun): gtk+2
+Requires(post,postun): hicolor-icon-theme
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
+Requires(post,preun): GConf2
+Requires: %{name}-libs = %{version}-%{release}
+Requires: gnome-desktop >= 2.24.0
+Requires: gnome-icon-theme >= 2.24.0
+Requires: tzdata >= 2008b-4
+Requires: xdg-menus
+Suggests: PolicyKit-gnome >= 0.7
+Suggests: gnome-utils-screenshot
+Suggests: gnome-utils-search-tool
+# sr@Latn vs. sr@latin
+Conflicts: glibc-misc < 6:2.7
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
The gnome-panel packages provides the GNOME panel, menus and some
basic applets for the panel.
-%description -l pl
-GNOME (GNU Network Object Model Environment) to zestaw przyjaznych
-dla u¿ytkownika aplikacji i narzêdzi do u¿ywania w po³±czeniu z
-zarz±dc± okien pod X. GNOME ma podobny cel jak CDE i KDE, ale bazuje
-ca³kowicie na wolnym oprogramowaniu.
+%description -l pl.UTF-8
+GNOME (GNU Network Object Model Environment) to zestaw przyjaznych dla
+użytkownika aplikacji i narzędzi do używania w połączeniu z zarządcą
+okien pod X. GNOME ma podobny cel jak CDE i KDE, ale bazuje całkowicie
+na wolnym oprogramowaniu.
Ten pakiet dostarcza panel GNOME2, menu oraz podstawowe aplety dla
panelu GNOME2.
+%package libs
+Summary: GNOME panel library
+Summary(pl.UTF-8): Biblioteka panelu GNOME
+Group: X11/Libraries
+Requires: libgnomeui >= 2.24.0
+Requires: librsvg >= 1:2.22.0
+
+%description libs
+GNOME panel library.
+
+%description libs -l pl.UTF-8
+Biblioteka panelu GNOME.
+
%package devel
Summary: GNOME panel includes, and more
-Summary(pl): Pliki nag³ówkowe biblioteki panelu GNOME
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki panelu GNOME
Group: X11/Development/Libraries
-Requires: %{name} = %{version}
-Requires: gtk-doc-common
-Requires: libgnomeui-devel >= 2.4.0.1
+Requires: %{name}-libs = %{version}-%{release}
+Requires: libgnomeui-devel >= 2.24.0
%description devel
Panel header files for creating GNOME panels.
-%description devel -l pl
-Pliki nag³ówkowe bibliotek panelu GNOME.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe bibliotek panelu GNOME.
%package static
Summary: GNOME panel static libraries
-Summary(pl): Statyczne biblioteki panelu GNOME
+Summary(pl.UTF-8): Statyczne biblioteki panelu GNOME
Group: X11/Development/Libraries
-Requires: %{name}-devel = %{version}
+Requires: %{name}-devel = %{version}-%{release}
%description static
Panel static libraries.
-%description static -l pl
+%description static -l pl.UTF-8
Statyczne biblioteki panelu GNOME.
+%package apidocs
+Summary: panel-applet API documentation
+Summary(pl.UTF-8): Dokumentacja API panel-applet
+Group: Documentation
+Requires: gtk-doc-common
+
+%description apidocs
+panel-applet API documentation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API panel-applet.
+
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
+%patch1 -p0
+
+# short circuit stopper (fix me!)
+mv ChangeLog main-ChangeLog
+find . -name ChangeLog |awk '{src=$0; dst=$0;sub("^./","",dst);gsub("/","-",dst); print "cp " src " " dst}'|sh
%build
-intltoolize --copy --force
+%{__gnome_doc_prepare}
+%{__gnome_doc_common}
+%{__intltoolize}
%{__libtoolize}
-glib-gettextize --copy --force
-%{__aclocal} -I %{_aclocaldir}/gnome2-macros
-%{__autoheader}
+%{__aclocal}
%{__autoconf}
+%{__autoheader}
%{__automake}
%configure \
+ --disable-schemas-install \
+ --enable-eds \
--enable-gtk-doc \
--with-html-dir=%{_gtkdocdir}
-
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_datadir}/%{name}}
%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
+ DESTDIR=$RPM_BUILD_ROOT \
+ GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
install %{name}/panel-default-setup.entries $RPM_BUILD_ROOT%{_datadir}/%{name}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_pixmapsdir}
-
-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
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/panel-default-setup.entries
-mv ChangeLog main-ChangeLog
-find . -name ChangeLog |awk '{src=$0; dst=$0;sub("^./","",dst);gsub("/","-",dst); print "cp " src " " dst}'|sh
-
-%find_lang %{name} --with-gnome --all-name
+%find_lang %{name} --with-gnome --with-omf --all-name
%clean
rm -rf $RPM_BUILD_ROOT
%post
-/sbin/ldconfig
-scrollkeeper-update
-%gconf_schema_install
+%scrollkeeper_update_post
+%gconf_schema_install clock.schemas
+%gconf_schema_install fish.schemas
+%gconf_schema_install panel-compatibility.schemas
+%gconf_schema_install panel-general.schemas
+%gconf_schema_install panel-global.schemas
+%gconf_schema_install panel-object.schemas
+%gconf_schema_install panel-toplevel.schemas
+%gconf_schema_install window-list.schemas
+%gconf_schema_install workspace-switcher.schemas
+%update_icon_cache hicolor
+
%{_bindir}/gconftool-2 --direct \
---config-source="`%{_bindir}/gconftool-2 --get-default-source`" \
---load %{_datadir}/%{name}/panel-default-setup.entries > /dev/null
+ --config-source="`%{_bindir}/gconftool-2 --get-default-source`" \
+ --load %{_datadir}/%{name}/panel-default-setup.entries > /dev/null
+%{_bindir}/gconftool-2 --direct \
+ --config-source="`%{_bindir}/gconftool-2 --get-default-source`" \
+ --load %{_datadir}/%{name}/panel-default-setup.entries /apps/panel/profiles/default > /dev/null
+
+%preun
+%gconf_schema_uninstall clock.schemas
+%gconf_schema_uninstall fish.schemas
+%gconf_schema_uninstall panel-compatibility.schemas
+%gconf_schema_uninstall panel-general.schemas
+%gconf_schema_uninstall panel-global.schemas
+%gconf_schema_uninstall panel-object.schemas
+%gconf_schema_uninstall panel-toplevel.schemas
+%gconf_schema_uninstall window-list.schemas
+%gconf_schema_uninstall workspace-switcher.schemas
%postun
-/sbin/ldconfig
-scrollkeeper-update
+%scrollkeeper_update_postun
+%update_icon_cache hicolor
+
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS NEWS README *ChangeLog
-%config %{_sysconfdir}/gconf/schemas/*
-%attr(755,root,root) %{_bindir}/*
+%doc AUTHORS MAINTAINERS NEWS README *ChangeLog
+%attr(755,root,root) %{_bindir}/gnome-desktop-item-edit
+%attr(755,root,root) %{_bindir}/gnome-panel
+%attr(755,root,root) %{_bindir}/panel-test-applets
+%attr(755,root,root) %{_libdir}/clock-applet
%attr(755,root,root) %{_libdir}/fish-applet-2
-%attr(755,root,root) %{_libdir}/libpanel-applet*.so.*.*
-%attr(755,root,root) %{_libdir}/libclock-applet*.so
-%attr(755,root,root) %{_libdir}/wnck-applet
+%attr(755,root,root) %{_libdir}/gnome-clock-applet-mechanism
%attr(755,root,root) %{_libdir}/notification-area-applet
-%{_libdir}/bonobo/servers/*
-%{_datadir}/gnome/capplets/*
-%{_datadir}/gnome/panel
-%{_datadir}/gnome-2.0/ui/*
+%attr(755,root,root) %{_libdir}/wnck-applet
+%{_datadir}/PolicyKit/policy/org.gnome.clockapplet.mechanism.policy
+%{_datadir}/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
+%{_datadir}/gnome-2.0/ui/*.xml
%{_datadir}/gnome-panel
%{_datadir}/gnome-panelrc
%{_datadir}/idl/gnome-panel-2.0
-%{_pixmapsdir}/*
-%{_omf_dest_dir}/%{name}
-%{_mandir}/man1/*
+%{_desktopdir}/gnome-panel.desktop
+%{_iconsdir}/hicolor/*/apps/*
+%{_libdir}/bonobo/servers/*.server
+%{_mandir}/man1/*.1*
+%{_sysconfdir}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
+%{_sysconfdir}/gconf/schemas/clock.schemas
+%{_sysconfdir}/gconf/schemas/fish.schemas
+%{_sysconfdir}/gconf/schemas/panel-compatibility.schemas
+%{_sysconfdir}/gconf/schemas/panel-general.schemas
+%{_sysconfdir}/gconf/schemas/panel-global.schemas
+%{_sysconfdir}/gconf/schemas/panel-object.schemas
+%{_sysconfdir}/gconf/schemas/panel-toplevel.schemas
+%{_sysconfdir}/gconf/schemas/window-list.schemas
+%{_sysconfdir}/gconf/schemas/workspace-switcher.schemas
+
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libpanel-applet-2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpanel-applet-2.so.0
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpanel-applet*.so
-%{_libdir}/*.la
-%{_gtkdocdir}/panel-applet
+%attr(755,root,root) %{_libdir}/libpanel-applet-2.so
+%{_libdir}/libpanel-applet-2.la
%{_includedir}/panel-2.0
-%{_pkgconfigdir}/*.pc
+%{_pkgconfigdir}/libpanelapplet-2.0.pc
%files static
%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libpanel-applet-2.a
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/panel-applet
projects / packages / gnome-panel.git / blobdiff