packages: gnome-session/gnome-session-splash.patch, gnome-session/gnome-ses...

patrys patrys at pld-linux.org
Sat Sep 26 23:45:49 CEST 2009 

Author: patrys                       Date: Sat Sep 26 21:45:49 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
packages/gnome-session:
   gnome-session-splash.patch (1.1 -> 1.2) , gnome-session.spec (1.155 -> 1.156) 

---- Diffs:

================================================================
Index: packages/gnome-session/gnome-session-splash.patch
diff -u packages/gnome-session/gnome-session-splash.patch:1.1 packages/gnome-session/gnome-session-splash.patch:1.2
--- packages/gnome-session/gnome-session-splash.patch:1.1	Thu Oct 23 23:53:31 2008
+++ packages/gnome-session/gnome-session-splash.patch	Sat Sep 26 23:45:44 2009
@@ -1,5 +1,5 @@
---- gnome-session-2.24.1/data/gnome-session.schemas.in~	2008-10-22 11:15:38.000000000 +0200
-+++ gnome-session-2.24.1/data/gnome-session.schemas.in	2008-10-23 23:50:41.627830429 +0200
+--- gnome-session-2.24.1/data/gnome-session.schemas.in.in~	2008-10-22 11:15:38.000000000 +0200
++++ gnome-session-2.24.1/data/gnome-session.schemas.in.in	2008-10-23 23:50:41.627830429 +0200
 @@ -7,7 +7,7 @@
           <applyto>/apps/gnome-session/options/show_splash_screen</applyto>
           <owner>gnome</owner>

================================================================
Index: packages/gnome-session/gnome-session.spec
diff -u packages/gnome-session/gnome-session.spec:1.155 packages/gnome-session/gnome-session.spec:1.156
--- packages/gnome-session/gnome-session.spec:1.155	Wed Jul  1 16:51:14 2009
+++ packages/gnome-session/gnome-session.spec	Sat Sep 26 23:45:44 2009
@@ -2,13 +2,13 @@
 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.26.2
+Version:	2.28.0
 Epoch:		1
 Release:	1
 License:	LGPL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-session/2.26/%{name}-%{version}.tar.bz2
-# Source0-md5:	2cc3ff808592d95c3b364d608e99dea4
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-session/2.28/%{name}-%{version}.tar.bz2
+# Source0-md5:	b1a2307b02e833010d6c5312b9ff9048
 Source1:	%{name}-gnome.desktop
 Patch0:		%{name}-splash.patch
 URL:		http://www.gnome.org/
@@ -21,7 +21,6 @@
 BuildRequires:	gnome-common >= 2.24.0
 BuildRequires:	gtk+2-devel >= 2:2.16.0
 BuildRequires:	intltool >= 0.40.0
-BuildRequires:	libglade2-devel >= 1:2.6.2
 BuildRequires:	libtool
 BuildRequires:	libwrap-devel
 BuildRequires:	perl-base
@@ -81,9 +80,6 @@
 mv ChangeLog main-ChangeLog
 find . -name ChangeLog |awk '{src=$0; dst=$0;sub("^./","",dst);gsub("/","-",dst); print "cp " src " " dst}'|sh
 
-rm -f po/ca at valencia.po
-sed -i -e 's/ca at valencia//' po/LINGUAS
-
 %build
 %{__glib_gettextize}
 %{__intltoolize}
@@ -94,6 +90,7 @@
 %{__automake}
 %configure \
 	--enable-ipv6 \
+	--enable-splash \
 	--disable-schemas-install \
 	X_EXTRA_LIBS="-lXext"
 
@@ -101,7 +98,6 @@
 
 %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
 
@@ -137,19 +133,16 @@
 %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-session-splash
 %attr(755,root,root) %{_libexecdir}/gnome-session/helpers/gnome-settings-daemon-helper
 %{_sysconfdir}/gconf/schemas/gnome-session.schemas
-%{_sysconfdir}/xdg/autostart/at-spi-registryd-wrapper.desktop
+%{_sysconfdir}/xdg/autostart/gnome-session-splash.desktop
 %{_sysconfdir}/xdg/autostart/gnome-settings-daemon-helper.desktop
-%dir %{_datadir}/gnome/autostart
-%{_datadir}/gnome/autostart/gnome-session-splash.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}/gnome-session/gsm-inhibit-dialog.ui
+%{_datadir}/gnome-session/session-properties.ui
 %{_datadir}/xsessions/gnome.desktop
 %dir %{_pixmapsdir}/splash
 %{_mandir}/man[15]/*
@@ -166,6 +159,24 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.156  2009/09/26 21:45:44  patrys
+- merged from DEVEL
+
+Revision 1.155.2.5  2009/09/26 21:45:07  patrys
+- 2.28.0
+
+Revision 1.155.2.4  2009/09/09 07:32:25  patrys
+- 2.27.92
+
+Revision 1.155.2.3  2009/08/25 22:26:43  patrys
+- 2.27.91
+
+Revision 1.155.2.2  2009/07/29 09:09:19  patrys
+- 2.27.5
+
+Revision 1.155.2.1  2009/07/16 10:01:41  patrys
+- 2.27.4
+
 Revision 1.155  2009/07/01 14:51:14  megabajt
 - updated to 2.26.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-session/gnome-session-splash.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-session/gnome-session.spec?r1=1.155&r2=1.156&f=u

More information about the pld-cvs-commit mailing list