rpms/sabayon/devel sabayon-2.12.4-libdir.patch, NONE, 1.1 sabayon.spec, 1.24, 1.25

[Alexander Larsson (alexl)]

Author: alexl

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9969

Modified Files:
	sabayon.spec 
Added Files:
	sabayon-2.12.4-libdir.patch 
Log Message:
* Thu Jul 27 2006 Alexander Larsson <alexl at redhat.com> - 2.12.4-2
- Fix multilib issues



sabayon-2.12.4-libdir.patch:

--- NEW FILE sabayon-2.12.4-libdir.patch ---
? a
? depcomp
? ldap.txt
? py-compile
? sabayon-2.12.1.tar.bz2
? sabayon-2.12.4-libdir.patch
? startup.txt
? transltation-string.patch
? admin-tool/a
? admin-tool/lockdown/a
? doc/index.html#ldap
? lib/a
? lib/local-testing.patch
? lib/prefs_1.js
? lib/prefs_2.js
? po/stamp-it
Index: admin-tool/Makefile.am
===================================================================
RCS file: /cvs/gnome/sabayon/admin-tool/Makefile.am,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile.am
--- admin-tool/Makefile.am	2 Nov 2005 10:39:00 -0000	1.30
+++ admin-tool/Makefile.am	27 Jul 2006 20:43:13 -0000
@@ -48,7 +48,7 @@ bin_SCRIPTS = sabayon
 sbin_SCRIPTS = sabayon-apply
 libexec_SCRIPTS = sabayon-session
 
-sabayondir     = $(pythondir)/sabayon
+sabayondir     = $(pyexecdir)/sabayon
 sabayon_PYTHON = $(PYTHON_FILES)
 
 %.sh: %.sh.in
Index: admin-tool/lockdown/Makefile.am
===================================================================
RCS file: /cvs/gnome/sabayon/admin-tool/lockdown/Makefile.am,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.am
--- admin-tool/lockdown/Makefile.am	7 Nov 2005 09:31:38 -0000	1.2
+++ admin-tool/lockdown/Makefile.am	27 Jul 2006 20:43:13 -0000
@@ -31,7 +31,7 @@ EXTRA_DIST =				\
 	$(PYTHON_FILES)			\
 	$(GLADE_FILES)			
 
-sabayonlockdowndir     = $(pythondir)/sabayon/lockdown
+sabayonlockdowndir     = $(pyexecdir)/sabayon/lockdown
 sabayonlockdown_PYTHON = $(PYTHON_FILES)
 
 pycheck:
Index: lib/Makefile.am
===================================================================
RCS file: /cvs/gnome/sabayon/lib/Makefile.am,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile.am
--- lib/Makefile.am	29 Dec 2005 05:24:03 -0000	1.23
+++ lib/Makefile.am	27 Jul 2006 20:43:13 -0000
@@ -37,7 +37,7 @@ EXTRA_DIST =				\
 	$(NOINST_PYTHON_FILES)		\
 	config.py.in
 
-sabayondir     = $(pythondir)/sabayon
+sabayondir     = $(pyexecdir)/sabayon
 sabayon_PYTHON = $(PYTHON_FILES)
 
 pycheck:
Index: lib/sources/Makefile.am
===================================================================
RCS file: /cvs/gnome/sabayon/lib/sources/Makefile.am,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile.am
--- lib/sources/Makefile.am	18 Mar 2005 16:51:21 -0000	1.8
+++ lib/sources/Makefile.am	27 Jul 2006 20:43:13 -0000
@@ -12,7 +12,7 @@ EXTRA_DIST =				\
 	$(PYTHON_FILES)			\
 	$(NOINST_PYTHON_FILES)
 
-sourcesdir     = $(pythondir)/sabayon/sources
+sourcesdir     = $(pyexecdir)/sabayon/sources
 sources_PYTHON = $(PYTHON_FILES)
 
 pycheck:


Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sabayon.spec	27 Jul 2006 19:55:15 -0000	1.24
+++ sabayon.spec	27 Jul 2006 20:54:19 -0000	1.25
@@ -8,7 +8,7 @@
 
 Name:    sabayon
 Version: 2.12.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
@@ -21,6 +21,8 @@
 
 # Xnest crashes unless we disable the Composite extension
 Patch1:  sabayon-2.12.3-xnestbug.patch
+# Switch from pythondir to pyexecdir
+Patch2:  sabayon-2.12.4-libdir.patch
 
 Requires: %{name}-apply = %{version}-%{release}
 Requires: gamin-python
@@ -45,8 +47,11 @@
 BuildRequires: xorg-x11-server-Xnest
 # Needed to pick up the right Xsession file
 BuildRequires: xorg-x11-xinit
-# Needed for patch 1 (xinit fix)
+
+# Needed for patch 2 (libdir fix)
+BuildRequires: automake
 BuildRequires: autoconf
+
 # Required by intltool
 BuildRequires: perl-XML-Parser
 
@@ -79,9 +84,11 @@
 cp %{SOURCE2} admin-tool/
 
 %patch1 -p1 -b .xnestbug
+%patch2 -p0 -b .libdir
 
 %build
-# Needed for patch 1 (xinit fix)
+# Needed for patch 2 (libdir fix)
+automake
 autoconf
 
 %configure					\
@@ -251,6 +258,9 @@
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
+* Thu Jul 27 2006 Alexander Larsson <alexl at redhat.com> - 2.12.4-2
+- Fix multilib issues
+
 * Thu Jul 27 2006 Alexander Larsson <alexl at redhat.com> - 2.12.4-1
 - Update to 2.14.4
 - Ghost .pyo files