From 7e3c2880caf60c54923c008ccd66aaeb9c6eee7f539a53bdf6c5405952baf2ae Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 13 Nov 2007 20:17:23 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/librtas?expand=0&rev=5 --- librtas.changes | 8 ++++ librtas.libdir-fix-for-64bit.patch | 69 ++++++++++++++++++++++++++++++ librtas.spec | 9 +++- 3 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 librtas.libdir-fix-for-64bit.patch diff --git a/librtas.changes b/librtas.changes index ed68a05..6357a89 100644 --- a/librtas.changes +++ b/librtas.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Nov 13 14:50:25 CET 2007 - sassmann@suse.de + +- added patch + librtas.libdir-fix-for-64bit.patch + libraries need to be in lib64 instead of lib on ppc64, + this patch alters the various Makefiles to achieve this. + ------------------------------------------------------------------- Wed Nov 7 16:09:55 CET 2007 - sassmann@suse.de diff --git a/librtas.libdir-fix-for-64bit.patch b/librtas.libdir-fix-for-64bit.patch new file mode 100644 index 0000000..208838f --- /dev/null +++ b/librtas.libdir-fix-for-64bit.patch @@ -0,0 +1,69 @@ +Index: librtas-1.3.2/rules.mk +=================================================================== +--- librtas-1.3.2.orig/rules.mk ++++ librtas-1.3.2/rules.mk +@@ -58,7 +58,7 @@ DESTDIR ?= + # Standard base directory names + BIN_DIR = /usr/bin + SBIN_DIR = /usr/sbin +-LIB_DIR = /usr/lib ++LIBDIR = /usr/lib + INC_DIR = /usr/include/ + DOC_DIR = /usr/share/doc/packages/$(PROJECT) + MAN_DIR = /usr/share/man/man8 +@@ -135,7 +135,7 @@ define install_sbin + endef + + define install_lib +- $(call install_files,$1,755,$2/$(LIB_DIR)) ++ $(call install_files,$1,755,$2/$(LIBDIR)) + endef + + define install_inc +@@ -178,7 +178,7 @@ define uninstall_sbin + endef + + define uninstall_lib +- $(call uninstall_files,$1,$2/$(LIB_DIR)) ++ $(call uninstall_files,$1,$2/$(LIBDIR)) + endef + + define uninstall_inc +Index: librtas-1.3.2/librtas_src/Makefile +=================================================================== +--- librtas-1.3.2.orig/librtas_src/Makefile ++++ librtas-1.3.2/librtas_src/Makefile +@@ -32,12 +32,12 @@ librtas_static: $(LIBRTAS_OBJS) $(HEADER + install: + @$(call install_lib,$(LIBRTAS),$(DESTDIR)) + @$(call install_inc,$(LIBRTAS_HDR),$(DESTDIR)) +- @ln -sf $(LIBRTAS) $(DESTDIR)/$(LIB_DIR)/$(LIBRTAS_SONAME) ++ @ln -sf $(LIBRTAS) $(DESTDIR)/$(LIBDIR)/$(LIBRTAS_SONAME) + + uninstall: + @$(call uninstall_lib,$(LIBRTAS),$(DESTDIR)) + @$(call uninstall_inc,$(LIBRTAS_HDR),$(DESTDIR)) +- @rm -f $(DESTDIR)/$(LIB_DIR)/$(LIBRTAS_SONAME) ++ @rm -f $(DESTDIR)/$(LIBDIR)/$(LIBRTAS_SONAME) + + clean: + @echo "Cleaning up $(WORK_DIR) files..." +Index: librtas-1.3.2/librtasevent_src/Makefile +=================================================================== +--- librtas-1.3.2.orig/librtasevent_src/Makefile ++++ librtas-1.3.2/librtasevent_src/Makefile +@@ -27,12 +27,12 @@ all: $(LIBRE_OBJS) $(HEADERS) + install: + @$(call install_lib,$(LIBRE),$(DESTDIR)) + @$(call install_inc,$(LIBRE_HDRS),$(DESTDIR)) +- @ln -sf $(LIBRE) $(DESTDIR)/$(LIB_DIR)/$(LIBRE_SONAME) ++ @ln -sf $(LIBRE) $(DESTDIR)/$(LIBDIR)/$(LIBRE_SONAME) + + uninstall: + @$(call uninstall_lib,$(LIBRE),$(DESTDIR)) + @$(call uninstall_inc,$(LIBRE_HDRS),$(DESTDIR)) +- @rm -f $(DESTDIR)/$(LIB_DIR)/$(LIBRE_SONAME) ++ @rm -f $(DESTDIR)/$(LIBDIR)/$(LIBRE_SONAME) + + clean: + @echo "Cleaning up $(WORK_DIR) files..." diff --git a/librtas.spec b/librtas.spec index 54d7ef4..e73a90c 100644 --- a/librtas.spec +++ b/librtas.spec @@ -13,7 +13,7 @@ Name: librtas BuildRequires: doxygen Version: 1.3.2 -Release: 200710312345 +Release: 200710312347 Group: System/Libraries License: IBM Public License Summary: Libraries to provide access to RTAS calls and RTAS events @@ -22,6 +22,7 @@ ExclusiveArch: ppc ppc64 Url: http://librtas.ozlabs.org/ Source0: http://librtas.ozlabs.org/downloads/librtas-%{version}.tar.bz2 Patch0: librtas.open_prop_file-off_by_one.patch +Patch1: librtas.libdir-fix-for-64bit.patch %description The librtas shared library provides userspace with an interface through @@ -44,6 +45,7 @@ Authors: %prep %setup -q %patch0 -p1 +%patch1 -p1 %build make CFLAGS="$RPM_OPT_FLAGS -fPIC -g" LIBDIR="%{_libdir}" %{?jobs:-j%jobs} @@ -67,6 +69,11 @@ make install DESTDIR=$RPM_BUILD_ROOT LIBDIR="%{_libdir}" /usr/include/* %attr (555,root,root)%{_libdir}/lib* %changelog +* Tue Nov 13 2007 - sassmann@suse.de +- added patch + librtas.libdir-fix-for-64bit.patch + libraries need to be in lib64 instead of lib on ppc64, + this patch alters the various Makefiles to achieve this. * Wed Nov 07 2007 - sassmann@suse.de - fixed wrong release number * Mon Nov 05 2007 - sassmann@suse.de