OBS User unknown 2007-11-13 20:17:23 +00:00 committed by Git OBS Bridge
parent 8c5209dba1
commit 7e3c2880ca
3 changed files with 85 additions and 1 deletions

View File

@ -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

View File

@ -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..."

View File

@ -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