Author: megabajt Date: Sat Sep 27 18:52:53 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.24.0; merged changes from DEVEL
---- Files affected: SPECS: gnome-session.spec (1.137 -> 1.138) ---- Diffs: ================================================================ Index: SPECS/gnome-session.spec diff -u SPECS/gnome-session.spec:1.137 SPECS/gnome-session.spec:1.138 --- SPECS/gnome-session.spec:1.137 Mon Jun 30 15:56:03 2008 +++ SPECS/gnome-session.spec Sat Sep 27 20:52:47 2008 @@ -2,46 +2,43 @@ Summary: The GNOME desktop programs for the GNOME2 GUI desktop environment Summary(pl.UTF-8): Programy dla desktopu środowiska graficznego GNOME2 Name: gnome-session -Version: 2.22.3 +Version: 2.24.0 Release: 1 License: LGPL Group: X11/Applications -Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-session/2.22/%{name}-%{version}.tar.bz2 -# Source0-md5: 859b61b5368aa000c9bcb8b0d0688ca2 +Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-session/2.24/%{name}-%{version}.tar.bz2 +# Source0-md5: 2f586c2829430937fb2d18b4b8478bad Source1: %{name}-gnome.desktop -Patch0: %{name}-desktop.patch -Patch1: %{name}-configure.patch -Patch2: %{name}-no_G_DEBUG.patch +Patch0: %{name}-configure.patch URL: http://www.gnome.org/ -BuildRequires: GConf2-devel >= 2.22.0 +BuildRequires: GConf2-devel >= 2.24.0 +BuildRequires: PolicyKit-gnome-devel >= 0.7 BuildRequires: autoconf BuildRequires: automake >= 1:1.9 -BuildRequires: dbus-glib-devel >= 0.74 +BuildRequires: dbus-glib-devel >= 0.76 BuildRequires: gettext-devel -BuildRequires: gnome-settings-daemon-devel >= 1:2.22.0 -BuildRequires: esound-devel >= 1:0.2.36 -BuildRequires: glib2-devel >= 1:2.16.3 +BuildRequires: glib2-devel >= 1:2.18.0 BuildRequires: gnome-common >= 2.20.0 -BuildRequires: gnome-keyring-devel >= 2.22.0 -BuildRequires: gtk+2-devel >= 2:2.12.9 -BuildRequires: intltool >= 0.36.1 -BuildRequires: libgnomeui-devel >= 2.22.1 -BuildRequires: libnotify-devel >= 0.2.1 -BuildRequires: libselinux-devel >= 1.34 +BuildRequires: gnome-keyring-devel >= 2.24.0 +BuildRequires: gtk+2-devel >= 2:2.14.0 +BuildRequires: intltool >= 0.40.0 +BuildRequires: libglade2-devel >= 1:2.6.2 +BuildRequires: libgnomeui-devel >= 2.24.0 BuildRequires: libtool BuildRequires: libwrap-devel BuildRequires: perl-base BuildRequires: pkgconfig BuildRequires: rpmbuild(macros) >= 1.311 -BuildRequires: sed >= 4.0 +BuildRequires: startup-notification-devel +BuildRequires: xorg-lib-xtrans-devel Requires(post,postun): gtk+2 Requires(post,postun): hicolor-icon-theme Requires(post,preun): GConf2 -Requires: gnome-control-center >= 1:2.22.0 -Requires: gnome-keyring >= 2.22.0 +Requires: gnome-control-center >= 1:2.24.0 +Requires: gnome-keyring >= 2.24.0 Requires: gnome-splash Requires: gnome-wm -Requires: libgnomeui >= 2.22.1 +Requires: libgnomeui >= 2.24.0 # [EMAIL PROTECTED] vs. [EMAIL PROTECTED] Conflicts: glibc-misc < 6:2.7 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -81,11 +78,9 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -sed -i -e '[EMAIL PROTECTED]@latin#' po/LINGUAS -mv po/[EMAIL PROTECTED],latin}.po +mv ChangeLog main-ChangeLog +find . -name ChangeLog |awk '{src=$0; dst=$0;sub("^./","",dst);gsub("/","-",dst); print "cp " src " " dst}'|sh %build %{__glib_gettextize} @@ -96,7 +91,6 @@ %{__autoheader} %{__automake} %configure \ - --with-at-spi-registryd-directory=%{_libdir}/at-spi \ --disable-schemas-install \ X_EXTRA_LIBS="-lXext" @@ -107,6 +101,8 @@ %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_datadir}/gnome/autostart +install -d $RPM_BUILD_ROOT%{_datadir}/gnome/default-session +install -d $RPM_BUILD_ROOT%{_datadir}/gnome/shutdown %{__make} install \ DESTDIR=$RPM_BUILD_ROOT @@ -114,10 +110,6 @@ install -d $RPM_BUILD_ROOT%{_datadir}/xsessions install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/xsessions/gnome.desktop -# kill it, breaks short-circuit -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 %clean @@ -140,12 +132,25 @@ %doc AUTHORS *ChangeLog NEWS README %attr(755,root,root) %{_bindir}/gnome-session %attr(755,root,root) %{_bindir}/gnome-session-properties -%attr(755,root,root) %{_bindir}/gnome-session-remove %attr(755,root,root) %{_bindir}/gnome-session-save %attr(755,root,root) %{_bindir}/gnome-wm +%dir %{_libexecdir}/gnome-session +%dir %{_libexecdir}/gnome-session/helpers +%attr(755,root,root) %{_libexecdir}/gnome-session/helpers/at-spi-registryd-wrapper +%attr(755,root,root) %{_libexecdir}/gnome-session/helpers/gnome-keyring-daemon-wrapper +%attr(755,root,root) %{_libexecdir}/gnome-session/helpers/gnome-session-splash +%attr(755,root,root) %{_libexecdir}/gnome-session/helpers/gnome-settings-daemon-helper %{_sysconfdir}/gconf/schemas/gnome-session.schemas %dir %{_datadir}/gnome/autostart -%{_datadir}/gnome/default.session +%{_datadir}/gnome/autostart/at-spi-registryd-wrapper.desktop +%{_datadir}/gnome/autostart/gnome-keyring-daemon-wrapper.desktop +%{_datadir}/gnome/autostart/gnome-session-splash.desktop +%{_datadir}/gnome/autostart/gnome-settings-daemon-helper.desktop +%dir %{_datadir}/gnome/default-session +%dir %{_datadir}/gnome/shutdown +%dir %{_datadir}/gnome-session +%{_datadir}/gnome-session/gsm-inhibit-dialog.glade +%{_datadir}/gnome-session/session-properties.glade %{_datadir}/xsessions/gnome.desktop %dir %{_pixmapsdir}/splash %{_mandir}/man[15]/* @@ -162,11 +167,62 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.138 2008/09/27 18:52:47 megabajt +- updated to 2.24.0; merged changes from DEVEL + +Revision 1.135.2.15 2008/09/12 23:14:07 patrys +- 2.23.92 (really) +- drop X-Capplet (fix applnk, not GNOME) + +Revision 1.135.2.14 2008/09/12 23:12:18 patrys +- 2.23.92 +- drop X-Capplet (fix applnk, not GNOME) + +Revision 1.135.2.13 2008/09/04 10:22:55 patrys +- 2.23.91 + +Revision 1.135.2.12 2008/08/21 11:11:59 megabajt +- own /usr/share/gnome/shutdown + +Revision 1.135.2.11 2008/08/20 19:11:39 megabajt +- updated to 2.23.90 + +Revision 1.135.2.10 2008/08/20 18:52:56 megabajt +- use default location for at-spi-registryd + +Revision 1.135.2.9 2008/08/05 16:12:37 patrys +- 2.23.6 + +Revision 1.135.2.8 2008/07/23 14:49:27 patrys +- 2.23.5 + Revision 1.137 2008/06/30 13:56:03 megabajt - updated to 2.22.3 +Revision 1.135.2.7 2008/06/17 21:26:58 patrys +- 2.23.4.1 + +Revision 1.135.2.6 2008/06/17 14:37:22 megabajt +- updated to 2.23.4 + +Revision 1.135.2.5 2008/06/15 21:12:27 megabajt +- BR: xorg-lib-xtrans-devel +- fixes in %files + +Revision 1.135.2.4 2008/06/03 20:29:57 patrys +- 2.23.3 + Revision 1.136 2008/05/31 21:31:57 adamg - updated to 2.22.2 + +Revision 1.135.2.3 2008-05-14 18:51:39 patrys +- 2.23.2.2 + +Revision 1.135.2.2 2008-05-13 16:40:37 patrys +- add default-session + +Revision 1.135.2.1 2008-05-13 16:29:03 patrys +- 2.23.2.1 Revision 1.135 2008-04-14 14:13:16 megabajt - updated to 2.22.1.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnome-session.spec?r1=1.137&r2=1.138&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
