packages: python3/python3-noarch_to_datadir.patch, python3/python3.spec - u...

qboosh qboosh at pld-linux.org
Sat Apr 2 19:55:41 CEST 2011


Author: qboosh                       Date: Sat Apr  2 17:55:41 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated noarch_to_datadir patch to install config to arch-dependent dir and libpython*.a to libdir

---- Files affected:
packages/python3:
   python3-noarch_to_datadir.patch (1.4 -> 1.5) , python3.spec (1.44 -> 1.45) 

---- Diffs:

================================================================
Index: packages/python3/python3-noarch_to_datadir.patch
diff -u packages/python3/python3-noarch_to_datadir.patch:1.4 packages/python3/python3-noarch_to_datadir.patch:1.5
--- packages/python3/python3-noarch_to_datadir.patch:1.4	Sat Apr  2 11:48:41 2011
+++ packages/python3/python3-noarch_to_datadir.patch	Sat Apr  2 19:55:35 2011
@@ -127,6 +127,26 @@
  ABIFLAGS=	@ABIFLAGS@
  
  # Detailed destination directories
+@@ -1036,7 +1036,7 @@
+ 
+ # Install the library and miscellaneous stuff needed for extending/embedding
+ # This goes into $(exec_prefix)
+-LIBPL=		$(LIBDEST)/config-$(LDVERSION)
++LIBPL=		$(BINLIBDEST)/config-$(LDVERSION)
+ 
+ # pkgconfig directory
+ LIBPC=		$(LIBDIR)/pkgconfig
+@@ -1055,8 +1055,8 @@
+ 			if test "$(SO)" = .dll; then \
+ 				$(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
+ 			else \
+-				$(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
+-				$(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
++				$(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBDIR)/$(LIBRARY) ; \
++				$(RANLIB) $(DESTDIR)$(LIBDIR)/$(LIBRARY) ; \
+ 			fi; \
+ 		else \
+ 			echo Skip install of $(LIBRARY) - use make frameworkinstall; \
 --- Python-3.0.1/Lib/distutils/tests/test_install.py.wig	2009-02-25 11:42:38.000000000 +0100
 +++ Python-3.0.1/Lib/distutils/tests/test_install.py	2009-02-25 11:51:23.000000000 +0100
 @@ -38,7 +38,7 @@ class InstallTestCase(support.TempdirMan

================================================================
Index: packages/python3/python3.spec
diff -u packages/python3/python3.spec:1.44 packages/python3/python3.spec:1.45
--- packages/python3/python3.spec:1.44	Sat Apr  2 18:04:35 2011
+++ packages/python3/python3.spec	Sat Apr  2 19:55:35 2011
@@ -879,7 +879,7 @@
 
 %files static
 %defattr(644,root,root,755)
-%{py_libdir}/config-%{py_abi}/libpython%{py_abi}.a
+%{_libdir}/libpython%{py_abi}.a
 
 %files examples
 %defattr(644,root,root,755)
@@ -905,6 +905,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.45  2011/04/02 17:55:35  qboosh
+- updated noarch_to_datadir patch to install config to arch-dependent dir and libpython*.a to libdir
+
 Revision 1.44  2011/04/02 16:04:35  qboosh
 - there is no pdb.doc now
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python3/python3-noarch_to_datadir.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python3/python3.spec?r1=1.44&r2=1.45&f=u



More information about the pld-cvs-commit mailing list