Author: aflinta Date: Tue Sep 6 13:21:39 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged form DEVEL, 2.12.0
---- Files affected: SPECS: gnome-panel.spec (1.168 -> 1.169) ---- Diffs: ================================================================ Index: SPECS/gnome-panel.spec diff -u SPECS/gnome-panel.spec:1.168 SPECS/gnome-panel.spec:1.169 --- SPECS/gnome-panel.spec:1.168 Thu Aug 11 11:46:18 2005 +++ SPECS/gnome-panel.spec Tue Sep 6 15:21:34 2005 @@ -1,59 +1,50 @@ # $Revision$, $Date$ -# -# TODO -# - fix menu-stripe patch -# -# Conditional build: -%bcond_with menu_stripe # build with menu-stripe.patch -# Summary: The core programs for the GNOME GUI desktop environment Summary(pl): Podstawowe programy środowiska graficznego GNOME Name: gnome-panel -Version: 2.10.2 +Version: 2.12.0 Release: 1 License: LGPL Group: X11/Applications -Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.10/%{name}-%{version}.tar.bz2 -# Source0-md5: c1756cac74a4c8b45ce3b9a884515baa -Source1: pld-desktop-stripe.png -# Source1-md5: 4b8b299a8aa7b95a606e7c4d8debd60c -Patch0: %{name}-no_launchers_on_panel.patch -Patch1: %{name}-finalize-memleak.patch -%{?with_menu_stripe:Patch2: %{name}-menu-stripe.patch} -Patch3: %{name}-notification_area_applet.patch -Patch4: %{name}-no_mixer_applet.patch +Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.12/%{name}-%{version}.tar.bz2 +# Source0-md5: d8d883b91aae4e7e8065d3b6ea322483 +Patch0: %{name}-finalize-memleak.patch +Patch1: %{name}-no_mixer_applet.patch +Patch2: %{name}-no_launchers_on_panel.patch URL: http://www.gnome.org/ -BuildRequires: GConf2-devel >= 2.10.0 -BuildRequires: ORBit2-devel >= 1:2.12.1 +BuildRequires: GConf2-devel >= 2.12.0 +BuildRequires: ORBit2-devel >= 1:2.12.3 BuildRequires: autoconf BuildRequires: automake -BuildRequires: evolution-data-server-devel >= 1.2.0 +BuildRequires: evolution-data-server-devel >= 1.4.0 BuildRequires: gnome-common >= 2.8.0-2 -BuildRequires: gnome-desktop-devel >= 2.10.0-2 -BuildRequires: gnome-menus-devel >= 2.10.0 -BuildRequires: gnome-vfs2-devel >= 2.10.0-2 -BuildRequires: gtk+2-devel >= 2:2.6.2 -BuildRequires: gtk-doc >= 1.1 +BuildRequires: gnome-doc-utils >= 0.4.0 +BuildRequires: gnome-desktop-devel >= 2.12.0 +BuildRequires: gnome-menus-devel >= 2.12.0 +BuildRequires: gnome-vfs2-devel >= 2.12.0 +BuildRequires: gtk+2-devel >= 2:2.8.3 +BuildRequires: gtk-doc >= 1.4 BuildRequires: intltool >= 0.31 BuildRequires: libart_lgpl-devel >= 2.3.15 BuildRequires: libglade2-devel >= 1:2.5.0 -BuildRequires: libgnomeui-devel >= 2.10.0-2 +BuildRequires: libgnomeui-devel >= 2.12.0 BuildRequires: libtool -BuildRequires: libwnck-devel >= 2.10.0 -BuildRequires: pango-devel >= 1:1.8.0 +BuildRequires: libwnck-devel >= 2.12.0 +BuildRequires: pango-devel >= 1:1.10.0 BuildRequires: perl-base BuildRequires: pkgconfig >= 1:0.15.0 +BuildRequires: python-libxml2 BuildRequires: rpm-build >= 4.1-10 BuildRequires: rpmbuild(macros) >= 1.197 BuildRequires: scrollkeeper >= 0.3.11 BuildConflicts: GConf-devel < 1.0.9-7 Requires(post,postun): /sbin/ldconfig -Requires(post,preun): GConf2 >= 2.10.0 +Requires(post,preun): GConf2 >= 2.12.0 Requires(post,postun): scrollkeeper -Requires: gnome-desktop >= 2.10.0-2 -Requires: gnome-icon-theme >= 2.10.0 -Requires: libgnomeui >= 2.10.0-2 -Requires: librsvg >= 1:2.9.5 +Requires: %{name}-libs = %{version}-%{release} +Requires: gnome-desktop >= 2.12.0 +Requires: gnome-icon-theme >= 2.12.0 +Requires: gnome-session >= 2.12.0 Requires: xdg-menus BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -79,9 +70,9 @@ Summary: GNOME panel includes, and more Summary(pl): Pliki nagłówkowe biblioteki panelu GNOME Group: X11/Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: gtk-doc-common -Requires: libgnomeui-devel >= 2.10.0-2 +Requires: libgnomeui-devel >= 2.12.0 %description devel Panel header files for creating GNOME panels. @@ -101,16 +92,28 @@ %description static -l pl Statyczne biblioteki panelu GNOME. +%package libs +Summary: GNOME panel library +Summary(pl): Biblioteka panelu GNOME +Group: X11/Libraries +Requires: libgnomeui >= 2.12.0 +Requires: librsvg >= 1:2.11.0 + +%description libs +GNOME panel library. + +%description libs -l pl +Biblioteka panelu GNOME. + %prep %setup -q %patch0 -p1 %patch1 -p1 -%{?with_menu_stripe:%patch2 -p1} -%patch3 -p1 -%patch4 -p1 +%patch2 -p1 %build -cp /usr/share/gnome-common/data/omf.make . +gnome-doc-prepare --copy --force +%{__gnome_doc_common} %{__intltoolize} %{__libtoolize} %{__glib_gettextize} @@ -119,10 +122,10 @@ %{__autoconf} %{__automake} %configure \ - --enable-gtk-doc \ - --with-html-dir=%{_gtkdocdir} \ + --disable-schemas-install \ --enable-eds \ - --disable-schemas-install + --enable-gtk-doc \ + --with-html-dir=%{_gtkdocdir} %{__make} %install @@ -135,12 +138,12 @@ install %{name}/panel-default-setup.entries $RPM_BUILD_ROOT%{_datadir}/%{name} -install %{SOURCE1} $RPM_BUILD_ROOT%{_pixmapsdir} - +# 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 rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/panel-default-setup.entries %find_lang %{name} --with-gnome --all-name @@ -148,7 +151,6 @@ rm -rf $RPM_BUILD_ROOT %post -/sbin/ldconfig %scrollkeeper_update_post %gconf_schema_install clock.schemas %gconf_schema_install fish.schemas @@ -182,29 +184,41 @@ %gconf_schema_uninstall workspace-switcher.schemas %postun -/sbin/ldconfig %scrollkeeper_update_postun +%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}/* -%attr(755,root,root) %{_libdir}/fish-applet-2 -%attr(755,root,root) %{_libdir}/libpanel-applet*.so.*.* %attr(755,root,root) %{_libdir}/clock-applet -%attr(755,root,root) %{_libdir}/wnck-applet +%attr(755,root,root) %{_libdir}/fish-applet-2 %attr(755,root,root) %{_libdir}/notification-area-applet -%{_libdir}/bonobo/servers/* -%{_datadir}/gnome/panel +%attr(755,root,root) %{_libdir}/wnck-applet %{_datadir}/gnome-2.0/ui/* %{_datadir}/gnome-panel +%{_datadir}/gnome/panel %{_datadir}/gnome-panelrc %{_datadir}/idl/gnome-panel-2.0 -%{_pixmapsdir}/* %{_iconsdir}/*/*/apps/*.png -%{_omf_dest_dir}/%{name} +%{_libdir}/bonobo/servers/* %{_mandir}/man1/* +%{_omf_dest_dir}/clock +%{_omf_dest_dir}/fish +%{_omf_dest_dir}/%{name} +%{_omf_dest_dir}/window-list +%{_omf_dest_dir}/workspace-switcher +%{_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 devel %defattr(644,root,root,755) @@ -218,17 +232,64 @@ %defattr(644,root,root,755) %{_libdir}/lib*.a +%files libs +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libpanel-applet*.so.*.* + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team <[EMAIL PROTECTED]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.168 2005/08/11 09:46:18 radek -- bcond_with(out) is followed by one \t, then bcond's name. +Revision 1.169 2005/09/06 13:21:34 aflinta +- merged form DEVEL, 2.12.0 + +Revision 1.166.4.13 2005/08/22 20:17:30 paladine +- updated to 2.11.92 +- removed notification_area_applet patch + +Revision 1.166.4.12 2005/08/17 21:51:38 aflinta +- rebuild with cairo, rel. 3 + +Revision 1.166.4.11 2005/08/14 20:12:04 freetz +- libs subpackage for easier developing, removed TODO and droped menu + stripe, rel.2 + +Revision 1.166.4.10 2005/08/09 15:00:53 paladine +- rm /etc/gconf/schemas/panel-default-setup.entries + +Revision 1.166.4.9 2005/08/09 14:16:24 paladine +- updated to 2.11.91 +- itemize schemas + +Revision 1.166.4.8 2005/08/09 11:40:41 aflinta +- rebuild with libwnck, release 3 + +Revision 1.166.4.7 2005/08/08 21:21:18 freetz +- rel.2 for rebuild with e-d-s 1.3.7 + +Revision 1.166.4.6 2005/07/26 14:42:07 freetz +- 2.11.90, more %%files, BRs/Rs update, session fix obsoleted (fixed in + gnome-session 2.11.90), gnome-doc-utils for omf files -Revision 1.167 2005/07/29 10:13:37 saq -- up to 2.10.2 +Revision 1.166.4.5 2005/07/25 09:07:02 freetz +- no_launchers_on_panel is back (ephy,evo launchers this time), no %%config + for *.schemas, cleanup and cosmetics + +Revision 1.166.4.4 2005/07/13 11:13:37 freetz +- 2.11.5 + +Revision 1.166.4.3 2005/07/05 13:55:01 freetz +- rel.2 for backported (and updated) session_fix patch from AC-branch + +Revision 1.166.4.2 2005/07/04 22:02:03 freetz +- small todo memo + +Revision 1.166.4.1 2005/07/03 17:07:14 freetz +- 2.11.4, BRs updated, no-launchers-on-panel not needed any more (yes, they + are at last removed), fixed menu_stripe bcond mess (don't bcondize PatchX + section dudes! please!) Revision 1.166 2005/05/23 15:39:21 paladine - R: xdg-menus, rel. 3 @@ -271,677 +332,3 @@ Revision 1.155.2.7 2005/03/07 21:27:06 wiget - updated to 2.10.0 - -Revision 1.155.2.6 2005/03/01 12:25:48 aflinta -- cleanup - -Revision 1.155.2.5 2005/03/01 12:25:23 aflinta -- up to version 2.9.92 - -Revision 1.155.2.4 2005/02/28 21:56:33 paladine -- added patch fixing usage of wnck_workspace_activate with libwnck > 2.9.91 -- rel. 2 - -Revision 1.155.2.3 2005/02/13 18:52:43 grzegol -- all_applications patch is outdated -- gnome-vfs-menu-module isn't needed -- rel. 1 - -Revision 1.155.2.2 2005/02/08 13:55:49 grzegol -- updated to 2.9.91 - -Revision 1.155.2.1 2005/02/07 17:01:30 grzegol -- updated to 2.9.90 - -Revision 1.155 2004/12/06 19:08:42 freetz -- added incidentally omited changelog entry - -Revision 1.154 2004/12/06 19:02:43 freetz -- 2.8.2, STBR -- disable scrollkeeper-install in install time, BR: gnome-common-2.8.0-2 - -Revision 1.153 2004/11/27 19:21:08 saq -- massive attack: more BR epoch fixes - -Revision 1.152 2004/10/12 16:52:52 freetz -- 2.8.1 - -Revision 1.151 2004/09/29 15:00:04 grzegol -- updated to 2.8.0.1 - -Revision 1.150 2004/09/16 19:14:46 aflinta -- spec fix, release 2 - -Revision 1.149 2004/09/15 08:42:48 grzegol -- merged from DEVEL and updated to 2.8.0 -- removed outdated applet-categories patch -- menu-stripe patch probably needs update - -Revision 1.148 2004/08/18 01:15:00 ankry -- rel. 6 to rebuild - -Revision 1.147 2004/08/17 12:12:40 ankry -- added pango epoch to R:/BR: - -Revision 1.146 2004/08/16 18:51:32 krzak -- back %bcond_with menu_stripe - -Revision 1.145 2004/08/09 18:08:58 krzak -- Requires: gnome-vfs-menu-module (virtual package) - -Revision 1.144 2004/07/26 11:13:23 grzegol -- added desktop patch (s/Application/GTK;GNOME/) -- rel. 4 - -Revision 1.143 2004/07/21 18:36:42 grzegol -- drop menu patch (XDG menu will be done in gnome-vfs2 in simplier way) -- rel. 3 - -Revision 1.142 2004/07/21 15:07:16 wiget -- added menu.patch (use menu: not applications: for system menu) -- R: gnome-vfs2-module-menu for menu: method -- release 2 - -Revision 1.141 2004/06/14 22:27:51 grzegol -- updated to 2.6.2 - -Revision 1.140 2004/06/05 18:15:44 aflinta -- temporary disabled menu stripe patch cause it doesn't work with gtk+ 2.4.2 - -Revision 1.139.2.15 2004/09/06 20:58:30 grzegol -- added all_applications patch (don't use all-applications: uri - it doesn't - work with new menu module from desktop-file-utils) -- rel. 2 - -Revision 1.139.2.14 2004/08/31 22:43:28 aflinta -- up to version 2.7.92.1 - -Revision 1.139.2.13 2004/08/30 16:05:19 grzegol -- updated to 2.7.92 -- removed outdated locale-names, schemas and desktop patches -- remove no locale in %%install -- cleanups - -Revision 1.139.2.12 2004/08/22 22:13:05 aflinta -- rebuild with howl, release 2 - -Revision 1.139.2.11 2004/08/22 20:23:18 grzegol -- BR: intltool >= 0.31 - -Revision 1.139.2.10 2004/08/19 20:48:02 aflinta -- up to version 2.7.91.1 - -Revision 1.139.2.9 2004/08/17 17:22:57 aflinta -- up to version 2.7.91 - -Revision 1.139.2.8 2004/08/09 23:00:03 grzegol -- updated to 2.7.90 -- added R: gnome-vfs-menu-module - -Revision 1.139.2.7 2004/07/26 11:09:41 grzegol -- added desktop patch (s/Application/GTK;GNOME/) -- rel. 2 - -Revision 1.139.2.6 2004/07/20 22:15:28 grzegol -- updated to 2.7.4.1 - -Revision 1.139.2.5 2004/07/20 11:41:20 grzegol -- updated to 2.7.4 - -Revision 1.139.2.4 2004/07/06 14:14:13 grzegol -- updated to 2.7.3 -- applet-categories is probably outdated, but I'm not 100% sure - -Revision 1.139.2.3 2004/06/05 19:08:03 freetz -- cleanup - -Revision 1.139.2.2 2004/06/05 18:55:15 freetz -- we don't need toys in devel releases (menu-stripe kicked out) - -Revision 1.139.2.1 2004/06/05 16:42:35 freetz -- 2.7.1 - gnome 2.8 developement series - -Revision 1.139 2004/05/22 13:57:44 aflinta -- rel 2 to rebuild wit new EDS - -Revision 1.138 2004/04/19 22:38:58 grzegol -- updated to 2.6.1 - -Revision 1.137 2004/04/03 17:36:10 averne -- PLD supports e-d-s in gnome-panel - -Revision 1.136 2004/04/03 09:38:14 grzegol -- commented out BR: e-d-s-devel - -Revision 1.135 2004/03/27 00:04:43 grzegol -- readded menu-stripe patch (it's working now) -- rel. 1 - -Revision 1.134 2004/03/23 01:39:12 grzegol -- merged from DEVEL and updated to 2.6.0 -- added schemas patch (fixes clock.schemas) -- commented out menu-stripe patch - it doesn't work for now -- rel. 0.1 - -Revision 1.133 2004/02/05 21:44:55 krzak -- menu-stripe.patch - Fixed image area width after rescale -- rel 2 - -Revision 1.132 2004/01/18 18:23:31 krzak -- BR: libpng-devel - -Revision 1.131 2004/01/15 17:45:21 freetz -- 2.4.2, STBR for AC - -Revision 1.130 2003/12/07 17:26:58 wrobell -- gnome-system-tools is _optional_: please take a look at rsync (optional - ssh and rsh) or poldek (optional wget, rsync and even more) and read - commit logs for such packages as xmms and rhythmbox - -Revision 1.129 2003/12/05 00:03:01 krzak -- commented out R: gnome-system-tools until other work will be done - -Revision 1.128 2003/12/03 11:42:14 krzak -- Requires: gnome-system-tools - -Revision 1.127 2003/12/03 01:48:32 krzak -- notification_area_applet.patch : add notification_area applet to default panel -- top_panel_size.patch : set default panel size to 24 - -Revision 1.126 2003/12/03 00:46:36 krzak -- rel 6 -- menu-stripe.patch updated -- pld-desktop-stripe-end.png removed and replaced with - only pld-desktop-stripe-end.png - -Revision 1.125 2003/12/01 19:13:57 krzak -- pld-desktop-stripe-end.png for menu-stripe patch now should work fine -- rel 5.2 - -Revision 1.124 2003/12/01 00:20:53 krzak -- menu-stripe.patch for panel menu label -- rel 5.1 -- NFY - -Revision 1.123 2003/11/27 23:58:56 krzak -- update applet-categories.patch -- rel 5 - -Revision 1.122 2003/11/23 12:40:02 krzak -- applet-categories.patch fix untranslated and translated entries - for the same category in applets menu -- rel 4 - -Revision 1.121 2003/11/23 12:13:17 krzak -- gnome-panel-action-stock.patch set icon for PANEL_STOCK_ACTION - -Revision 1.120 2003/11/15 15:02:15 krzak -- revert R: glibc-localedb-all - -Revision 1.119 2003/11/15 11:15:56 krzak -- R: glibc-localedb-all (support locales) - -Revision 1.118.2.21 2004/03/15 17:08:34 grzegol -- updated to 2.5.93 - -Revision 1.118.2.20 2004/03/12 14:00:42 grzegol -- updated menu-stripe patch to work properly with gnome-panel-2.5.x -- rel. 2 - -Revision 1.118.2.19 2004/03/09 21:41:35 grzegol -- updated to 2.5.92 - -Revision 1.118.2.18 2004/03/06 14:19:09 grzegol -- rel. 2 to rebuild with evolution-data-server-0.0.90 - -Revision 1.118.2.17 2004/03/02 11:49:08 grzegol -- updated to 2.5.91 - -Revision 1.118.2.16 2004/02/23 22:05:19 grzegol -- updated to 2.5.90 - -Revision 1.118.2.15 2004/02/17 22:48:24 grzegol -- merged menu-stripe and notification_area_applet patches from HEAD -- added pld-desktop-stripe.png -- rel. 2 - -Revision 1.118.2.14 2004/02/17 08:25:02 aflinta -- fixed typo - -Revision 1.118.2.13 2004/02/16 23:25:02 grzegol -- strict internal deps - -Revision 1.118.2.12 2004/02/16 23:22:38 grzegol -- updated to 2.5.5 -- added locale-names patch (changes locale no -> nb) -- updated BRs and Rs - -Revision 1.118.2.11 2004/02/10 00:48:21 grzegol -- rel. 2 to rebuild with evolution-data-server-devel-0.0.7 - -Revision 1.118.2.10 2004/02/05 08:56:23 aflinta -- up to version 2.5.4 - -Revision 1.118.2.9 2004/01/31 13:52:34 grzegol -- added omf patch (fix window-list-es.omf file) -- rel. 3 - -Revision 1.118.2.8 2004/01/27 19:30:44 grzegol -- added BR evolution-data-server-devel (clock applet requires this) -- rel. 2 to rebuild with evolution-data-server-0.0.6 - -Revision 1.118.2.7 2004/01/15 14:49:09 grzegol -- updated to 2.5.3.1 - -Revision 1.118.2.6 2004/01/14 22:26:11 grzegol -- updated to 2.5.3 -- removed outdated clock patch - -Revision 1.118.2.5 2003/12/17 10:07:03 wiget -- higer BR/R for sane env - -Revision 1.118.2.4 2003/12/16 13:39:25 trojan -- updated to 2.5.2 - -Revision 1.118.2.3 2003/12/08 21:21:31 wiget -- fixed libglade2 epoch in BR -- release 2 - -Revision 1.118.2.2 2003/11/16 12:26:21 wiget -- added epoch to ORBit and gtk+ BRs - -Revision 1.118.2.1 2003/11/14 10:41:39 wiget -- 2.5.1 - -Revision 1.118 2003/11/09 09:53:38 krzak -- typo - -Revision 1.117 2003/11/09 02:33:18 krzak -- move capplet to {_datadir}/gnome/capplets -- rel 3 - -Revision 1.116 2003/10/29 21:07:08 krzak -- menu_icon.patch - When a menu has no icon it should use the folder icon - from the icon theme. - -Revision 1.115 2003/10/29 20:51:34 krzak -- finalize-memleak.patch - fix memleak while applet is removed from panel -- rel. 2 - -Revision 1.114 2003/10/14 12:24:29 freetz -- up to 2.4.1 - -Revision 1.113 2003/10/08 15:25:12 freetz -- removed R gnome-applets entry - gnome-applets needs gnome-panel-devel to <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-panel.spec?r1=1.168&r2=1.169&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
