Author: patrys Date: Wed Mar 18 11:43:07 2009 GMT Module: SPECS Tag: HEAD ---- Log message: - unscrew merging - rel 3
---- Files affected: SPECS: gnome-session.spec (1.149 -> 1.150) ---- Diffs: ================================================================ Index: SPECS/gnome-session.spec diff -u SPECS/gnome-session.spec:1.149 SPECS/gnome-session.spec:1.150 --- SPECS/gnome-session.spec:1.149 Wed Mar 18 12:36:53 2009 +++ SPECS/gnome-session.spec Wed Mar 18 12:43:02 2009 @@ -4,7 +4,7 @@ Name: gnome-session Version: 2.26.0 Epoch: 1 -Release: 2 +Release: 3 License: LGPL Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-session/2.26/%{name}-%{version}.tar.bz2 @@ -18,7 +18,7 @@ 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-common >= 2.24.0 BuildRequires: gtk+2-devel >= 2:2.16.0 @@ -82,6 +82,9 @@ %patch1 -p0 cd .. +mv ChangeLog main-ChangeLog +find . -name ChangeLog |awk '{src=$0; dst=$0;sub("^./","",dst);gsub("/","-",dst); print "cp " src " " dst}'|sh + %build %{__glib_gettextize} %{__intltoolize} @@ -91,6 +94,7 @@ %{__autoheader} %{__automake} %configure \ + --enable-ipv6 \ --disable-schemas-install \ X_EXTRA_LIBS="-lXext" @@ -98,7 +102,9 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_datadir}/gnome/{autostart,shutdown} +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 @@ -106,10 +112,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 @@ -132,7 +134,6 @@ %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 @@ -147,7 +148,9 @@ %{_datadir}/gnome/autostart/gnome-session-splash.desktop %dir %{_datadir}/gnome/default-session %dir %{_datadir}/gnome/shutdown -%{_datadir}/gnome/default.session +%dir %{_datadir}/gnome/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]/* @@ -164,6 +167,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.150 2009/03/18 11:43:02 patrys +- unscrew merging +- rel 3 + Revision 1.149 2009/03/18 11:36:53 patrys - no more s...@latn - rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnome-session.spec?r1=1.149&r2=1.150&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
