Hello community, here is the log from the commit of package librtas for openSUSE:Factory checked in at 2011-11-14 14:52:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/librtas (Old) and /work/SRC/openSUSE:Factory/.librtas.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "librtas", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/librtas/librtas.changes 2011-09-23 02:10:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.librtas.new/librtas.changes 2011-11-14 14:52:40.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Nov 14 10:48:21 UTC 2011 - [email protected] + +- update -> 1.3.6 + - changes and small fixes in regards to lib64 support mostly +- split up devel, doc packages +- split librtas1 package according shared library policy +- patch refresh +- fix baselibs.conf +- fix %files permission + +------------------------------------------------------------------- Old: ---- librtas-1.3.4.tar.bz2 New: ---- librtas-1.3.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ librtas.spec ++++++ --- /var/tmp/diff_new_pack.6etz4M/_old 2011-11-14 14:52:41.000000000 +0100 +++ /var/tmp/diff_new_pack.6etz4M/_new 2011-11-14 14:52:41.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package librtas (Version 1.3.4) +# spec file for package librtas # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,10 +20,11 @@ Name: librtas BuildRequires: doxygen -Version: 1.3.4 +Version: 1.3.6 Release: 1 Group: System/Libraries License: IBM Public License .. +BuildRequires: fdupes Summary: Libraries to provide access to RTAS calls and RTAS events BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: ppc ppc64 @@ -49,6 +50,51 @@ John Rose <[email protected]> Michael Strosaker <[email protected]> +%package devel +License: IBM Public License .. +Summary: Devel librtas files +Group: Development/Libraries/C and C++ +Requires: librtas1 = 1.3.6 + +%description devel +This package provides devel files of librtas + +Authors: +-------- + Nathan Fontenot <[email protected]> + John Rose <[email protected]> + Michael Strosaker <[email protected]> + +%package doc +License: IBM Public License .. +Group: Documentation/Other +Summary: Documentation for librtas + +%description doc +This package provides librtas documentation + +Authors: +-------- + Nathan Fontenot <[email protected]> + John Rose <[email protected]> + Michael Strosaker <[email protected]> + + +%package -n librtas1 +License: IBM Public License .. +Group: System/Libraries +Summary: Libraries to provide access to RTAS calls and RTAS events + +%description -n librtas1 +The librtas shared library provides userspace with an interface through +which certain RTAS calls can be made. The library uses either of the +RTAS User Module or the RTAS system call to direct the kernel in making +these calls. + +The librtasevent shared library provides users with a set of +definitions and common routines useful in parsing and dumping the +contents of RTAS events. + %prep %setup -q %patch @@ -62,18 +108,28 @@ rm -rf $RPM_BUILD_ROOT doc/*/latex mkdir $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT LIB_DIR="%{_libdir}" +%fdupes $RPM_BUILD_ROOT/%_docdir /sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir} -%post +%post -n librtas1 %{run_ldconfig} -%postun +%postun -n librtas1 %{run_ldconfig} -%files -%defattr(444, root, root,555) -%doc COPYRIGHT README doc +%files -n librtas1 +%defattr(-, root, root) +%{_libdir}/lib*.so.* + +%files devel +%defattr(-, root, root) /usr/include/* -%attr (555,root,root)%{_libdir}/lib* +%{_libdir}/librtasevent.so +%{_libdir}/librtas.so +%{_libdir}/libofdt.so + +%files doc +%defattr(-, root, root) +%doc %{_docdir}/librtas %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.6etz4M/_old 2011-11-14 14:52:41.000000000 +0100 +++ /var/tmp/diff_new_pack.6etz4M/_new 2011-11-14 14:52:41.000000000 +0100 @@ -1 +1 @@ -librtas +librtas1 ++++++ librtas-1.3.4.tar.bz2 -> librtas-1.3.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.4/Makefile new/librtas-1.3.6/Makefile --- old/librtas-1.3.4/Makefile 2009-05-19 00:42:31.000000000 +0200 +++ new/librtas-1.3.6/Makefile 2011-02-07 17:53:34.000000000 +0100 @@ -13,6 +13,8 @@ all: @$(foreach d,$(SUBDIRS), $(MAKE) -C $d;) + # Update spec file for build type + @sed "s|\@LIB_DIR\@|$(LIB_DIR)$(call is_lib64,librtas_src/librtas.so.$(VERSION))|g" $(SPECFILE_IN) > $(SPECFILE) install: @$(call install_doc,$(FILES),$(DESTDIR)) @@ -25,9 +27,9 @@ rpm: all @echo "Creating rpm..." @export DESTDIR=$(SHIPDIR); $(MAKE) install - @rm $(SHIPDIR)/usr/lib/librtas.so - @rm $(SHIPDIR)/usr/lib/librtasevent.so - @rm $(SHIPDIR)/usr/lib/libofdt.so + @rm $(SHIPDIR)$(LIB_DIR)$(call is_lib64,librtas_src/librtas.so.$(VERSION))/librtas.so + @rm $(SHIPDIR)$(LIB_DIR)$(call is_lib64,librtasevent_src/librtasevent.so.$(VERSION))/librtasevent.so + @rm $(SHIPDIR)$(LIB_DIR)$(call is_lib64,libofdt_src/libofdt.so.$(VERSION))/libofdt.so @$(RPM) -bb $(SPECFILE) @rm -rf $(SHIPDIR) @@ -50,4 +52,4 @@ clean: @$(foreach d,$(SUBDIRS), $(MAKE) -C $d clean;) - @$(CLEAN) $(SHIPDIR) $(TARBALL) $(DEVBALL) doc + @$(CLEAN) $(SHIPDIR) $(TARBALL) $(DEVBALL) $(SPECFILE) doc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.4/libofdt_src/Makefile new/librtas-1.3.6/libofdt_src/Makefile --- old/librtas-1.3.4/libofdt_src/Makefile 2009-05-19 00:42:31.000000000 +0200 +++ new/librtas-1.3.6/libofdt_src/Makefile 2011-02-07 17:53:34.000000000 +0100 @@ -1,6 +1,6 @@ # -# Makefile for librtas +# Makefile for libofdt # # Copyright (C) 2005 IBM Corporation # Common Public License Version 1.0 (see COPYRIGHT) @@ -13,25 +13,25 @@ LIBOFDT_OBJS = dtree.o drc.o -LIBOFDT_HDR = libofdt.h common.h -HEADERS = $(LIBOFDT_HDR) +LIBOFDT_HDRS = libofdt.h common.h +LIBOFDT_SHIP_HDR = libofdt.h CFLAGS += -fPIC -DPIC LDFLAGS += -shared -Wl,-soname -Wl,$(LIBOFDT_SONAME).$(MAJOR_NO) -all: $(LIBOFDT_OBJS) $(HEADERS) +all: $(LIBOFDT_OBJS) $(LIBOFDT_HDRS) @echo "LD $(WORK_DIR)/$(LIBOFDT)..." @$(CC) $(LIBOFDT_OBJS) $(LDFLAGS) -o $(LIBOFDT) install: @$(call install_lib,$(LIBOFDT),$(DESTDIR)) - @$(call install_inc,$(LIBOFDT_HDR),$(DESTDIR)) - @ln -sf $(LIBOFDT) $(DESTDIR)/$(LIB_DIR)/$(LIBOFDT_SONAME) + @$(call install_inc,$(LIBOFDT_SHIP_HDR),$(DESTDIR)) + @ln -sf $(LIBOFDT) $(DESTDIR)/$(LIB_DIR)$(call is_lib64,$(LIBOFDT))/$(LIBOFDT_SONAME) uninstall: @$(call uninstall_lib,$(LIBOFDT),$(DESTDIR)) - @$(call uninstall_inc,$(LIBOFDT_HDR),$(DESTDIR)) - @rm -f $(DESTDIR)/$(LIB_DIR)/$(LIBOFDT_SONAME) + @$(call uninstall_inc,$(LIBOFDT_SHIP_HDR),$(DESTDIR)) + @rm -f $(DESTDIR)/$(LIB_DIR)$(call is_lib64,$(LIBOFDT))/$(LIBOFDT_SONAME) clean: @echo "Cleaning up $(WORK_DIR) files..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.4/librtas-ppc64.spec new/librtas-1.3.6/librtas-ppc64.spec --- old/librtas-1.3.4/librtas-ppc64.spec 2009-05-19 00:42:31.000000000 +0200 +++ new/librtas-1.3.6/librtas-ppc64.spec 1970-01-01 01:00:00.000000000 +0100 @@ -1,47 +0,0 @@ -%define name librtas -%define version 1.3.4 -%define release 0 -Summary: Libraries to provide access to RTAS calls and RTAS events. -Name: %{name} -Version: %{version} -Release: %{release} -License: IBM Common Public License (CPL) v1.0 -Group: System Environment/Libraries -BuildRoot: /tmp/%{name}-buildroot - -%description -The librtas shared library provides userspace with an interface -through which certain RTAS calls can be made. The library uses -either of the RTAS User Module or the RTAS system call to direct -the kernel in making these calls. - -The librtasevent shared library provides users with a set of -definitions and common routines useful in parsing and dumping -the contents of RTAS events. - -%files -%defattr(-, root, root) -/usr/share/doc/packages/%{name}/COPYRIGHT -/usr/share/doc/packages/%{name}/README -/usr/lib/librtas.so.%{version} -/usr/include/librtas.h - -/usr/lib/librtasevent.so.%{version} -/usr/include/librtasevent.h -/usr/include/librtasevent_v4.h -/usr/include/librtasevent_v6.h - -%post -# Post-install script ------------------------------------------------- -ln -sf /usr/lib/librtas.so.%{version} /usr/lib/librtas.so -ln -sf /usr/lib/librtasevent.so.%{version} /usr/lib/librtasevent.so -ldconfig - -%postun -# Post-uninstall script ----------------------------------------------- -ldconfig -if [ "$1" = "0" ] ; then # last uninstall - rm -f /usr/lib/librtas.so - rm -f /usr/lib/librtasevent.so -fi - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.4/librtas-ppc64.spec.in new/librtas-1.3.6/librtas-ppc64.spec.in --- old/librtas-1.3.4/librtas-ppc64.spec.in 1970-01-01 01:00:00.000000000 +0100 +++ new/librtas-1.3.6/librtas-ppc64.spec.in 2011-02-07 17:53:34.000000000 +0100 @@ -0,0 +1,69 @@ +%define name librtas +%define version 1.3.6 +%define release 1 +Summary: Libraries to provide access to RTAS calls and RTAS events. +Name: %{name} +Version: %{version} +Release: %{release} +License: IBM Common Public License (CPL) v1.0 +Source: %{name}-%{version}.tar.gz +Group: System Environment/Libraries +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + + +%description +The librtas shared library provides userspace with an interface +through which certain RTAS calls can be made. The library uses +either of the RTAS User Module or the RTAS system call to direct +the kernel in making these calls. + +The librtasevent shared library provides users with a set of +definitions and common routines useful in parsing and dumping +the contents of RTAS events. + +%prep +%setup -q + +%build +%{__make} %{?_smp_mflags} + +%install +%{__rm} -rf $RPM_BUILD_ROOT +%{__make} install DESTDIR=$RPM_BUILD_ROOT + + +%files +%defattr(-, root, root) +/usr/share/doc/packages/%{name}/COPYRIGHT +/usr/share/doc/packages/%{name}/README +/usr/include/common.h +/usr/include/librtas.h +@LIB_DIR@/librtas.so.%{version} +@LIB_DIR@/libofdt.so +@LIB_DIR@/librtas.so +@LIB_DIR@/librtasevent.so +@LIB_DIR@/librtasevent.so.1 +@LIB_DIR@/librtasevent.so.%{version} +/usr/include/librtasevent.h +/usr/include/librtasevent_v4.h +/usr/include/librtasevent_v6.h + +@LIB_DIR@/libofdt.so.%{version} +/usr/include/libofdt.h + +%post +# Post-install script ------------------------------------------------- +ln -sf @LIB_DIR@/librtas.so.%{version} /usr/lib/librtas.so +ln -sf @LIB_DIR@/librtas.so.%{version} /usr/lib/librtas.so.1 +ln -sf @LIB_DIR@/librtasevent.so.%{version} /usr/lib/librtasevent.so +ln -sf @LIB_DIR@/libofdt.so.%{version} /usr/lib/libofdt.so +ldconfig + +%postun +# Post-uninstall script ----------------------------------------------- +if [ "$1" = "0" ] ; then # last uninstall + rm -f /usr/lib/librtas.so + rm -f /usr/lib/librtasevent.so + rm -f @LIB_DIR@/libofdt.so +fi +ldconfig \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.4/librtas_src/Makefile new/librtas-1.3.6/librtas_src/Makefile --- old/librtas-1.3.4/librtas_src/Makefile 2009-05-19 00:42:31.000000000 +0200 +++ new/librtas-1.3.6/librtas_src/Makefile 2011-02-07 17:53:34.000000000 +0100 @@ -31,13 +31,13 @@ install: @$(call install_lib,$(LIBRTAS),$(DESTDIR)) - @$(call install_inc,$(LIBRTAS_HDR),$(DESTDIR)) - @ln -sf $(LIBRTAS) $(DESTDIR)/$(LIB_DIR)/$(LIBRTAS_SONAME) + @$(call install_inc,$(HEADERS),$(DESTDIR)) + @ln -sf $(LIBRTAS) $(DESTDIR)/$(LIB_DIR)$(call is_lib64,$(LIBRTAS))/$(LIBRTAS_SONAME) uninstall: @$(call uninstall_lib,$(LIBRTAS),$(DESTDIR)) @$(call uninstall_inc,$(LIBRTAS_HDR),$(DESTDIR)) - @rm -f $(DESTDIR)/$(LIB_DIR)/$(LIBRTAS_SONAME) + @rm -f $(DESTDIR)/$(LIB_DIR)$(call is_lib64,$(LIBRTAS))/$(LIBRTAS_SONAME) clean: @echo "Cleaning up $(WORK_DIR) files..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.4/librtasevent_src/Makefile new/librtas-1.3.6/librtasevent_src/Makefile --- old/librtas-1.3.4/librtasevent_src/Makefile 2009-05-19 00:42:31.000000000 +0200 +++ new/librtas-1.3.6/librtasevent_src/Makefile 2011-02-07 17:53:34.000000000 +0100 @@ -27,12 +27,13 @@ install: @$(call install_lib,$(LIBRE),$(DESTDIR)) @$(call install_inc,$(LIBRE_HDRS),$(DESTDIR)) - @ln -sf $(LIBRE) $(DESTDIR)/$(LIB_DIR)/$(LIBRE_SONAME) + @ln -sf $(LIBRE) $(DESTDIR)/$(LIB_DIR)$(call is_lib64,$(LIBRE))/$(LIBRE_SONAME) + @ln -sf $(LIBRE) $(DESTDIR)/$(LIB_DIR)$(call is_lib64,$(LIBRE))/$(LIBRE_SONAME).1 uninstall: @$(call uninstall_lib,$(LIBRE),$(DESTDIR)) @$(call uninstall_inc,$(LIBRE_HDRS),$(DESTDIR)) - @rm -f $(DESTDIR)/$(LIB_DIR)/$(LIBRE_SONAME) + @rm -f $(DESTDIR)/$(LIB_DIR)$(call is_lib64,$(LIBRE))/$(LIBRE_SONAME) clean: @echo "Cleaning up $(WORK_DIR) files..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.4/rules.mk new/librtas-1.3.6/rules.mk --- old/librtas-1.3.4/rules.mk 2009-05-19 00:42:31.000000000 +0200 +++ new/librtas-1.3.6/rules.mk 2011-02-07 17:53:34.000000000 +0100 @@ -9,13 +9,14 @@ # Name of the rpm spec file SPECFILENAME = librtas-ppc64.spec +SPECFILENAME_IN = librtas-ppc64.spec.in # resolves the root directory at which this build is occuring ROOT_DIR = \ $(shell \ while [[ `pwd` != "/" ]]; \ do \ - if [[ -f `pwd`/$(SPECFILENAME) ]]; \ + if [[ -f `pwd`/$(SPECFILENAME_IN) ]]; \ then \ echo `pwd`; \ break; \ @@ -25,6 +26,7 @@ # Full path to the rpm specfile SPECFILE = $(ROOT_DIR)/$(SPECFILENAME) +SPECFILE_IN = $(ROOT_DIR)/$(SPECFILENAME_IN) # Find the correct command to build RPM's RPM = \ @@ -42,9 +44,9 @@ fi;) # Pull the version, release and project name info from the spec file -VERSION := $(shell echo `grep "define version" $(SPECFILE) | cut -d' ' -f3`) -RELEASE := $(shell echo `grep "define release" $(SPECFILE) | cut -d' ' -f3`) -PROJECT := $(shell echo `grep "define name" $(SPECFILE) | cut -d' ' -f3`) +VERSION := $(shell echo `grep "define version" $(SPECFILE_IN) | cut -d' ' -f3`) +RELEASE := $(shell echo `grep "define release" $(SPECFILE_IN) | cut -d' ' -f3`) +PROJECT := $(shell echo `grep "define name" $(SPECFILE_IN) | cut -d' ' -f3`) # Generate the Major, Minor and Revision numbers from the version VERSION_LIST := $(subst ., ,$(VERSION)) @@ -68,7 +70,7 @@ # Source tarball name and build directory TARBALL = $(PROJECT)-$(VERSION).tar.gz -TARBALL_FILES = Makefile rules.mk $(SPECFILENAME) +TARBALL_FILES = Makefile rules.mk $(SPECFILENAME_IN) TB_DIR = $(PROJECT)-$(VERSION) # Build a tarball of the source code @@ -99,12 +101,20 @@ CFLAGS += -Wall # Uncomment this for debug builds -CFLAGS += -g -DDEBUG +CFLAGS += -g -DDEBUG # If you wish to have a log of installed files, define the file here INSTALL_LOG ?= $(ROOT_DIR)/install.log # +# is_lib64 - determine if a library is 64-bit +# +# $1 library to examine +define is_lib64 +$(findstring 64,$(shell file $(firstword $1))) +endef + +# # install_files - Install file(s) in the given location # # $1 - files to be installed @@ -135,7 +145,7 @@ endef define install_lib - $(call install_files,$1,755,$2/$(LIB_DIR)$(findstring 64,$(shell file $(firstword $1)))) + $(call install_files,$1,755,$2/$(LIB_DIR)$(call is_lib64,$1)) endef define install_inc @@ -178,7 +188,7 @@ endef define uninstall_lib - $(call uninstall_files,$1,$2/$(LIB_DIR)) + $(call uninstall_files,$1,$2/$(LIB_DIR)$(call is_lib64,$1)) endef define uninstall_inc ++++++ librtas-failedmagic.patch ++++++ --- /var/tmp/diff_new_pack.6etz4M/_old 2011-11-14 14:52:41.000000000 +0100 +++ /var/tmp/diff_new_pack.6etz4M/_new 2011-11-14 14:52:41.000000000 +0100 @@ -1,11 +1,10 @@ ---- rules.mk -+++ rules.mk -@@ -135,7 +135,7 @@ +--- rules.mk.orig 2011-11-01 16:59:42.000000000 +0100 ++++ rules.mk 2011-11-01 17:40:38.000000000 +0100 +@@ -111,7 +111,6 @@ + # + # $1 library to examine + define is_lib64 +-$(findstring 64,$(shell file $(firstword $1))) endef - define install_lib -- $(call install_files,$1,755,$2/$(LIB_DIR)$(findstring 64,$(shell file $(firstword $1)))) -+ $(call install_files,$1,755,$2/$(LIB_DIR)) - endef - - define install_inc + # -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
