rpms/sabayon/devel sabayon-2.12.3-xinit.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 sabayon.spec, 1.18, 1.19 sources, 1.9, 1.10
Alexander Larsson (alexl)
fedora-extras-commits at redhat.com
Mon Mar 6 16:40:53 UTC 2006
Author: alexl
Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30658
Modified Files:
.cvsignore sabayon.spec sources
Added Files:
sabayon-2.12.3-xinit.patch
Log Message:
* Mon Mar 6 2006 Alexander Larsson <alexl at redhat.com> - 2.12.3-1
- update to 2.12.3
- Fix Xnest dependency with modular X
- Fix Xsession script being moved in FC5
- Remove sabayon.schema from doc, as it wasn't in this release
sabayon-2.12.3-xinit.patch:
--- NEW FILE sabayon-2.12.3-xinit.patch ---
Index: configure.ac
===================================================================
RCS file: /cvs/gnome/sabayon/configure.ac,v
retrieving revision 1.65
diff -u -p -r1.65 configure.ac
--- configure.ac 6 Mar 2006 08:24:40 -0000 1.65
+++ configure.ac 6 Mar 2006 16:28:36 -0000
@@ -108,7 +108,7 @@ if test "x$with_distro" = "x"; then
else
case $with_distro in
redhat)
- XSESSION="/etc/X11/xdm/Xsession"
+ AC_CHECK_FILE(/etc/X11/xinit/Xsession, XSESSION="/etc/X11/xinit/Xsession", XSESSION="/etc/X11/xdm/Xsession")
SESSION_NAME="gnome"
install_xinitrc_script="yes"
XINITRC_SYSCONFDIR="X11/xinit/xinitrc.d"
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 17 Nov 2005 13:27:33 -0000 1.9
+++ .cvsignore 6 Mar 2006 16:40:53 -0000 1.10
@@ -1,3 +1 @@
-sabayon-2.12.0.tar.gz
-sabayon-2.12.1.tar.bz2
-sabayon-2.12.2.tar.bz2
+sabayon-2.12.3.tar.bz2
Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sabayon.spec 17 Nov 2005 14:25:40 -0000 1.18
+++ sabayon.spec 6 Mar 2006 16:40:53 -0000 1.19
@@ -13,8 +13,8 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_pytho\n_lib()")}
Name: sabayon
-Version: 2.12.2
-Release: 2
+Version: 2.12.3
+Release: 1
Summary: Tool to maintain user profiles in a GNOME desktop
Group: Applications/System
@@ -24,6 +24,8 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1: sabayon-2.12.3-xinit.patch
+
Requires: python-abi = %{pyver}
Requires: gamin-python
Requires: libxml2-python
@@ -38,6 +40,7 @@
BuildRequires: gettext
BuildRequires: desktop-file-utils
BuildRequires: usermode
+BuildRequires: xorg-x11-server-Xnest
Requires(post): shadow-utils
Requires(preun): shadow-utils
@@ -54,7 +57,7 @@
Group: Applications/System
Requires: %{name} = %{version}-%{release}
-Requires: Xnest
+Requires: xorg-x11-server-Xnest
Requires: shadow-utils
%description admin
@@ -64,7 +67,13 @@
%prep
%setup -q
+%patch1 -p0 -b .xinit
+
+
%build
+#needed for patch 1 (xinit fix)
+autoconf
+
%configure \
--enable-consolehelper=yes \
--with-prototype-user=%{name}-admin
@@ -119,7 +128,8 @@
%files -f sabayon.lang
%defattr(-, root, root, 755)
-%doc AUTHORS ChangeLog.gz NEWS README TODO ISSUES sabayon.schema
+%doc AUTHORS ChangeLog.gz NEWS README TODO ISSUES
+# Wasn't in tarball for 2.12.3: sabayon.schema
%config(noreplace) %{_sysconfdir}/gconf/2/local-defaults.path
%config(noreplace) %{_sysconfdir}/gconf/2/local-mandatory.path
@@ -176,6 +186,12 @@
%{python_sitelib}/%{name}/lockdown
%changelog
+* Mon Mar 6 2006 Alexander Larsson <alexl at redhat.com> - 2.12.3-1
+- update to 2.12.3
+- Fix Xnest dependency with modular X
+- Fix Xsession script being moved in FC5
+- Remove sabayon.schema from doc, as it wasn't in this release
+
* Thu Nov 17 2005 Alexander Larsson <alexl at redhat.com> - 2.12.2-2
- Update to 2.12.2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 17 Nov 2005 13:27:33 -0000 1.9
+++ sources 6 Mar 2006 16:40:53 -0000 1.10
@@ -1 +1 @@
-3d3e0a543a25b439023abd9abede6ac4 sabayon-2.12.2.tar.bz2
+259b56fecdba0cb5d2c93f2999d04900 sabayon-2.12.3.tar.bz2
More information about the fedora-extras-commits
mailing list