From 6eede82beeb3c8ddbf5e91fd3ba8a8e9cf237222 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 2 Apr 2011 17:55:35 +0000 Subject: [PATCH] - updated noarch_to_datadir patch to install config to arch-dependent dir and libpython*.a to libdir Changed files: python3-noarch_to_datadir.patch -> 1.5 python3.spec -> 1.45 --- python3-noarch_to_datadir.patch | 20 ++++++++++++++++++++ python3.spec | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/python3-noarch_to_datadir.patch b/python3-noarch_to_datadir.patch index 15c92cd..9da69d2 100644 --- a/python3-noarch_to_datadir.patch +++ b/python3-noarch_to_datadir.patch @@ -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 diff --git a/python3.spec b/python3.spec index 60add42..6cac670 100644 --- a/python3.spec +++ b/python3.spec @@ -878,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT %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) -- 2.43.0