Author: freetz Date: Mon Jul 25 09:07:08 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - no_launchers_on_panel is back (ephy,evo launchers this time), no %%config for *.schemas, cleanup and cosmetics
---- Files affected: SPECS: gnome-panel.spec (1.166.4.4 -> 1.166.4.5) ---- Diffs: ================================================================ Index: SPECS/gnome-panel.spec diff -u SPECS/gnome-panel.spec:1.166.4.4 SPECS/gnome-panel.spec:1.166.4.5 --- SPECS/gnome-panel.spec:1.166.4.4 Wed Jul 13 13:13:37 2005 +++ SPECS/gnome-panel.spec Mon Jul 25 11:07:02 2005 @@ -2,7 +2,7 @@ # # TODO # - fix menu-stripe patch -# - import session fix from AC-branch +# (if nobody cares, it will be removed before 2.12.x) # # Conditional build: %bcond_with menu_stripe # build with menu-stripe.patch @@ -11,7 +11,7 @@ Summary(pl): Podstawowe programy środowiska graficznego GNOME Name: gnome-panel Version: 2.11.5 -Release: 1 +Release: 2 License: LGPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.11/%{name}-%{version}.tar.bz2 @@ -23,6 +23,7 @@ Patch2: %{name}-notification_area_applet.patch Patch3: %{name}-no_mixer_applet.patch Patch4: %{name}-session_fix.patch +Patch5: %{name}-no_launchers_on_panel.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.10.0 BuildRequires: ORBit2-devel >= 1:2.12.1 @@ -110,6 +111,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build cp /usr/share/gnome-common/data/omf.make . @@ -121,10 +123,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 @@ -139,6 +141,7 @@ 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 @@ -190,23 +193,23 @@ %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS NEWS README *ChangeLog -%config %{_sysconfdir}/gconf/schemas/* +%{_sysconfdir}/gconf/schemas/* %attr(755,root,root) %{_bindir}/* +%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}/clock-applet -%attr(755,root,root) %{_libdir}/wnck-applet %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}/%{name} +%{_pixmapsdir}/* %files devel %defattr(644,root,root,755) @@ -226,6 +229,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +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 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-panel.spec?r1=1.166.4.4&r2=1.166.4.5&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
